This commit was manufactured by cvs2svn to create tag 'R3_0_5'.
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 6e60185..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-org.eclipse.jst.j2ee.doc.user_1.0.0.jar
-temp
-DitaLink.cat
\ No newline at end of file
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/DocBuild.xml b/docs/org.eclipse.jst.j2ee.doc.user/DocBuild.xml
deleted file mode 100644
index 6ecb379..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-
- This script build the Help plug-in by transforming the DITA source files into HTML.
-
- To use this script, you must install DITA-OT on your machine in the directory
- defined by the dita.ot.dir property.
-
- Run the default target after you edit the DITA source files to regenerate the HTML.
-
- To customize this script for other Help plug-ins, modify the value of the args.input property
- to be the DITA map file for the plug-in.
-
- NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
- output directory structure will be shifted incorrectly.
-
- NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
- will be copied over the generated plugin.xml which is currently not being generated correctly
- by DITA-OT.
-
- ChangeLog:
- 2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
- - Created.
- 2008-01-09 Kate Price <katep@ca.ibm.com>
- - modified for new DITA-OT version
- 2008-05-05 Kate Price <katep@ca.ibm.com>
- - modified to add generation of pre-built help index.
- - Must delete /index folder before running build
--->
-<project name="eclipsehelp" default="all">
-
- <property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
- <path id="dost.class.path">
- <pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
- </path>
-
- <taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
- <classpath refid="dost.class.path" />
- </taskdef>
- <target name="all" depends="integrate, eclipsehelp">
- </target>
- <target name="integrate">
- <integrate ditadir="${dita.ot.dir}" />
- </target>
-
- <!-- revise below here -->
- <target name="eclipsehelp">
- <ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
- <property name="args.copycss" value="no" />
- <property name="args.csspath" value="../org.eclipse.wst.doc.user" />
- <property name="args.eclipse.provider" value="Eclipse.org" />
- <property name="args.eclipse.version" value="3.3.0" />
- <property name="args.input" location="jst_j2ee_toc.ditamap" />
- <property name="clean.temp" value="true" />
- <property name="dita.extname" value=".dita" />
- <property name="dita.temp.dir" location="temp" />
- <property name="output.dir" location="" />
- <property name="transtype" value="eclipsehelp" />
- </ant>
- <copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
- </target>
- <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
- <help.buildHelpIndex manifest="plugin.xml" destination="."/>
- </target>
-</project>
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 8dba9e6..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.1.1.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 2199df3..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/build.properties b/docs/org.eclipse.jst.j2ee.doc.user/build.properties
deleted file mode 100644
index 10f19b1..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-bin.includes = images/,\
- jst_j2ee_toc.xml,\
- jst_j2ee_relsmap.xml,\
- topics/*.htm*,\
- plugin.xml,\
- plugin.properties,\
- index/,\
- META-INF/,\
- about.html,\
- org.eclipse.jst.j2ee.doc.userindex.xml
-src.includes = build.properties,\
- *.maplist,\
- *.ditamap,\
- topics/*.dita
-bin.excludes = DocBuild.xml,\
- myPlugin*.xml
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/AddRelationship.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/AddRelationship.gif
deleted file mode 100644
index a56a758..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/AddRelationship.gif
+++ /dev/null
Binary files differ
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 d5c7290..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/images/Relationships.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/Relationships.gif
deleted file mode 100644
index a9f52eb..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/Relationships.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/n5rpdcst.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/n5rpdcst.gif
deleted file mode 100644
index 68be18c..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/n5rpdcst.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/validatefilters.jpg b/docs/org.eclipse.jst.j2ee.doc.user/images/validatefilters.jpg
deleted file mode 100644
index 6481091..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/validatefilters.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/ycwin.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/ycwin.gif
deleted file mode 100644
index 895f9ca..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/ycwin.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/_18.cfs b/docs/org.eclipse.jst.j2ee.doc.user/index/_18.cfs
deleted file mode 100644
index 3402414..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/_18.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/deletable b/docs/org.eclipse.jst.j2ee.doc.user/index/deletable
deleted file mode 100644
index 593f470..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_contributions b/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_contributions
deleted file mode 100644
index 4b6436b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 27 10:47:44 EDT 2008
-org.eclipse.jst.j2ee.doc.user=org.eclipse.jst.j2ee.doc.user\n1.1.0.qualifier
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_dependencies b/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_dependencies
deleted file mode 100644
index 943e5fe..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 27 10:47:44 EDT 2008
-lucene=1.9.1.v200706111724
-analyzer=org.eclipse.help.base\#3.3.1.v20070813_33x?locale\=en
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_docs b/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_docs
deleted file mode 100644
index 8289a25..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,42 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 27 10:47:44 EDT 2008
-/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjview.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjear.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjval.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html=0
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/segments b/docs/org.eclipse.jst.j2ee.doc.user/index/segments
deleted file mode 100644
index cbc649a..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.ditamap b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.ditamap
deleted file mode 100644
index d07f946..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.ditamap
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map title="J2EE WTP relational table">
-<reltable>
-<relheader>
-<relcolspec type="concept"></relcolspec>
-<relcolspec type="task"></relcolspec>
-<relcolspec type="reference"></relcolspec>
-</relheader>
-<relrow>
-<relcell linking="targetonly">
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture"></topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjtargetserver.dita" navtitle="Specifying target servers for J2EE projects">
-</topicref>
-</relcell>
-<relcell></relcell>
-<relcell>
-<topicref format="html" href="../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html"
-linking="targetonly" locktitle="yes" navtitle="Defining the installed server runtime environments"
-scope="peer"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell></relcell>
-<relcell>
-<topicref href="topics/tjval.dita" navtitle="Validating code in enterprise applications">
-</topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/rvalerr.dita" navtitle="Common validation errors and solutions">
-</topicref>
-<topicref href="topics/rvalidators.dita" navtitle="J2EE Validators"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell></relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjvaldisable.dita" navtitle="Disabling validation">
-</topicref>
-<topicref href="topics/tjvalglobalpref.dita" navtitle="Overriding global validation preferences">
-</topicref>
-<topicref href="topics/tjvalmanual.dita" navtitle="Manually validating code">
-</topicref>
-<topicref href="topics/tjvalselect.dita" navtitle="Selecting code validators">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="topics/rtunevalidat.dita" navtitle="Tuning validators"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell collection-type="family">
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture"></topicref>
-<topicref href="topics/cjearproj.dita" navtitle="Enterprise application projects">
-</topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjear.dita" navtitle="Creating an enterprise application project">
-</topicref>
-<topicref href="topics/tjimpear.dita" navtitle="Importing an enterprise application EAR file">
-</topicref>
-<topicref href="topics/tjexpear.dita" navtitle="Exporting an enterprise application into an EAR file">
-</topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell collection-type="family">
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture"></topicref>
-<topicref href="topics/cjappcliproj.dita" navtitle="Application client projects">
-</topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjappproj.dita" navtitle="Creating an application client project">
-</topicref>
-<topicref href="topics/tjexpapp.dita" navtitle="Exporting an application client project">
-</topicref>
-<topicref href="topics/tjimpapp.dita" navtitle="Importing an application client JAR file">
-</topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cjcircle.dita" navtitle="Cyclical dependencies between J2EE modules">
-</topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjimpear.dita" navtitle="Importing an enterprise application EAR file">
-</topicref>
-<topicref href="topics/tjcircleb.dita" navtitle="Correcting cyclical dependencies after an EAR is imported">
-</topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell collection-type="family">
-<topicref href="topics/cjview.dita" navtitle="Project Explorer view in the J2EE perspective">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="topics/tjviewfilters.dita" navtitle="Filtering in the Project Explorer view">
-</topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cjearproj.dita" navtitle="Enterprise application projects">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="topics/tjear.dita" navtitle="Creating an enterprise application project">
-</topicref>
-<topicref href="topics/tjappproj.dita" navtitle="Creating an application client project">
-</topicref>
-<topicref href="topics/tjrar.dita" navtitle="Creating a connector project">
-</topicref>
-</relcell>
-<relcell></relcell>
-<relcell>
-<topicref href="topics/cfacets.dita" navtitle="Project facets"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cjpers.dita" navtitle="J2EE perspective"></topicref>
-<topicref href="topics/cjview.dita" navtitle="Project Explorer view in the J2EE perspective">
-</topicref>
-</relcell>
-<relcell></relcell>
-<relcell></relcell>
-<relcell>
-<topicref format="html" href="../org.eclipse.platform.doc.user/concepts/cworkset.htm"
-locktitle="yes" navtitle="Working sets" scope="peer"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cfacets.dita" navtitle="Project facets"></topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/taddingfacet.dita" navtitle="Adding a facet to a J2EE project">
-</topicref>
-<topicref href="topics/tchangejavalevel.dita" navtitle="Changing the Java compiler version for a J2EE
-project"></topicref>
-<topicref href="topics/tchangefacet.dita" navtitle="Changing the version of a facet">
-</topicref>
-</relcell>
-<relcell></relcell>
-<relcell></relcell>
-</relrow>
-</reltable>
-</map>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.xml b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.xml
deleted file mode 100644
index a0c990b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="J2EE WTP relational table"/>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.ditamap b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.ditamap
deleted file mode 100644
index 3f2dad8..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.ditamap
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map id="jstj2eetoc" title="J2EE applications - WTP">
-<anchor id="map_top"/>
-<topicref href="topics/ph-j2eeapp.dita" navtitle="Java EE applications">
-<anchor id="before_intro_topics"/>
-<topicref href="topics/cjavaee5.dita" navtitle="Developing Java EE 5 Applications">
-<topicref href="topics/cjee5overview.dita" navtitle="Java EE 5: Overview">
-</topicref>
-<topicref href="topics/cannotations.dita" navtitle="Java EE 5 support for annotations">
-<topicref href="topics/tdefiningannotations.dita" navtitle="Defining and using Annotations">
-<topicref href="topics/ctypesofanno.dita" navtitle="Types of annotations">
-</topicref>
-</topicref>
-</topicref>
-</topicref>
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture"></topicref>
-<topicref href="topics/cjpers.dita" navtitle="Java EE perspective"></topicref>
-<topicref href="topics/cjview.dita" navtitle="Project Explorer view in the Java EE perspective">
-</topicref>
-<anchor id="after_intro_topics"/>
-<anchor id="before_filters"/>
-<topicref href="topics/tjviewfilters.dita" navtitle="Filtering in the Project Explorer view">
-</topicref>
-<anchor id="after_filters"/>
-<anchor id="before_projects"/>
-<topicref href="topics/ph-projects.dita" navtitle="Working with projects">
-<topicref href="topics/cjearproj.dita" navtitle="Enterprise application projects">
-</topicref>
-<topicref href="topics/cjappcliproj.dita" navtitle="Application client projects">
-</topicref>
-<anchor id="project_types"/>
-<topicref href="topics/tjear.dita" navtitle="Creating an enterprise application project">
-</topicref>
-<topicref href="topics/tjappproj.dita" navtitle="Creating an application client project">
-</topicref>
-<topicref href="topics/tjrar.dita" navtitle="Creating a connector project">
-</topicref>
-<anchor id="creating_projects"/>
-<topicref href="topics/tjtargetserver.dita" navtitle="Specifying target servers for J2EE projects">
-</topicref>
-<anchor id="target_servers"/>
-<topicref href="topics/cfacets.dita" navtitle="Project facets">
-<topicref href="topics/taddingfacet.dita" navtitle="Adding a facet to a Java EE project">
-</topicref>
-<topicref href="topics/tchangefacet.dita" navtitle="Changing the version of a facet">
-</topicref>
-<topicref href="topics/tchangejavalevel.dita" navtitle="Changing the Java compiler version for a Java EE project">
-</topicref>
-<anchor id="childof_J2EEProjectFacets"/></topicref>
-<anchor id="J2EEProjectFacets"/>
-<anchor id="before_importexport"/>
-<topicref href="topics/ph-importexport.dita" navtitle="Importing and exporting projects and files">
-<anchor id="importexport_top"/>
-<topicref href="topics/tjexpapp.dita" navtitle="Exporting an application client project">
-</topicref>
-<topicref href="topics/tjexpear.dita" navtitle="Exporting an enterprise application into an EAR file">
-</topicref>
-<topicref href="topics/tjexprar.dita" navtitle="Exporting connector projects to RAR files">
-</topicref>
-<anchor id="export_types"/>
-<topicref href="topics/tjimpear.dita" navtitle="Importing an enterprise application EAR file">
-</topicref>
-<topicref href="topics/tjimpapp.dita" navtitle="Importing an application client JAR file">
-</topicref>
-<topicref href="topics/tjimprar.dita" navtitle="Importing a connector project RAR file">
-</topicref>
-<topicref format="html" href="../org.eclipse.wst.webtools.doc.user/topics/twimpwar.html"
-linking="targetonly" locktitle="yes" navtitle="Importing Web archive (WAR) files"
-scope="peer" toc="no"></topicref>
-<topicref format="html" href="../org.eclipse.wst.webtools.doc.user/topics/twcrewar.html"
-linking="targetonly" locktitle="yes" navtitle="Exporting Web Archive (WAR) files"
-scope="peer" toc="no"></topicref>
-<topicref format="html" href="../org.eclipse.jst.ejb.doc.user/topics/teimp.html"
-linking="targetonly" locktitle="yes" navtitle="Importing EJB JAR files" scope="peer"
-toc="no"></topicref>
-<topicref format="html" href="../org.eclipse.jst.ejb.doc.user/topics/teexp.html"
-linking="targetonly" locktitle="yes" navtitle="Exporting EJB projects to EJB JAR files"
-scope="peer" toc="no"></topicref>
-<anchor id="import_types"/>
-<anchor id="before_dependencies"/>
-<topicref href="topics/cjcircle.dita" navtitle="Cyclical dependencies between Java EE modules">
-</topicref>
-<topicref href="topics/tjcircleb.dita" navtitle="Correcting cyclical dependencies after an EAR
-is imported"></topicref>
-<anchor id="after_dependencies"/>
-<anchor id="importexport_bottom"/></topicref>
-<anchor id="after_importexport"/></topicref>
-<anchor id="after_projects"/>
-<anchor id="before_validation"/>
-<topicref href="topics/tjval.dita" navtitle="Validating code in enterprise applications">
-<anchor id="validation_top"/>
-<topicref href="topics/rtunevalidat.dita" navtitle="Tuning validators"></topicref>
-<topicref href="topics/rvalerr.dita" navtitle="Common validation errors and solutions">
-</topicref>
-<topicref href="topics/rvalidators.dita" navtitle="J2EE Validators">
-<anchor id="childof_validators"/></topicref>
-<topicref href="topics/tjvaldisable.dita" navtitle="Disabling validation">
-</topicref>
-<topicref href="topics/tjvalselect.dita" navtitle="Selecting code validators">
-</topicref>
-<topicref href="topics/tjvalglobalpref.dita" navtitle="Overriding global validation preferences">
-</topicref>
-<topicref href="topics/tjvalmanual.dita" navtitle="Manually validating code">
-</topicref>
-<anchor id="validation_bottom"/></topicref>
-<anchor id="after_validation"/>
-<anchor id="before_reference"/>
-<topicref href="topics/ph-ref.dita" navtitle="Reference">
-<anchor id="reference_top"/>
-<topicref href="topics/rvalidators.dita" navtitle="J2EE Validators"></topicref>
-<topicref href="topics/rvalerr.dita" navtitle="Common validation errors and solutions">
-<anchor id="validation_errors"/></topicref>
-<topicref href="topics/rjlimitcurrent.dita" navtitle="Limitations of J2EE development tools">
-<anchor id="limitations"/></topicref>
-<anchor id="reference_bottom"/></topicref>
-<anchor id="after_reference"/></topicref>
-<anchor id="map_bottom"/></map>
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 b8a1c37..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml
+++ /dev/null
@@ -1,92 +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">
-<anchor id="map_top"/>
-<topic label="Java EE applications" href="topics/ph-j2eeapp.html">
-<anchor id="before_intro_topics"/>
-<topic label="Developing Java EE 5 Applications" href="topics/cjavaee5.html">
-<topic label="Java EE 5: Overview" href="topics/cjee5overview.html"/>
-<topic label="Java EE 5 support for annotations" href="topics/cannotations.html">
-<topic label="Defining and using annotations" href="topics/tdefiningannotations.html">
-<topic label="Types of annotations" href="topics/ctypesofanno.html"/>
-</topic>
-</topic>
-</topic>
-<topic label="J2EE architecture" href="topics/cjarch.html"/>
-<topic label="Java EE perspective" href="topics/cjpers.html"/>
-<topic label="Project Explorer view in the Java EE perspective" href="topics/cjview.html"/>
-<anchor id="after_intro_topics"/>
-<anchor id="before_filters"/>
-<topic label="Filtering in the Project Explorer view" href="topics/tjviewfilters.html"/>
-<anchor id="after_filters"/>
-<anchor id="before_projects"/>
-<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"/>
-<anchor id="project_types"/>
-<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"/>
-<anchor id="creating_projects"/>
-<topic label="Specifying target servers for J2EE projects" href="topics/tjtargetserver.html"/>
-<anchor id="target_servers"/>
-<topic label="Project facets" href="topics/cfacets.html">
-<topic label="Adding a facet to a Java EE project" href="topics/taddingfacet.html"/>
-<topic label="Changing the version of a facet" href="topics/tchangefacet.html"/>
-<topic label="Changing the Java compiler version for a Java EE project" href="topics/tchangejavalevel.html"/>
-<anchor id="childof_J2EEProjectFacets"/>
-</topic>
-<anchor id="J2EEProjectFacets"/>
-<anchor id="before_importexport"/>
-<topic label="Importing and exporting projects and files" href="topics/ph-importexport.html">
-<anchor id="importexport_top"/>
-<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"/>
-<anchor id="export_types"/>
-<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"/>
-<anchor id="import_types"/>
-<anchor id="before_dependencies"/>
-<topic label="Cyclical dependencies between Java EE modules" href="topics/cjcircle.html"/>
-<topic label="Correcting cyclical dependencies after an EAR is imported" href="topics/tjcircleb.html"/>
-<anchor id="after_dependencies"/>
-<anchor id="importexport_bottom"/>
-</topic>
-<anchor id="after_importexport"/>
-</topic>
-<anchor id="after_projects"/>
-<anchor id="before_validation"/>
-<topic label="Validating code in enterprise applications" href="topics/tjval.html">
-<anchor id="validation_top"/>
-<topic label="Tuning validators" href="topics/rtunevalidat.html"/>
-<topic label="Common validation errors and solutions" href="topics/rvalerr.html"/>
-<topic label="J2EE Validators" href="topics/rvalidators.html">
-<anchor id="childof_validators"/>
-</topic>
-<topic label="Disabling validation" href="topics/tjvaldisable.html"/>
-<topic label="Selecting code validators" href="topics/tjvalselect.html"/>
-<topic label="Overriding global validation preferences" href="topics/tjvalglobalpref.html"/>
-<topic label="Manually validating code" href="topics/tjvalmanual.html"/>
-<anchor id="validation_bottom"/>
-</topic>
-<anchor id="after_validation"/>
-<anchor id="before_reference"/>
-<topic label="Reference" href="topics/ph-ref.html">
-<anchor id="reference_top"/>
-<topic label="J2EE Validators" href="topics/rvalidators.html"/>
-<topic label="Common validation errors and solutions" href="topics/rvalerr.html">
-<anchor id="validation_errors"/>
-</topic>
-<topic label="Limitations of J2EE development tools" href="topics/rjlimitcurrent.html">
-<anchor id="limitations"/>
-</topic>
-<anchor id="reference_bottom"/>
-</topic>
-<anchor id="after_reference"/>
-</topic>
-<anchor id="map_bottom"/>
-</toc>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/myplugin.xml b/docs/org.eclipse.jst.j2ee.doc.user/myplugin.xml
deleted file mode 100644
index d718056..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/myplugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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" />
- <index path="index/"/>
- </extension>
- <extension point="org.eclipse.help.index">
- <index file="org.eclipse.jst.j2ee.doc.userindex.xml"/>
- </extension>
- <extension point="org.eclipse.help.base.luceneSearchParticipants">
- <binding participantId="org.eclipse.help.base.xhtml"/>
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.user.maplist b/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.user.maplist
deleted file mode 100644
index ab8c2ad..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.user.maplist
+++ /dev/null
@@ -1,9 +0,0 @@
-<maplist version="3.6.2">
- <nav>
- <map file="jst_j2ee_toc.ditamap"/>
- </nav>
- <link>
- <map file="jst_j2ee_toc.ditamap"/>
- <map file="jst_j2ee_relsmap.ditamap"/>
- </link>
-</maplist>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.xml b/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.xml
deleted file mode 100644
index 3755b16..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
- <entry keyword="Java Enterprise Edition 5">
- <entry keyword="Overview">
- <topic href="topics/cjavaee5.html#cjavaee5" title="Developing Java EE 5 Applications"/>
- </entry>
- </entry>
- <entry keyword="Java EE 5">
- <topic href="topics/cjee5overview.html#cjavaee5" title="Java EE 5: Overview"/>
- <entry keyword="annotations">
- <topic href="topics/cannotations.html#cjavaee5" title="Java EE 5 support for annotations"/>
- <topic href="topics/tdefiningannotations.html#tjimpear" title="Defining and using annotations"/>
- <entry keyword="types">
- <topic href="topics/ctypesofanno.html#cjavaee5" title="Types of annotations"/>
- </entry>
- </entry>
- <entry keyword="defining">
- <topic href="topics/tdefiningannotations.html#tjimpear" title="Defining and using annotations"/>
- </entry>
- </entry>
- <entry keyword="Oerview">
- <topic href="topics/cjee5overview.html#cjavaee5" title="Java EE 5: Overview"/>
- </entry>
- <entry keyword="J2EE">
- <entry keyword="architecture">
- <topic href="topics/cjarch.html#cjarch" title="J2EE architecture"/>
- </entry>
- <entry keyword="enterprise application projects">
- <entry keyword="overview">
- <topic href="topics/cjearproj.html#cjearproj" title="Enterprise application projects"/>
- </entry>
- <entry keyword="creating">
- <topic href="topics/tjear.html#tjear" title="Creating an enterprise application project"/>
- </entry>
- </entry>
- <entry keyword="target servers">
- <topic href="topics/tjtargetserver.html#tjtargetserver" title="Specifying target servers for J2EE projects"/>
- </entry>
- <entry keyword="tool limitations">
- <topic href="topics/rjlimitcurrent.html#rjlimitcurrent" title="Limitations of J2EE development tools"/>
- </entry>
- </entry>
- <entry keyword="Java EE">
- <topic href="topics/cjarch.html#cjarch" title="J2EE architecture"/>
- <entry keyword="workbench perspectives">
- <topic href="topics/cjpers.html#cjpers" title="Java EE perspective"/>
- </entry>
- <entry keyword="application client projects">
- <topic href="topics/cjappcliproj.html#cjappcliproj" title="Application client projects"/>
- </entry>
- <entry keyword="project facets">
- <topic href="topics/cfacets.html#cfacets" title="Project facets"/>
- </entry>
- <entry keyword="adding project facets">
- <topic href="topics/taddingfacet.html#taddingfacet" title="Adding a facet to a Java EE project"/>
- </entry>
- <entry keyword="changing facet versions">
- <topic href="topics/tchangefacet.html#tchangefacet" title="Changing the version of a facet"/>
- </entry>
- <entry keyword="project compiler level">
- <topic href="topics/tchangejavalevel.html#tchangejavalevel" title="Changing the Java compiler version for a Java EE project"/>
- </entry>
- <entry keyword="cyclical dependencies between modules">
- <topic href="topics/cjcircle.html#cjcircle" title="Cyclical dependencies between Java EE modules"/>
- </entry>
- </entry>
- <entry keyword="enterprise applications">
- <entry keyword="Java EE perspective">
- <topic href="topics/cjpers.html#cjpers" title="Java EE perspective"/>
- </entry>
- <entry keyword="projects">
- <entry keyword="artifacts">
- <topic href="topics/cjearproj.html#cjearproj" title="Enterprise application projects"/>
- </entry>
- <entry keyword="creating">
- <topic href="topics/tjear.html#tjear" title="Creating an enterprise application project"/>
- </entry>
- <entry keyword="exporting">
- <topic href="topics/tjexpear.html#tjexpear" title="Exporting an enterprise application into an EAR file"/>
- </entry>
- <entry keyword="importing">
- <topic href="topics/tjimpear.html#tjimpear" title="Importing an enterprise application EAR file"/>
- </entry>
- </entry>
- </entry>
- <entry keyword="views">
- <entry keyword="Project Explorer">
- <topic href="topics/cjview.html#cjview" title="Project Explorer view in the Java EE perspective"/>
- </entry>
- <entry keyword="Project Explorer filters">
- <topic href="topics/tjviewfilters.html#cjviewfiltersCait" title="Filtering in the Project Explorer view"/>
- </entry>
- </entry>
- <entry keyword="filters">
- <entry keyword="Project Explorer view">
- <topic href="topics/tjviewfilters.html#cjviewfiltersCait" title="Filtering in the Project Explorer view"/>
- </entry>
- </entry>
- <entry keyword="projects">
- <entry keyword="filtering">
- <topic href="topics/tjviewfilters.html#cjviewfiltersCait" title="Filtering in the Project Explorer view"/>
- </entry>
- <entry keyword="enterprise applications">
- <topic href="topics/cjearproj.html#cjearproj" title="Enterprise application projects"/>
- </entry>
- <entry keyword="target servers">
- <topic href="topics/tjtargetserver.html#tjtargetserver" title="Specifying target servers for J2EE projects"/>
- </entry>
- <entry keyword="facets">
- <entry keyword="overview">
- <topic href="topics/cfacets.html#cfacets" title="Project facets"/>
- </entry>
- <entry keyword="adding">
- <topic href="topics/taddingfacet.html#taddingfacet" title="Adding a facet to a Java EE project"/>
- </entry>
- </entry>
- <entry keyword="changing facet versions">
- <topic href="topics/tchangefacet.html#tchangefacet" title="Changing the version of a facet"/>
- </entry>
- <entry keyword="Java compiler level">
- <topic href="topics/tchangejavalevel.html#tchangejavalevel" title="Changing the Java compiler version for a Java EE project"/>
- </entry>
- <entry keyword="cyclical dependencies">
- <topic href="topics/cjcircle.html#cjcircle" title="Cyclical dependencies between Java EE modules"/>
- </entry>
- <entry keyword="correcting cyclical dependencies">
- <topic href="topics/tjcircleb.html#tjcircleb" title="Correcting cyclical dependencies after an EAR is imported"/>
- </entry>
- </entry>
- <entry keyword="application client projects">
- <entry keyword="overview">
- <topic href="topics/cjappcliproj.html#cjappcliproj" title="Application client projects"/>
- </entry>
- <entry keyword="creating">
- <topic href="topics/tjappproj.html#tjappproj" title="Creating an application client project"/>
- </entry>
- <entry keyword="exporting">
- <topic href="topics/tjexpapp.html#tjexpapp" title="Exporting an application client project"/>
- </entry>
- <entry keyword="importing">
- <topic href="topics/tjimpapp.html#tjimpapp" title="Importing an application client JAR file"/>
- </entry>
- </entry>
- <entry keyword="connector projects">
- <entry keyword="creating">
- <topic href="topics/tjrar.html#tjrar" title="Creating a connector project"/>
- </entry>
- <entry keyword="exporting">
- <topic href="topics/tjexprar.html#tjexprar" title="Exporting connector projects to RAR files"/>
- </entry>
- <entry keyword="importing">
- <topic href="topics/tjimprar.html#tjimprar" title="Importing a connector project RAR file"/>
- </entry>
- </entry>
- <entry keyword="target servers">
- <entry keyword="J2EE applications">
- <topic href="topics/tjtargetserver.html#tjtargetserver" title="Specifying target servers for J2EE projects"/>
- </entry>
- </entry>
- <entry keyword="JavaServer Faces (JSF)">
- <entry keyword="project facets">
- <topic href="topics/cfacets.html#cfacets" title="Project facets"/>
- </entry>
- </entry>
- <entry keyword="facets">
- <entry keyword="changing versions">
- <topic href="topics/tchangefacet.html#tchangefacet" title="Changing the version of a facet"/>
- </entry>
- </entry>
- <entry keyword="EAR">
- <entry keyword="files">
- <entry keyword="exporting">
- <topic href="topics/tjexpear.html#tjexpear" title="Exporting an enterprise application into an EAR file"/>
- </entry>
- <entry keyword="importing">
- <topic href="topics/tjimpear.html#tjimpear" title="Importing an enterprise application EAR file"/>
- </entry>
- </entry>
- </entry>
- <entry keyword="RAR files">
- <entry keyword="exporting">
- <topic href="topics/tjexprar.html#tjexprar" title="Exporting connector projects to RAR files"/>
- </entry>
- <entry keyword="importing">
- <topic href="topics/tjimprar.html#tjimprar" title="Importing a connector project RAR file"/>
- </entry>
- </entry>
- <entry keyword="dependencies">
- <entry keyword="cycles between modules">
- <topic href="topics/cjcircle.html#cjcircle" title="Cyclical dependencies between Java EE modules"/>
- </entry>
- <entry keyword="correcting cyclical">
- <topic href="topics/tjcircleb.html#tjcircleb" title="Correcting cyclical dependencies after an EAR is imported"/>
- </entry>
- </entry>
- <entry keyword="EAR files">
- <entry keyword="correcting cyclical dependencies">
- <topic href="topics/tjcircleb.html#tjcircleb" title="Correcting cyclical dependencies after an EAR is imported"/>
- </entry>
- </entry>
- <entry keyword="build validation">
- <entry keyword="enabling">
- <topic href="topics/tjval.html#tjval" title="Validating code in enterprise applications"/>
- </entry>
- </entry>
- <entry keyword="code validation">
- <entry keyword="overview">
- <topic href="topics/tjval.html#tjval" title="Validating code in enterprise applications"/>
- </entry>
- <entry keyword="error solutions">
- <topic href="topics/rvalerr.html#rvalerr" title="Common validation errors and solutions"/>
- </entry>
- <entry keyword="J2EE validators">
- <topic href="topics/rvalidators.html#rvalidators" title="J2EE Validators"/>
- </entry>
- <entry keyword="disabling">
- <topic href="topics/tjvaldisable.html#tjvaldisable" title="Disabling validation"/>
- </entry>
- <entry keyword="selecting validators">
- <topic href="topics/tjvalselect.html#tjvalselect" title="Selecting code validators"/>
- </entry>
- <entry keyword="overriding global preferences">
- <topic href="topics/tjvalglobalpref.html#tjvalglobalpref" title="Overriding global validation preferences"/>
- </entry>
- <entry keyword="manual">
- <topic href="topics/tjvalmanual.html#tjvalmanual" title="Manually validating code"/>
- </entry>
- </entry>
- <entry keyword="validation">
- <entry keyword="overview">
- <topic href="topics/tjval.html#tjval" title="Validating code in enterprise applications"/>
- </entry>
- <entry keyword="error solutions">
- <topic href="topics/rvalerr.html#rvalerr" title="Common validation errors and solutions"/>
- </entry>
- <entry keyword="J2EE validators">
- <topic href="topics/rvalidators.html#rvalidators" title="J2EE Validators"/>
- </entry>
- <entry keyword="disabling">
- <topic href="topics/tjvaldisable.html#tjvaldisable" title="Disabling validation"/>
- </entry>
- <entry keyword="selecting validators">
- <topic href="topics/tjvalselect.html#tjvalselect" title="Selecting code validators"/>
- </entry>
- <entry keyword="overriding global preferences">
- <topic href="topics/tjvalglobalpref.html#tjvalglobalpref" title="Overriding global validation preferences"/>
- </entry>
- <entry keyword="manual">
- <topic href="topics/tjvalmanual.html#tjvalmanual" title="Manually validating code"/>
- </entry>
- </entry>
-</index>
\ No newline at end of file
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 15a4950..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 documentation
-pluginProvider = Eclipse.org
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 d718056..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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" />
- <index path="index/"/>
- </extension>
- <extension point="org.eclipse.help.index">
- <index file="org.eclipse.jst.j2ee.doc.userindex.xml"/>
- </extension>
- <extension point="org.eclipse.help.base.luceneSearchParticipants">
- <binding participantId="org.eclipse.help.base.xhtml"/>
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita
deleted file mode 100644
index 196f729..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title"><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 support for annotations</title>
-<shortdesc outputclass="id_shortdesc">The goal of <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 platform development is to minimize
-the number of artifacts that you have to create and maintain, thereby simplifying
-the development process. <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 supports the injection of annotations
-into your source code, so that you can embed resources, dependencies, services,
-and life-cycle notifications in your source code, without having to maintain
-these artifacts elsewhere.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5<indexterm>annotations</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p>An annotation is a modifier or Metadata tag that provides additional data
-to <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> classes,
-interfaces, constructors, methods, fields, parameters, and local variables.
-Annotations replace boilerplate code, common code that is required by certain
-applications. For example, an annotation can replace the paired interface
-and implementation required for a Web service. Annotations can also replace
-additional files that programs require, which are maintained separately. By
-using an annotation, this separate file is no longer required. For example,
-annotations can replace the need for a separately maintained deployment descriptor
-for <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm>. </p>
-<p>Annotations<ul>
-<li>Replace descriptors for most purposes</li>
-<li>Remove the need for marker interfaces (like java.rmi.Remote)</li>
-<li>Allow application settings to be visible in the component they affect</li>
-</ul></p>
-<p>Java EE 5 provides annotations for the following tasks, among others:<ul>
-<li>Developing Enterprise JavaBean applications</li>
-<li>Defining and using Web services</li>
-<li>Mapping Java technology classes to XML</li>
-<li>Mapping Java technology classes to databases</li>
-<li>Mapping methods to operations</li>
-<li>Specifying external dependencies</li>
-<li>Specirying deployment information, including security attributes</li>
-</ul></p>
-<p><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 defines a number of annotations that can be injected into your source code.
-To declare an annotation, you simply precede the keyword with an "at" sign
-(@). <codeblock>
-package com.ibm.counter;
-
-import javax.ejb.Stateless;
-
-@Stateless
-
-public class CounterBean {
-
-}</codeblock></p>
-<p>For more information about the categories of annotations that <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 supports, see <xref href="ctypesofanno.dita">Types of annotations</xref>.</p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html
deleted file mode 100644
index 029ce1a..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html
+++ /dev/null
@@ -1,109 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Java EE 5 support for annotations" />
-<meta name="abstract" content="The goal of Java EE 5 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 supports the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere." />
-<meta name="description" content="The goal of Java EE 5 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 supports the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere." />
-<meta content="Java EE 5, annotations" name="DC.subject" />
-<meta content="Java EE 5, annotations" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tdefiningannotations.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE 5 support for annotations</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Java EE 5 support for annotations</h1>
-
-
-
-<div><p class="id_shortdesc">The goal of Java™ EE 5 platform development is to minimize
-the number of artifacts that you have to create and maintain, thereby simplifying
-the development process. Java EE 5 supports the injection of annotations
-into your source code, so that you can embed resources, dependencies, services,
-and life-cycle notifications in your source code, without having to maintain
-these artifacts elsewhere.</p>
-
-<p>An annotation is a modifier or Metadata tag that provides additional data
-to Java classes,
-interfaces, constructors, methods, fields, parameters, and local variables.
-Annotations replace boilerplate code, common code that is required by certain
-applications. For example, an annotation can replace the paired interface
-and implementation required for a Web service. Annotations can also replace
-additional files that programs require, which are maintained separately. By
-using an annotation, this separate file is no longer required. For example,
-annotations can replace the need for a separately maintained deployment descriptor
-for JavaBeans™. </p>
-
-<div class="p">Annotations<ul>
-<li>Replace descriptors for most purposes</li>
-
-<li>Remove the need for marker interfaces (like java.rmi.Remote)</li>
-
-<li>Allow application settings to be visible in the component they affect</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides annotations for the following tasks, among others:<ul>
-<li>Developing Enterprise JavaBean applications</li>
-
-<li>Defining and using Web services</li>
-
-<li>Mapping Java technology classes to XML</li>
-
-<li>Mapping Java technology classes to databases</li>
-
-<li>Mapping methods to operations</li>
-
-<li>Specifying external dependencies</li>
-
-<li>Specirying deployment information, including security attributes</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE
-5 defines a number of annotations that can be injected into your source code.
-To declare an annotation, you simply precede the keyword with an "at" sign
-(@). <pre>
-package com.ibm.counter;
-
-import javax.ejb.Stateless;
-
-@Stateless
-
-public class CounterBean {
-
-}</pre>
-</div>
-
-<p>For more information about the categories of annotations that Java EE
-5 supports, see <a href="ctypesofanno.html">Types of annotations</a>.</p>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tdefiningannotations.html">Defining and using annotations</a></strong><br />
-You can use the @Interface annotation to define your own annotation definition.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cjavaee5.html" title="The Java EE 5 programming model simplifies the process of creating Java applications.">Developing Java EE 5 Applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita
deleted file mode 100644
index 11b0578..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cfacets" xml:lang="en-us">
-<title outputclass="id_title">Project facets</title>
-<shortdesc outputclass="id_shortdesc">Facets define characteristics and requirements
-for Java EE projects and are used as part of the runtime configuration. </shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE<indexterm>project facets</indexterm></indexterm>
-<indexterm>JavaServer Faces (JSF)<indexterm>project facets</indexterm></indexterm>
-<indexterm>projects<indexterm>facets<indexterm>overview</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p id="aboutfacet">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>
-<p>You can add facets only to Java EE projects and other types of projects
-that are based on J2EE projects, such as enterprise application projects,
-dynamic Web projects, and EJB projects. You cannot add facets to a <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> project
-or plug-in project, for example. Typically, a facet-enabled project has at
-least one facet when it is created, allowing you to add more facets if necessary.
-For example, a new EJB project has the EJB Module facet. You can then add
-other facets to this project like the EJBDoclet (XDoclet) facet. To add a
-facet to a project, see <xref href="taddingfacet.dita"></xref>.</p>
-<p>Some facets require other facets as prerequisites. Other facets cannot
-be in the same project together. For example, you cannot add the Dynamic Web
-Module facet to an EJB project because the EJB project already has the EJB
-Module facet. Some facets can be removed from a project and others cannot.</p>
-<p>Facets also have version numbers. You can change the version numbers of
-facets as long as you stay within the requirements for the facets. To change
-the version number of a facet, see <xref href="tchangefacet.dita"></xref>.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html
deleted file mode 100644
index ae958e4..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Project facets" />
-<meta name="abstract" content="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration." />
-<meta name="description" content="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration." />
-<meta content="Java EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="DC.subject" />
-<meta content="Java EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjrar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cfacets" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Project facets</title>
-</head>
-<body id="cfacets"><a name="cfacets"><!-- --></a>
-
-
-<h1 class="id_title">Project facets</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">Facets define characteristics and requirements
-for Java EE projects and are used as part of the runtime configuration. </p>
-
-<p class="anchor_topictop" />
-
-<p id="cfacets__aboutfacet"><a name="cfacets__aboutfacet"><!-- --></a>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>
-
-<p>You can add facets only to Java EE projects and other types of projects
-that are based on J2EE projects, such as enterprise application projects,
-dynamic Web projects, and EJB projects. You cannot add facets to a Java™ project
-or plug-in project, for example. Typically, a facet-enabled project has at
-least one facet when it is created, allowing you to add more facets if necessary.
-For example, a new EJB project has the EJB Module facet. You can then add
-other facets to this project like the EJBDoclet (XDoclet) facet. To add a
-facet to a project, see <a href="taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a Java EE project</a>.</p>
-
-<p>Some facets require other facets as prerequisites. Other facets cannot
-be in the same project together. For example, you cannot add the Dynamic Web
-Module facet to an EJB project because the EJB project already has the EJB
-Module facet. Some facets can be removed from a project and others cannot.</p>
-
-<p>Facets also have version numbers. You can change the version numbers of
-facets as long as you stay within the requirements for the facets. To change
-the version number of a facet, see <a href="tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a>.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">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><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 Java EE project</a></div>
-<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
-<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita
deleted file mode 100644
index 92d44a0..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjappcliproj" xml:lang="en-us">
-<title outputclass="id_title">Application client projects</title>
-<shortdesc outputclass="id_shortdesc">Application client projects contain
-programs that run on networked client systems so the project can benefit from
-a server's tools.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>overview</indexterm></indexterm>
-<indexterm>Java EE<indexterm>application client projects</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p> Application client projects contain the resources needed for application
-client modules. An application client module is used to contain a full-function
-client <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> application (non Web-based) that connects to and
-uses the Java EE 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 Java EE 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 <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> application in a <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> project.</p>
-<p>An application client project enables you to do the following things:</p>
-<ul>
-<li>Develop the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> classes that implement the client module</li>
-<li>Set the application client deployment descriptor</li>
-<li>Test the application client</li>
-</ul>
-<p>Like <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> projects, application client projects contain the
-resources needed for application clients, including <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> class
-files. When you create a new application client project, the environment is
-set up for <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> development. A <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> builder is associated with the project
-so the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> source can be incrementally compiled as it is updated.
-The application client project contains information about the type hierarchy
-and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> elements.
-This information is kept current as changes are made, and the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> 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 <codeph>application.xml</codeph> 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 <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> 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 Java EE (EJB) servers. The point of entry for the application
-client is a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> main-class, which is simply a <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> class
-that contains a static main method. The class is declared in the manifest
-file of the client module. </p>
-<p>A Java EE application client container provides access to the Java EE 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 <uicontrol>appClientModule</uicontrol>,
-which contains both <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> source code and compiled <codeph>.class</codeph> files,
-along with all the meta-data files in the <uicontrol>META-INF</uicontrol> subfolder.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
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 9848770..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html
+++ /dev/null
@@ -1,114 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Application client projects" />
-<meta name="abstract" content="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools." />
-<meta name="description" content="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools." />
-<meta content="application client projects, overview, Java EE" name="DC.subject" />
-<meta content="application client projects, overview, Java EE" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjappcliproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Application client projects</title>
-</head>
-<body id="cjappcliproj"><a name="cjappcliproj"><!-- --></a>
-
-
-<h1 class="id_title">Application client projects</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">Application client projects contain
-programs that run on networked client systems so the project can benefit from
-a server's tools.</p>
-
-<p class="anchor_topictop" />
-
-<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 Java EE 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 Java EE 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 builder 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 Java EE (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 Java EE application client container provides access to the Java EE 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>
-
-<p class="anchor_topicbottom" />
-
-</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 applications.">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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.dita
deleted file mode 100644
index f715cd4..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjarch" xml:lang="en-us">
-<title outputclass="id_title">J2EE architecture</title>
-<shortdesc outputclass="id_shortdesc">The <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Platform, Enterprise Edition (J2EE)
-provides a standard for developing multitier, enterprise applications.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>J2EE<indexterm>architecture</indexterm></indexterm><indexterm>Java
-EE</indexterm></keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></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>
-<dl><dlentry outputclass="id_projectfiles_top">
-<dt>Client tier</dt>
-<dd>In the client tier, Web components, such as Servlets and JavaServer Pages
-(JSPs), or standalone <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> applications provide a dynamic interface
-to the middle tier.</dd>
-</dlentry><dlentry>
-<dt>Middle tier</dt>
-<dd>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.</dd>
-</dlentry><dlentry>
-<dt>Enterprise data tier</dt>
-<dd>In the data tier, the enterprise's data is stored and persisted, typically
-in a relational database.</dd>
-</dlentry></dl>
-<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 <xref format="html" href="http://java.sun.com/j2ee/download.html#platformspec"
-scope="external">J2EE 1.4 Specification<desc></desc></xref>.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
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 c321ffc..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html
+++ /dev/null
@@ -1,103 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="J2EE architecture" />
-<meta name="abstract" content="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications." />
-<meta name="description" content="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications." />
-<meta content="J2EE, architecture, Java EE" name="DC.subject" />
-<meta content="J2EE, architecture, Java EE" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjarch" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>J2EE architecture</title>
-</head>
-<body id="cjarch"><a name="cjarch"><!-- --></a>
-
-
-<h1 class="id_title">J2EE architecture</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">The Java™ 2 Platform, Enterprise Edition (J2EE)
-provides a standard for developing multitier, enterprise applications.</p>
-
-<p class="anchor_topictop" />
-
-<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>
-
-<dl>
-<dt class="dlterm">Client tier</dt>
-
-<dd>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.</dd>
-
-
-<dt class="dlterm">Middle tier</dt>
-
-<dd>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.</dd>
-
-
-<dt class="dlterm">Enterprise data tier</dt>
-
-<dd>In the data tier, the enterprise's data is stored and persisted, typically
-in a relational database.</dd>
-
-</dl>
-
-<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" title="">J2EE 1.4 Specification</a>.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<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/cjavaee5.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.dita
deleted file mode 100644
index 1e5e146..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title">Developing <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 Applications</title>
-<shortdesc outputclass="id_shortdesc">The <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 programming model simplifies the
-process of creating <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> applications.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java Enterprise Edition 5<indexterm>Overview</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p id="aboutfacet">In the Java EE 5 specifications, programming requirements
-have been streamlined, and XML deployment descriptors are optional. Instead,
-you can specify many details of assembly and deployment with Java annotations.
-Java EE 5 will provide default values in many situations so explicitly specification
-of these values are not required.</p>
-<p>Code validation, content assistance, Quick Fixes, and refactoring simplify
-working with your code. Code validators check your projects for errors. When
-an error is found, you can double-click on it in the Problems view in the
-product workbench to go to the error location. For some error types, you can
-use a Quick Fix to correct the error automatically. For both <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> source
-and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> annotations,
-you can rely on content assistance to simplify your programming task. When
-you refactor source code, the tools automatically update the associated metadata.</p>
-<p>For additional information on <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5.0, see the official specification: <xref
-href="http://jcp.org/en/jsr/detail?id=244" scope="external">JSR 244: <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Platform,
-Enterprise Edition 5 (<tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5) Specification</xref></p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html
deleted file mode 100644
index d70c2c6..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html
+++ /dev/null
@@ -1,72 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Developing Java EE 5 Applications" />
-<meta name="abstract" content="The Java EE 5 programming model simplifies the process of creating Java applications." />
-<meta name="description" content="The Java EE 5 programming model simplifies the process of creating Java applications." />
-<meta content="Java Enterprise Edition 5, Overview" name="DC.subject" />
-<meta content="Java Enterprise Edition 5, Overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjee5overview.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cannotations.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Developing Java EE 5 Applications</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Developing Java EE 5 Applications</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">The Java™ EE 5 programming model simplifies the
-process of creating Java applications.</p>
-
-<p class="anchor_topictop" />
-
-<p id="cjavaee5__aboutfacet"><a name="cjavaee5__aboutfacet"><!-- --></a>In the Java EE 5 specifications, programming requirements
-have been streamlined, and XML deployment descriptors are optional. Instead,
-you can specify many details of assembly and deployment with Java annotations.
-Java EE 5 will provide default values in many situations so explicitly specification
-of these values are not required.</p>
-
-<p>Code validation, content assistance, Quick Fixes, and refactoring simplify
-working with your code. Code validators check your projects for errors. When
-an error is found, you can double-click on it in the Problems view in the
-product workbench to go to the error location. For some error types, you can
-use a Quick Fix to correct the error automatically. For both Java source
-and Java annotations,
-you can rely on content assistance to simplify your programming task. When
-you refactor source code, the tools automatically update the associated metadata.</p>
-
-<p>For additional information on Java EE 5.0, see the official specification: <a href="http://jcp.org/en/jsr/detail?id=244" target="_blank">JSR 244: Java Platform, Enterprise Edition 5 (Java EE 5) Specification</a></p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjee5overview.html">Java EE 5: Overview</a></strong><br />
-Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues.</li>
-<li class="ulchildlink"><strong><a href="../topics/cannotations.html">Java EE 5 support for annotations</a></strong><br />
-The goal of Java EE 5 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 supports the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere.</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 Enterprise Edition (Java EE).">Java EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita
deleted file mode 100644
index 3f4ab56..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjcircle" xml:lang="en-us">
-<title outputclass="id_title">Cyclical dependencies between Java EE modules</title>
-<shortdesc outputclass="id_shortdesc">A cyclical dependency between two or
-more modules in an enterprise application most commonly occurs when projects
-are imported from outside the Workbench.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>dependencies<indexterm>cycles between modules</indexterm></indexterm>
-<indexterm>Java EE<indexterm>cyclical dependencies between modules</indexterm></indexterm>
-<indexterm>projects<indexterm>cyclical dependencies</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>When a cycle exists between two or more modules in an enterprise application,
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> 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>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
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 6ba2fe2..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Cyclical dependencies between Java EE modules" />
-<meta name="abstract" content="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench." />
-<meta name="description" content="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench." />
-<meta content="dependencies, cycles between modules, Java EE, cyclical dependencies between modules, projects, cyclical dependencies" name="DC.subject" />
-<meta content="dependencies, cycles between modules, Java EE, cyclical dependencies between modules, projects, cyclical dependencies" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcircleb.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjcircle" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Cyclical dependencies between Java EE modules</title>
-</head>
-<body id="cjcircle"><a name="cjcircle"><!-- --></a>
-
-
-<h1 class="id_title">Cyclical dependencies between Java EE modules</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">A cyclical dependency between two or
-more modules in an enterprise application most commonly occurs when projects
-are imported from outside the Workbench.</p>
-
-<p class="anchor_topictop" />
-
-<p>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>
-
-<p class="anchor_topicbottom" />
-
-</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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.dita
deleted file mode 100644
index aca0056..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.dita
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjearproj" xml:lang="en-us">
-<title outputclass="id_title">Enterprise application projects</title>
-<shortdesc outputclass="id_shortdesc">An enterprise application project ties
-together the resources that are required to deploy a J2EE enterprise application.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>enterprise applications<indexterm>projects<indexterm>artifacts</indexterm></indexterm></indexterm>
-<indexterm>J2EE<indexterm>enterprise application projects<indexterm>overview</indexterm></indexterm></indexterm>
-<indexterm>projects<indexterm>enterprise applications</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>An enterprise application project contains a set of references to other
-J2EE modules and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> projects that are combined to compose an EAR file.
-These projects can be Web modules, EJB modules, application client modules,
-connector modules, general utility <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 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 utility JAR files. The utility JAR files defined
-for an enterprise application project can be actual JAR files in the project,
-or you can include utility <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 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 tie together 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 <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> projects, and they are not compiled
-by the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> builder.</p>
-<p>When you create an enterprise application project using the workbench,
-the following key files are automatically created:<dl><dlentry outputclass="id_projectfiles_top">
-<dt>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. This file is created in the <uicontrol>META-INF</uicontrol> folder.</dd>
-</dlentry><dlentry>
-<dt>.settings/.component</dt>
-<dd>This file matches the location of each module's source code to the location
-of the module at deployment. For each module included for deployment with
-the EAR file, the .component file lists its source path and deployment path.
-This file is created in the <uicontrol>.settings</uicontrol> folder.</dd>
-</dlentry><dlentry>
-<dt>.settings/org.eclipse.wst.common.project.facet.core.xml</dt>
-<dd>This file lists the facets of the enterprise application project. See <xref
-href="cfacets.dita"></xref>. This file is created in the <uicontrol>.settings</uicontrol> folder.</dd>
-</dlentry><dlentry outputclass="id_projectfiles_bottom">
-<dt>.project</dt>
-<dd>This is a workbench artifact, the standard project description file.</dd>
-</dlentry></dl></p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
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 3766138..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html
+++ /dev/null
@@ -1,120 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Enterprise application projects" />
-<meta name="abstract" content="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application." />
-<meta name="description" content="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application." />
-<meta content="enterprise applications, projects, artifacts, J2EE, enterprise application projects, overview" name="DC.subject" />
-<meta content="enterprise applications, projects, artifacts, J2EE, enterprise application projects, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjrar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjearproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Enterprise application projects</title>
-</head>
-<body id="cjearproj"><a name="cjearproj"><!-- --></a>
-
-
-<h1 class="id_title">Enterprise application projects</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">An enterprise application project ties
-together the resources that are required to deploy a J2EE enterprise application.</p>
-
-<p class="anchor_topictop" />
-
-<p>An enterprise application project 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 utility JAR files. 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 tie together 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. This file is created in the <span class="uicontrol">META-INF</span> folder.</dd>
-
-
-<dt class="dlterm">.settings/.component</dt>
-
-<dd>This file matches the location of each module's source code to the location
-of the module at deployment. For each module included for deployment with
-the EAR file, the .component file lists its source path and deployment path.
-This file is created in the <span class="uicontrol">.settings</span> folder.</dd>
-
-
-<dt class="dlterm">.settings/org.eclipse.wst.common.project.facet.core.xml</dt>
-
-<dd>This file lists the facets of the enterprise application project. See <a href="cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration. ">Project facets</a>. This file is created in the <span class="uicontrol">.settings</span> folder.</dd>
-
-
-<dt class="dlterm">.project</dt>
-
-<dd>This is a workbench artifact, the standard project description file.</dd>
-
-</dl>
-</div>
-
-<p class="anchor_topicbottom" />
-
-</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 applications.">J2EE architecture</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<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/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>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita
deleted file mode 100644
index 0d62b19..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title"><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5: Overview</title>
-<shortdesc outputclass="id_shortdesc">Using the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> Platform, Enterprise Edition (<tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE)
-architecture, you can build distributed Web and enterprise applications. This
-architecture helps you focus on presentation and application issues, rather
-than on systems issues.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5</indexterm><indexterm>Oerview</indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<p>You can use the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 tools and features to create applications
-that are structured around modules with different purposes, such as Web sites
-and Enterprise <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="JavaBeans">JavaBeans</tm> (EJB) applications. When you use EJB
-3.0 components, you can create a distributed, secure application with transactional
-support. When you develop applications that access persistent data, you can
-use the new <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> Persistence API (JPA). This standard simplifies
-the creation and use of persistent entities, as well as adding new features.
-For developing presentation logic, you can use technologies such as JavaServer
-Pages (JSP) or JavaServer Faces (JSF).</p>
-<p>Using the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 5 Platform Enterprise Edition (Java EE) , you
-can develop applications more quickly and conveniently than in previous versions.
-The <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 platform replaces <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Enterprise Edition (J2EE), version
-1.4. The product tools support for both versions. Java EE 5 significantly
-enhances ease of use providing<ul>
-<li>Reduced development time</li>
-<li>Reduced application complexity</li>
-<li>Improved application performance</li>
-</ul></p>
-<p>Java EE 5 provides a simplified programming model, including the following
-tools:<ul>
-<li>Inline configuration with annotations, making deployment descriptors now
-optional</li>
-<li>Dependency injection, hiding resource creation and lookup from application
-code</li>
-<li>Java persistence API (JPA) allows data management without explicit SQL
-or JDBC</li>
-<li>Use of plain old Java objects (POJOs) for Enterprise JavaBeans and Web
-services</li>
-</ul></p>
-<p>Java EE 5 provides simplified packaging rules for enterprise applications:<ul>
-<li>Web applications us .WAR files</li>
-<li>Resource adapters use .RAR files</li>
-<li>Enterprise applications use .EAR files</li>
-<li>The <codeph>lib</codeph> directory contains shared .JAR files</li>
-<li>A .JAR file with <codeph>Main-Class</codeph> implies an application client</li>
-<li>A .JAR file with @Stateless annotation implies an EJB application</li>
-<li>Many simple applications no longer require deployment descriptors, including<ul>
-<li>EJB applications (.JAR files)</li>
-<li>Web applications that use JSP technology only</li>
-<li>Application clients</li>
-<li>Enterprise applications (.EAR files)</li>
-</ul></li>
-</ul></p>
-<p>Java EE 5 provides simplified resource access using dependency injection:<ul>
-<li>In the Dependency Injection pattern, an external entity automatically
-supplies an object's dependencies.<ul>
-<li>The object need not request these resources explicitly</li>
-</ul></li>
-<li>In Java EE 5, dependency injection can be applied to all resources that
-a component needs<ul>
-<li>Creation and lookup of resources are hidden from application code</li>
-</ul></li>
-<li>Dependency injection can be applied throughout Java EE 5 technology:<ul>
-<li>EJB containers</li>
-<li>Web containers</li>
-<li>Clients</li>
-<li>Web services</li>
-</ul></li>
-</ul></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html
deleted file mode 100644
index 3cb28f3..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html
+++ /dev/null
@@ -1,144 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Java EE 5: Overview" />
-<meta name="abstract" content="Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues." />
-<meta name="description" content="Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues." />
-<meta content="Java EE 5, Oerview" name="DC.subject" />
-<meta content="Java EE 5, Oerview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE 5: Overview</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Java EE 5: Overview</h1>
-
-
-
-<div><p class="id_shortdesc">Using the Java™ Platform, Enterprise Edition (Java EE)
-architecture, you can build distributed Web and enterprise applications. This
-architecture helps you focus on presentation and application issues, rather
-than on systems issues.</p>
-
-<p>You can use the Java EE 5 tools and features to create applications
-that are structured around modules with different purposes, such as Web sites
-and Enterprise JavaBeans™ (EJB) applications. When you use EJB
-3.0 components, you can create a distributed, secure application with transactional
-support. When you develop applications that access persistent data, you can
-use the new Java Persistence API (JPA). This standard simplifies
-the creation and use of persistent entities, as well as adding new features.
-For developing presentation logic, you can use technologies such as JavaServer
-Pages (JSP) or JavaServer Faces (JSF).</p>
-
-<div class="p">Using the Java EE 5 Platform Enterprise Edition (Java EE) , you
-can develop applications more quickly and conveniently than in previous versions.
-The Java EE
-5 platform replaces Java 2 Enterprise Edition (J2EE), version
-1.4. The product tools support for both versions. Java EE 5 significantly
-enhances ease of use providing<ul>
-<li>Reduced development time</li>
-
-<li>Reduced application complexity</li>
-
-<li>Improved application performance</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides a simplified programming model, including the following
-tools:<ul>
-<li>Inline configuration with annotations, making deployment descriptors now
-optional</li>
-
-<li>Dependency injection, hiding resource creation and lookup from application
-code</li>
-
-<li>Java persistence API (JPA) allows data management without explicit SQL
-or JDBC</li>
-
-<li>Use of plain old Java objects (POJOs) for Enterprise JavaBeans and Web
-services</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides simplified packaging rules for enterprise applications:<ul>
-<li>Web applications us .WAR files</li>
-
-<li>Resource adapters use .RAR files</li>
-
-<li>Enterprise applications use .EAR files</li>
-
-<li>The <samp class="codeph">lib</samp> directory contains shared .JAR files</li>
-
-<li>A .JAR file with <samp class="codeph">Main-Class</samp> implies an application client</li>
-
-<li>A .JAR file with @Stateless annotation implies an EJB application</li>
-
-<li>Many simple applications no longer require deployment descriptors, including<ul>
-<li>EJB applications (.JAR files)</li>
-
-<li>Web applications that use JSP technology only</li>
-
-<li>Application clients</li>
-
-<li>Enterprise applications (.EAR files)</li>
-
-</ul>
-</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides simplified resource access using dependency injection:<ul>
-<li>In the Dependency Injection pattern, an external entity automatically
-supplies an object's dependencies.<ul>
-<li>The object need not request these resources explicitly</li>
-
-</ul>
-</li>
-
-<li>In Java EE 5, dependency injection can be applied to all resources that
-a component needs<ul>
-<li>Creation and lookup of resources are hidden from application code</li>
-
-</ul>
-</li>
-
-<li>Dependency injection can be applied throughout Java EE 5 technology:<ul>
-<li>EJB containers</li>
-
-<li>Web containers</li>
-
-<li>Clients</li>
-
-<li>Web services</li>
-
-</ul>
-</li>
-
-</ul>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cjavaee5.html" title="The Java EE 5 programming model simplifies the process of creating Java applications.">Developing Java EE 5 Applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita
deleted file mode 100644
index 408bd00..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjpers" xml:lang="en-us">
-<title outputclass="id_title"><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective</title>
-<shortdesc outputclass="id_shortdesc">The <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 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.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE<indexterm>workbench perspectives</indexterm></indexterm>
-<indexterm>enterprise applications<indexterm>Java EE perspective</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>You can rearrange the location, tiling, and size of the views within the
-perspective. You can also add other views to the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective by clicking <menucascade>
-<uicontrol>Window</uicontrol><uicontrol>Show View</uicontrol></menucascade> 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 <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective includes the following
-workbench views:</p>
-<dl><dlentry outputclass="id_perspectiveviews_top">
-<dt><uicontrol>Project Explorer</uicontrol></dt>
-<dd>The Project Explorer view provides an integrated view of your projects
-and their artifacts related to J2EE development. You can show or hide your
-projects based on working sets. This view displays navigable models of J2EE
-deployment descriptors, <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 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>
-</dlentry><dlentry>
-<dt><uicontrol> Outline</uicontrol></dt>
-<dd>The Outline view in the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 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 <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> editor,
-the Outline view shows the outline for the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> class.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Tasks</uicontrol></dt>
-<dd>The Tasks view lists the to-do items that you have entered.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Problems</uicontrol></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>
-</dlentry><dlentry>
-<dt><uicontrol>Properties</uicontrol></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.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Servers</uicontrol></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>
-</dlentry><dlentry outputclass="id_perspectiveviews_bottom">
-<dt><uicontrol>Snippets</uicontrol></dt>
-<dd>The Snippets view provides categorized pieces of code that you can insert
-into appropriate places in your source code.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Data Source Explorer</uicontrol></dt>
-<dd>The Data Source Explorer provides a list of configured connection profiles.
-If categories are enabled, you can see the list grouped into categories. Use
-the Data Source Explorer to connect to, navigate, and interact with resources
-associated with the selected connection profile. It also provides import and
-export capabilities to share connection profile definitions with other Eclipse
-Workbenches. </dd>
-</dlentry><dlentry>
-<dt><uicontrol>Status bar</uicontrol></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>
-</dlentry></dl>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
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 f44fe0c..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html
+++ /dev/null
@@ -1,133 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Java EE perspective" />
-<meta name="abstract" content="The Java EE 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." />
-<meta name="description" content="The Java EE 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." />
-<meta content="Java EE, workbench perspectives, enterprise applications, Java EE perspective" name="DC.subject" />
-<meta content="Java EE, workbench perspectives, enterprise applications, Java EE perspective" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjpers" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE perspective</title>
-</head>
-<body id="cjpers"><a name="cjpers"><!-- --></a>
-
-
-<h1 class="id_title">Java EE perspective</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">The Java™ EE 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 class="anchor_topictop" />
-
-<p>You can rearrange the location, tiling, and size of the views within the
-perspective. You can also add other views to the Java EE 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 Java EE perspective includes the following
-workbench views:</p>
-
-<dl>
-<dt class="dlterm"><span class="uicontrol">Project Explorer</span></dt>
-
-<dd>The Project Explorer view provides an integrated view of your projects
-and their artifacts related to J2EE development. You can show or hide your
-projects based on working sets. This view 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 Java EE 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.</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>
-
-
-<dt class="dlterm"><span class="uicontrol">Data Source Explorer</span></dt>
-
-<dd>The Data Source Explorer provides a list of configured connection profiles.
-If categories are enabled, you can see the list grouped into categories. Use
-the Data Source Explorer to connect to, navigate, and interact with resources
-associated with the selected connection profile. It also provides import and
-export capabilities to share connection profile definitions with other Eclipse
-Workbenches. </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>
-
-</dl>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm">Working sets</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.dita
deleted file mode 100644
index 8ca49e1..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.dita
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjview" xml:lang="en-us">
-<title outputclass="id_title">Project Explorer view in the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-perspective</title>
-<shortdesc outputclass="id_shortdesc">While developing J2EE applications in
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-perspective, the Project Explorer view is your main view of your J2EE projects
-and resources.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>views<indexterm>Project Explorer</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>The Project Explorer view provides an integrated view of all project resources,
-including models of J2EE deployment descriptors, <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> artifacts, resources, Web services,
-databases, and dynamic Web project artifacts.</p>
-<p>You should use this view to work with your J2EE deployment descriptors
-and their content. You can 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,
-select <uicontrol>Customize View...</uicontrol> from the drop-down menu at
-the top right corner of the view. For more information, see <xref href="cjviewfilters.dita">Filters
-in the Project Explorer view</xref>.</p>
-<p>Alternately, you can filter what you see by showing or hiding working sets,
-groups of related resources or projects. For more information, see <xref format="html"
-href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" scope="peer">Working
-Sets<desc></desc></xref>.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
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 5938c0d..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html
+++ /dev/null
@@ -1,69 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Project Explorer view in the Java EE perspective" />
-<meta name="abstract" content="While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources." />
-<meta name="description" content="While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources." />
-<meta content="views, Project Explorer" name="DC.subject" />
-<meta content="views, Project Explorer" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjviewfilters.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjview" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Project Explorer view in the Java EE
-perspective</title>
-</head>
-<body id="cjview"><a name="cjview"><!-- --></a>
-
-
-<h1 class="id_title">Project Explorer view in the Java EE
-perspective</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">While developing J2EE applications in
-the Java™ EE
-perspective, the Project Explorer view is your main view of your J2EE projects
-and resources.</p>
-
-<p class="anchor_topictop" />
-
-<p>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>
-
-<p>You should use this view to work with your J2EE deployment descriptors
-and their content. You can 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,
-select <span class="uicontrol">Customize View...</span> from the drop-down menu at
-the top right corner of the view. For more information, see <a href="cjviewfilters.html">Filters in the Project Explorer view</a>.</p>
-
-<p>Alternately, you can filter what you see by showing or hiding working sets,
-groups of related resources or projects. For more information, see <a href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" title="">Working Sets</a>.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjviewfilters.html" title="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see.">Filtering in the Project Explorer view</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm">Working sets</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.dita
deleted file mode 100644
index be377a1..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjviewfilters" xml:lang="en-us">
-<title outputclass="id_title">Filters in the Project Explorer view</title>
-<shortdesc outputclass="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>filters<indexterm>Project Explorer view</indexterm></indexterm>
-<indexterm>views<indexterm>Project Explorer filters</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>To enable or disable filters, complete the following steps:<ol>
-<li>Open the Select Common Navigator Filters window by selecting <uicontrol>Customize
-View...</uicontrol> from the drop-down menu at the top right corner of the
-view.</li>
-<li>On the <uicontrol>Filters</uicontrol> tab, select the check boxes next
-to the filters you want to enable. For example, when the <uicontrol>Closed
- projects</uicontrol> 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".</li>
-<li>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 checkbox
-next to <uicontrol>J2EE Deployment Descriptors</uicontrol>, the deployment
-descriptors are hidden from each project in the view.</li>
-</ol></p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
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 621bba3..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Filters in the Project Explorer view" />
-<meta name="abstract" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta name="description" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta content="filters, Project Explorer view, views, Project Explorer filters" name="DC.subject" />
-<meta content="filters, Project Explorer view, views, Project Explorer filters" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjviewfilters" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Filters in the Project Explorer view</title>
-</head>
-<body id="cjviewfilters"><a name="cjviewfilters"><!-- --></a>
-
-
-<h1 class="id_title">Filters in the Project Explorer view</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</p>
-
-<p class="anchor_topictop" />
-
-<div class="p">To enable or disable filters, complete the following steps:<ol>
-<li>Open the Select Common Navigator Filters window by selecting <span class="uicontrol">Customize
-View...</span> from the drop-down menu at the top right corner of the
-view.</li>
-
-<li>On the <span class="uicontrol">Filters</span> 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".</li>
-
-<li>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 checkbox
-next to <span class="uicontrol">J2EE Deployment Descriptors</span>, the deployment
-descriptors are hidden from each project in the view.</li>
-
-</ol>
-</div>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita
deleted file mode 100644
index f1288bf..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title">Types of annotations</title>
-<shortdesc outputclass="id_shortdesc"><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 defines a number of types or groups
-of annotations, defined in a number of <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> Specification Requests (JSRs).</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5<indexterm>annotations<indexterm>types</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 defines the following types of annotations:</p>
-<ul>
-<li>JSR 250: Common annotations<b></b></li>
-<li>JSR-220: EJB 3.0 annotations</li>
-<li>JSR-181: Web Services annotations</li>
-<li>JSR-220: Java Persistence API annotations</li>
-<li>JSR-222: JaxB annotations</li>
-<li>JSR-224: WS2 annotations</li>
-</ul>
-<p>For additional information on <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5.0, see the official specification: <xref
-href="http://jcp.org/en/jsr/detail?id=244" scope="external">JSR 244: <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Platform,
-Enterprise Edition 5 (<tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5) Specification</xref></p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html
deleted file mode 100644
index 5bc623b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html
+++ /dev/null
@@ -1,66 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Types of annotations" />
-<meta name="abstract" content="Java EE 5 defines a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs)." />
-<meta name="description" content="Java EE 5 defines a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs)." />
-<meta content="Java EE 5, annotations, types" name="DC.subject" />
-<meta content="Java EE 5, annotations, types" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tdefiningannotations.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Types of annotations</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Types of annotations</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">Java™ EE 5 defines a number of types or groups
-of annotations, defined in a number of Java Specification Requests (JSRs).</p>
-
-<p class="anchor_topictop" />
-
-<p>Java EE
-5 defines the following types of annotations:</p>
-
-<ul>
-<li>JSR 250: Common annotations<strong /></li>
-
-<li>JSR-220: EJB 3.0 annotations</li>
-
-<li>JSR-181: Web Services annotations</li>
-
-<li>JSR-220: Java Persistence API annotations</li>
-
-<li>JSR-222: JaxB annotations</li>
-
-<li>JSR-224: WS2 annotations</li>
-
-</ul>
-
-<p>For additional information on Java EE 5.0, see the official specification: <a href="http://jcp.org/en/jsr/detail?id=244" target="_blank">JSR 244: Java Platform, Enterprise Edition 5 (Java EE 5) Specification</a></p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tdefiningannotations.html" title="You can use the @Interface annotation to define your own annotation definition.">Defining and using annotations</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.dita
deleted file mode 100644
index 833c39f..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.dita
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="ph-importexport" xml:lang="en-us">
-<title outputclass="id_title">Importing and exporting projects and files</title>
-<shortdesc outputclass="id_shortdesc">These topics cover how to import files
-and projects into the workbench and export files and projects to disk.</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
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 d050edb..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Importing and exporting projects and files" />
-<meta name="abstract" content="These topics cover how to import files and projects into the workbench and export files and projects to disk." />
-<meta name="description" content="These topics cover how to import files and projects into the workbench and export files and projects to disk." />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexprar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimprar.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.webtools.doc.user/topics/twimpwar.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.webtools.doc.user/topics/twcrewar.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ejb.doc.user/topics/teimp.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ejb.doc.user/topics/teexp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjcircle.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcircleb.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ph-importexport" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing and exporting projects and files</title>
-</head>
-<body id="ph-importexport"><a name="ph-importexport"><!-- --></a>
-
-
-<h1 class="id_title">Importing and exporting projects and files</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">These topics cover how to import files
-and projects into the workbench and export files and projects to disk.</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</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="../../org.eclipse.wst.webtools.doc.user/topics/twimpwar.html">Importing Web archive (WAR) files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../../org.eclipse.wst.webtools.doc.user/topics/twcrewar.html">Exporting Web Archive (WAR) files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../../org.eclipse.jst.ejb.doc.user/topics/teimp.html">Importing EJB JAR files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../../org.eclipse.jst.ejb.doc.user/topics/teexp.html">Exporting EJB projects to EJB JAR files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../topics/cjcircle.html">Cyclical dependencies between Java EE modules</a></strong><br />
-A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.</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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita
deleted file mode 100644
index 5f6b4eb..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="ph-j2eeapp" xml:lang="en-us">
-<title outputclass="id_title">Java EE applications</title>
-<shortdesc outputclass="id_shortdesc">These topics deal with the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Enterprise
-Edition (Java EE).</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
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 dacf3fa..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html
+++ /dev/null
@@ -1,66 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Java EE applications" />
-<meta name="abstract" content="These topics deal with the Java Enterprise Edition (Java EE)." />
-<meta name="description" content="These topics deal with the Java Enterprise Edition (Java EE)." />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjpers.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjview.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjviewfilters.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-ref.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ph-j2eeapp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE applications</title>
-</head>
-<body id="ph-j2eeapp"><a name="ph-j2eeapp"><!-- --></a>
-
-
-<h1 class="id_title">Java EE applications</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">These topics deal with the Java™ Enterprise
-Edition (Java EE).</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjavaee5.html">Developing Java EE 5 Applications</a></strong><br />
-The Java EE 5 programming model simplifies the process of creating Java applications.</li>
-<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 applications.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjpers.html">Java EE perspective</a></strong><br />
-The Java EE 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 Java EE perspective</a></strong><br />
-While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjviewfilters.html">Filtering in the Project Explorer view</a></strong><br />
-You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see.</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 />
-The workbench includes validators that check certain files in your enterprise application module projects for errors.</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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.dita
deleted file mode 100644
index 57572fa..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.dita
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="phprojects" xml:lang="en-us">
-<title outputclass="id_title">Working with projects</title>
-<shortdesc outputclass="id_shortdesc">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.</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
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 14c861f..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html
+++ /dev/null
@@ -1,72 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Working with projects" />
-<meta name="abstract" content="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." />
-<meta name="description" content="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." />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjrar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjtargetserver.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="phprojects" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with projects</title>
-</head>
-<body id="phprojects"><a name="phprojects"><!-- --></a>
-
-
-<h1 class="id_title">Working with projects</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">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>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjearproj.html">Enterprise application projects</a></strong><br />
-An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjappcliproj.html">Application client projects</a></strong><br />
-Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjear.html">Creating an enterprise application project</a></strong><br />
-Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjappproj.html">Creating an application client project</a></strong><br />
-You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjrar.html">Creating a connector project</a></strong><br />
-A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs).</li>
-<li class="ulchildlink"><strong><a href="../topics/tjtargetserver.html">Specifying target servers for J2EE projects</a></strong><br />
-When you develop J2EE applications, you can 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/cfacets.html">Project facets</a></strong><br />
-Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.</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 Enterprise Edition (Java EE).">Java EE 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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.dita
deleted file mode 100644
index 71f8c8c..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.dita
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="ph-ref" xml:lang="en-us">
-<title outputclass="id_title">Reference</title>
-<shortdesc outputclass="id_shortdesc">The following reference material on
-J2EE is available:</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
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 3469e98..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html
+++ /dev/null
@@ -1,56 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Reference" />
-<meta name="abstract" content="The following reference material on J2EE is available:" />
-<meta name="description" content="The following reference material on J2EE is available:" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rjlimitcurrent.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ph-ref" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Reference</title>
-</head>
-<body id="ph-ref"><a name="ph-ref"><!-- --></a>
-
-
-<h1 class="id_title">Reference</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">The following reference material on
-J2EE is available:</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</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 />
-This table lists the common error messages you may encounter 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 Enterprise Edition (Java EE).">Java EE 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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.dita
deleted file mode 100644
index 9cbad09..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.dita
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rjlimitcurrent" xml:lang="en-us">
-<title outputclass="id_title">Limitations of J2EE development tools</title>
-<shortdesc outputclass="id_shortdesc">This topic outlines current known limitations
-and restrictions for J2EE tooling.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>J2EE<indexterm>tool limitations</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<refbody outputclass="id_refbody">
-<section outputclass="id_spacesLimitation"><p outputclass="anchor_topictop"></p><title>Spaces
-not supported in JAR URIs within an enterprise application</title>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.</section>
-<section outputclass="id_EARDBCSLimitation"><title>Enterprise application
-project names should not contain DBCS characters</title><p id="limitation_ear_dbcs">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></section>
-<section outputclass="id_utilityJARLimitation"><title><tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build
-path updates when removing the dependency on a Utility JAR file</title>When
-removing the dependency on a Utility JAR, the corresponding <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> project
-will be removed from the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 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 <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> Example project. Next, add the JUnit
-project as a Utility JAR in the EAR, then add JUnit as a <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> JAR
-Dependency of the Web project. If you then wanted to remove the dependency
-between JUnit and the Web project, remove the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> JAR Dependency from the Web project
-first, then remove the Utility JAR from the EAR. Follow this order to ensure
-that this works correctly.</section>
-<section outputclass="id_JARdepLimitation"><title><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> JAR Dependencies page fails to update <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build
-path</title>The <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> JAR Dependencies page is not synchronized with
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> 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 <uicontrol>OK</uicontrol> button
-is clicked or if the <uicontrol>Apply</uicontrol> button is clicked prior
-to the <uicontrol>OK</uicontrol> button. Typically this will appear as if
-a JAR dependency was added, but the project did not get added to the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> 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 <uicontrol>OK</uicontrol>.</section>
-<section outputclass="id_locationLimitation"><title>'Invalid project description'
-error when using a non-default project location for a new J2EE project</title>When
-you create a new J2EE project (including <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm>, 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.</section>
-<example outputclass="anchor_topicbottom"></example>
-</refbody>
-</reference>
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 f446bac..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html
+++ /dev/null
@@ -1,89 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Limitations of J2EE development tools" />
-<meta name="abstract" content="This topic outlines current known limitations and restrictions for J2EE tooling." />
-<meta name="description" content="This topic outlines current known limitations and restrictions for J2EE tooling." />
-<meta content="J2EE, tool limitations" name="DC.subject" />
-<meta content="J2EE, tool limitations" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rjlimitcurrent" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Limitations of J2EE development tools</title>
-</head>
-<body id="rjlimitcurrent"><a name="rjlimitcurrent"><!-- --></a>
-
-
-<h1 class="id_title">Limitations of J2EE development tools</h1>
-
-
-
-<div class="id_refbody"><p class="id_shortdesc">This topic outlines current known limitations
-and restrictions for J2EE tooling.</p>
-
-<div class="id_spacesLimitation"><h4 class="sectiontitle">Spaces
-not supported in JAR URIs within an enterprise application</h4><p class="anchor_topictop" />
-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="id_EARDBCSLimitation"><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="id_utilityJARLimitation"><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="id_JARdepLimitation"><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="id_locationLimitation"><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 class="anchor_topicbottom" />
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.dita
deleted file mode 100644
index fd4f2de..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.dita
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rtunevalidat" xml:lang="en-us">
-<title>Tuning validators</title>
-<shortdesc>Whether or not a validator validates a particular resource depends
-on the filters that are in place for that validator.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>code validation<indexterm>tuning</indexterm></indexterm>
-<indexterm>validation<indexterm>tuning</indexterm></indexterm></keywords>
-</metadata></prolog>
-<refbody>
-<section><p>When a validator is first developed, the implementer of the validator
-defines a default set of filters. These filters may be based on:<ul>
-<li>file extensions</li>
-<li>folder of file names</li>
-<li>project natures</li>
-<li>project facets</li>
-<li>content types</li>
-</ul>Through the Validation Filters dialog, you are able to further tune these
-settings.Normally you would simply keep the defaults, however two reasons
-why you may want to tune validation are:<ul>
-<li>Performance: if you have a very large workspace, you could reduce the
-amount of validation.</li>
-<li>Non standard conventions: if you use a non standard naming convention
-(for example stores XML in files with an .acme-xml extension), you could still
-enable the appropriate validators to run against those files.</li>
-</ul>You can access this dialog by clicking <menucascade><uicontrol>Window</uicontrol>
-<uicontrol>Preferences</uicontrol><uicontrol>Validation</uicontrol></menucascade> and
-then clicking <uicontrol>Settings</uicontrol> beside each validator.</p><p>Filters
-are stored in groups. There are two types of groups: Include groups and Exclude
-groups. You can have as many Include groups as you like. Filters inside of
-an Include group cause resources to be validated. If any rule matches then
-the entire group matches. Inside of a group the filter rules are OR’d together.
-However individual Include groups are AND’ed together. You can have one Exclude
-group. If any of its filter rules match, then the resource is excluded. Exclusion
-takes precedence over inclusion.</p></section>
-<example><p>These rules are illustrated with this hypothetical example:<image
-href="../images/validatefilters.jpg" placement="break"><alt>screen capture
-of the validation filters panel showing include and exclude groups</alt></image><ul>
-<li>If the resource is in the disabled folder, it will be excluded because
-exclusion takes precedence over everything else.</li>
-<li>If the resource does not have the JSP source content type, and it does
-not have the JSP fragment source content type, and it does not have a file
-extension of .jsp or .jspf then it will be excluded because none of the rules
-in the first group matched.</li>
-<li>If the project does not have the module core nature then it will be excluded
-because the single rule in the second group did not match.</li>
-<li>Otherwise the resource will be validated by this particular validator.</li>
-</ul>To add a rule to a group, select the group on the left, and click <uicontrol>Add
-Rule</uicontrol>.</p></example>
-</refbody>
-</reference>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html
deleted file mode 100644
index e733159..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html
+++ /dev/null
@@ -1,103 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Tuning validators" />
-<meta name="abstract" content="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator." />
-<meta name="description" content="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator." />
-<meta content="code validation, tuning, validation" name="DC.subject" />
-<meta content="code validation, tuning, validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rtunevalidat" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Tuning validators</title>
-</head>
-<body id="rtunevalidat"><a name="rtunevalidat"><!-- --></a>
-
-
-<h1 class="topictitle1">Tuning validators</h1>
-
-
-
-<div><p>Whether or not a validator validates a particular resource depends
-on the filters that are in place for that validator.</p>
-
-<div class="section"><div class="p">When a validator is first developed, the implementer of the validator
-defines a default set of filters. These filters may be based on:<ul>
-<li>file extensions</li>
-
-<li>folder of file names</li>
-
-<li>project natures</li>
-
-<li>project facets</li>
-
-<li>content types</li>
-
-</ul>
-Through the Validation Filters dialog, you are able to further tune these
-settings.Normally you would simply keep the defaults, however two reasons
-why you may want to tune validation are:<ul>
-<li>Performance: if you have a very large workspace, you could reduce the
-amount of validation.</li>
-
-<li>Non standard conventions: if you use a non standard naming convention
-(for example stores XML in files with an .acme-xml extension), you could still
-enable the appropriate validators to run against those files.</li>
-
-</ul>
-You can access this dialog by clicking <span class="menucascade"><span class="uicontrol">Window</span>
- > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Validation</span></span> and
-then clicking <span class="uicontrol">Settings</span> beside each validator.</div>
-<p>Filters
-are stored in groups. There are two types of groups: Include groups and Exclude
-groups. You can have as many Include groups as you like. Filters inside of
-an Include group cause resources to be validated. If any rule matches then
-the entire group matches. Inside of a group the filter rules are OR’d together.
-However individual Include groups are AND’ed together. You can have one Exclude
-group. If any of its filter rules match, then the resource is excluded. Exclusion
-takes precedence over inclusion.</p>
-</div>
-
-<div class="example"><div class="p">These rules are illustrated with this hypothetical example:<br /><img src="../images/validatefilters.jpg" alt="screen capture of the validation filters panel showing include and exclude groups" /><br /><ul>
-<li>If the resource is in the disabled folder, it will be excluded because
-exclusion takes precedence over everything else.</li>
-
-<li>If the resource does not have the JSP source content type, and it does
-not have the JSP fragment source content type, and it does not have a file
-extension of .jsp or .jspf then it will be excluded because none of the rules
-in the first group matched.</li>
-
-<li>If the project does not have the module core nature then it will be excluded
-because the single rule in the second group did not match.</li>
-
-<li>Otherwise the resource will be validated by this particular validator.</li>
-
-</ul>
-To add a rule to a group, select the group on the left, and click <span class="uicontrol">Add
-Rule</span>.</div>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling 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 according to the validation settings.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">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/rvalerr.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.dita
deleted file mode 100644
index b4c14df..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.dita
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rvalerr" xml:lang="en-us">
-<title outputclass="id_title">Common validation errors and solutions</title>
-<shortdesc outputclass="id_shortdesc">This table lists the common error messages<?Pub Caret?>
-you may encounter when you validate your projects.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>code validation<indexterm>error solutions</indexterm></indexterm>
-<indexterm>validation<indexterm>error solutions</indexterm></indexterm></keywords>
-</metadata></prolog>
-<refbody outputclass="id_refbody">
-<example outputclass="anchor_topictop"></example>
-<table frame="all">
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="col1" colwidth="60*"/>
-<colspec colname="col2" colwidth="72*"/><colspec colname="col3" colwidth="164*"/>
-<thead>
-<row outputclass="id_tableHeadRow">
-<entry>Message prefix</entry>
-<entry>Message</entry>
-<entry>Explanation</entry>
-</row>
-</thead>
-<tbody>
-<row outputclass="id_appclientValidator">
-<entry nameend="col3" namest="col1"><uicontrol>Application Client validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ1000">
-<entry colname="col1">CHKJ1000</entry>
-<entry colname="col2">Validation failed because the application client file
-is not valid. Ensure that the deployment descriptor is valid.</entry>
-<entry colname="col3">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 <uicontrol>Validate
-XML file</uicontrol>.</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> </entry>
-</row>
-<row outputclass="id_EARValidator">
-<entry nameend="col3" namest="col1"><uicontrol>EAR validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ1001">
-<entry colname="col1">CHKJ1001</entry>
-<entry colname="col2">The EAR project {0} is invalid.</entry>
-<entry colname="col3">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 <codeph>application.xml</codeph></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 <uicontrol>Validate
-XML file</uicontrol>.</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></entry>
-</row>
-<row outputclass="id_EJBValidator">
-<entry nameend="col3" namest="col1"><uicontrol>EJB validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ2019">
-<entry>CHKJ2019</entry>
-<entry>The {0} key class must be serializable at runtime. </entry>
-<entry morerows="2">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. </entry>
-</row>
-<row outputclass="id_CHKJ2412">
-<entry>CHKJ2412</entry>
-<entry>The return type must be serializable at runtime. </entry>
-</row>
-<row outputclass="id_CHKJ2413">
-<entry>CHKJ2413</entry>
-<entry>Argument {1} of {0} must be serializable at runtime.</entry>
-</row>
-<row outputclass="id_CHKJ2102">
-<entry>CHKJ2102</entry>
-<entry>Either a finder descriptor, or a matching custom finder method on the
-{0} class, must be defined.</entry>
-<entry>A finder descriptor must exist for every finder method. </entry>
-</row>
-<row outputclass="id_CHKJ2873">
-<entry>CHKJ2873</entry>
-<entry>Migrate this bean's datasource binding to a CMP Connection Factory
-binding.</entry>
-<entry></entry>
-</row>
-<row outputclass="id_CHKJ2874">
-<entry>CHKJ2874</entry>
-<entry>Migrate this EJB module's default datasource binding to a default CMP
-Connection Factory binding.</entry>
-<entry></entry>
-</row>
-<row outputclass="id_CHKJ2875E">
-<entry colname="col1">CHKJ2875E </entry>
-<entry colname="col2"><ejb-client-jar> {0} must exist in every EAR file
-that contains this EJB module.</entry>
-<entry colname="col3">If <codeph><ejb-client-jar></codeph> is specified
-in <filepath>ejb-jar.xml</filepath>, 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 <codeph><ejb-client-jar></codeph> 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.</entry>
-</row>
-<row outputclass="id_CHKJ2905">
-<entry>CHKJ2905</entry>
-<entry>The EJB validator did not run because ejb-jar.xml could not be loaded.
-Run the XML validator for more information.</entry>
-<entry>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 <uicontrol>Validate XML file</uicontrol>.</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></entry>
-</row>
-<row outputclass="id_JSPValidator">
-<entry nameend="col3" namest="col1"><uicontrol>JSP validator</uicontrol></entry>
-</row>
-<row outputclass="id_IWAW0482">
-<entry colname="col1">IWAW0482</entry>
-<entry colname="col2">No valid JspTranslator</entry>
-<entry colname="col3">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 (<uicontrol>Window > Preferences > Java >Installed
-JREs</uicontrol>) and make sure that the location for the JRE is pointing
-to a valid JRE directory. </li>
-<li>Ensure that the classpath variables (<uicontrol>Window > Preferences >
-Java > Classpath Variables</uicontrol>) are set correctly.</li>
-</ol> </entry>
-</row>
-<row outputclass="id_WARValidator">
-<entry nameend="col3" namest="col1"><uicontrol>WAR validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ3008">
-<entry colname="col1">CHKJ3008</entry>
-<entry colname="col2">Missing or invalid WAR file.</entry>
-<entry colname="col3">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 <uicontrol>Validate XML file</uicontrol>.</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></entry>
-</row>
-<row outputclass="id_XMLValidator">
-<entry nameend="col3" namest="col1"><uicontrol>XML validator</uicontrol></entry>
-</row>
-<row>
-<entry> </entry>
-<entry>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?)".</entry>
-<entry>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.</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-<example outputclass="anchor_topicbottom"></example>
-</refbody>
-</reference>
-<?Pub *0000008883?>
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 d9d30cb..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html
+++ /dev/null
@@ -1,326 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Common validation errors and solutions" />
-<meta name="abstract" content="This table lists the common error messages you may encounter when you validate your projects." />
-<meta name="description" content="This table lists the common error messages you may encounter when you validate your projects." />
-<meta content="code validation, error solutions, validation" name="DC.subject" />
-<meta content="code validation, error solutions, validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rvalerr" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Common validation errors and solutions</title>
-</head>
-<body id="rvalerr"><a name="rvalerr"><!-- --></a>
-
-
-<h1 class="id_title">Common validation errors and solutions</h1>
-
-
-
-<div class="id_refbody"><p class="id_shortdesc">This table lists the common error messages
-you may encounter when you validate your projects.</p>
-
-<div class="anchor_topictop" />
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-
-<thead align="left">
-<tr class="id_tableHeadRow">
-<th valign="top" width="20.27027027027027%" id="N10078">Message prefix</th>
-
-<th valign="top" width="24.324324324324326%" id="N1007F">Message</th>
-
-<th valign="top" width="55.4054054054054%" id="N10086">Explanation</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr class="id_appclientValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">Application Client validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ1000">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ1000</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">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="N10086 ">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 class="id_EARValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">EAR validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ1001">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ1001</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The EAR project {0} is invalid.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">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 class="id_EJBValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">EJB validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ2019">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2019</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The {0} key class must be serializable at runtime. </td>
-
-<td rowspan="3" valign="top" width="55.4054054054054%" headers="N10086 ">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 class="id_CHKJ2412">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2412</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The return type must be serializable at runtime. </td>
-
-</tr>
-
-<tr class="id_CHKJ2413">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2413</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Argument {1} of {0} must be serializable at runtime.</td>
-
-</tr>
-
-<tr class="id_CHKJ2102">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2102</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">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="N10086 ">A finder descriptor must exist for every finder method. </td>
-
-</tr>
-
-<tr class="id_CHKJ2873">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2873</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Migrate this bean's datasource binding to a CMP Connection Factory
-binding.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 "> </td>
-
-</tr>
-
-<tr class="id_CHKJ2874">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2874</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Migrate this EJB module's default datasource binding to a default CMP
-Connection Factory binding.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 "> </td>
-
-</tr>
-
-<tr class="id_CHKJ2875E">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2875E </td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F "><ejb-client-jar> {0} must exist in every EAR file
-that contains this EJB module.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">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 class="id_CHKJ2905">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2905</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">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="N10086 ">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 class="id_JSPValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">JSP validator</span></td>
-
-</tr>
-
-<tr class="id_IWAW0482">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">IWAW0482</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">No valid JspTranslator</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">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 class="id_WARValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">WAR validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ3008">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ3008</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Missing or invalid WAR file.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">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 class="id_XMLValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">XML validator</span></td>
-
-</tr>
-
-<tr>
-<td valign="top" width="20.27027027027027%" headers="N10078 "> </td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">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="N10086 ">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 class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.dita
deleted file mode 100644
index 51bdd7f..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.dita
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rvalidators" xml:lang="en-us">
-<title outputclass="id_title">J2EE Validators</title>
-<shortdesc outputclass="id_shortdesc">This table lists the validators that
-are available for the different project types and gives a brief description
-of each validator.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>J2EE validators</indexterm></indexterm>
-<indexterm>code validation<indexterm>J2EE validators</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<refbody outputclass="id_refbody">
-<example outputclass="anchor_topictop"></example>
-<table frame="all">
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="col1" colwidth="50*"/>
-<colspec colname="col2" colwidth="50*"/>
-<thead>
-<row outputclass="id_toprow">
-<entry>Validator name</entry>
-<entry>Description</entry>
-</row>
-</thead>
-<tbody>
-<row outputclass="id_appclientValidator">
-<entry align="left" valign="top">Application Client Validator</entry>
-<entry align="left" valign="top">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></entry>
-</row>
-<row outputclass="id_connectorValidator">
-<entry colname="col1">Connector Validator</entry>
-<entry colname="col2">The Connector validator checks for invalid J2EE specification
-levels in connector projects.</entry>
-</row>
-<row outputclass="id_DTDValidator">
-<entry align="left" valign="top">DTD Validator</entry>
-<entry align="left" valign="top">The DTD validator determines whether the
-current state of a DTD is semantically valid. XML files are validated according
-to the XML specification <xref format="html" href="http://www.w3.org/TR/2000/REC-xml-20001006"
-scope="external"> Extensible Markup Language (XML) 1.0<desc></desc></xref> from
-the W3C Web site. As well, the DTD validator checks for errors such as references
-to entities and elements that do not exist.</entry>
-</row>
-<row outputclass="id_EARValidator">
-<entry align="left" valign="top">EAR Validator</entry>
-<entry align="left" valign="top">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></entry>
-</row>
-<row outputclass="id_EJBValidator">
-<entry align="left" valign="top">EJB Validator</entry>
-<entry align="left" valign="top">The EJB Validator verifies that enterprise
-beans contained in an EJB project comply with the Sun Enterprise <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm> 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. Specifically, the EJB Validator
-validates the following resources: <ul>
-<li><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> .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></entry>
-</row>
-<row outputclass="id_ELValidator">
-<entry colname="col1">EL Syntax Validator</entry>
-<entry colname="col2"></entry>
-</row>
-<row outputclass="id_HTMLValidator">
-<entry align="left" valign="top">HTML Syntax Validator</entry>
-<entry align="left" valign="top">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></entry>
-</row>
-<row outputclass="id_JSPValidator">
-<entry align="left" valign="top">JSP Syntax Validator</entry>
-<entry align="left" valign="top">The JSP Syntax Validator validates JSP files
-in a project by translating them into the corresponding <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> code
-and then checking the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> code for compile errors.</entry>
-</row>
-<row outputclass="id_WARValidator">
-<entry align="left" valign="top">War Validator</entry>
-<entry align="left" valign="top">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></entry>
-</row>
-<row outputclass="id_WSDLValidator">
-<entry colname="col1">WSDL Validator</entry>
-<entry colname="col2">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. </entry>
-</row>
-<row outputclass="id_WSIValidator">
-<entry colname="col1">WS-I Message Validator</entry>
-<entry colname="col2">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.</entry>
-</row>
-<row outputclass="id_XMLSchemaValidator">
-<entry align="left" valign="top">XML Schema Validator</entry>
-<entry align="left" valign="top">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 <xref format="html"
-href="http://www.w3.org/TR/xmlschema-1/" scope="local"> XML Schema Part 1:
-Structures<desc></desc></xref> from the W3C Web site.</entry>
-</row>
-<row outputclass="id_XMLValidator">
-<entry align="left" valign="top">XML Validator</entry>
-<entry align="left" valign="top">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.</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-<example outputclass="anchor_topicbottom"></example>
-</refbody>
-</reference>
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 f2de783..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html
+++ /dev/null
@@ -1,249 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="reference" name="DC.Type" />
-<meta name="DC.Title" content="J2EE Validators" />
-<meta name="abstract" content="This table lists the validators that are available for the different project types and gives a brief description of each validator." />
-<meta name="description" content="This table lists the validators that are available for the different project types and gives a brief description of each validator." />
-<meta content="validation, J2EE validators, code validation" name="DC.subject" />
-<meta content="validation, J2EE validators, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rvalidators" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>J2EE Validators</title>
-</head>
-<body id="rvalidators"><a name="rvalidators"><!-- --></a>
-
-
-<h1 class="id_title">J2EE Validators</h1>
-
-
-
-<div class="id_refbody"><p class="id_shortdesc">This table lists the validators that
-are available for the different project types and gives a brief description
-of each validator.</p>
-
-<div class="anchor_topictop" />
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-
-<thead align="left">
-<tr class="id_toprow">
-<th valign="top" width="50%" id="N10073">Validator name</th>
-
-<th valign="top" width="50%" id="N1007A">Description</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr class="id_appclientValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">Application Client Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">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 class="id_connectorValidator">
-<td valign="top" width="50%" headers="N10073 ">Connector Validator</td>
-
-<td valign="top" width="50%" headers="N1007A ">The Connector validator checks for invalid J2EE specification
-levels in connector projects.</td>
-
-</tr>
-
-<tr class="id_DTDValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">DTD Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">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" title="">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 class="id_EARValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">EAR Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">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 class="id_EJBValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">EJB Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">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. Specifically, the EJB Validator
-validates the following resources: <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 class="id_ELValidator">
-<td valign="top" width="50%" headers="N10073 ">EL Syntax Validator</td>
-
-<td valign="top" width="50%" headers="N1007A "> </td>
-
-</tr>
-
-<tr class="id_HTMLValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">HTML Syntax Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">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 class="id_JSPValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">JSP Syntax Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">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 class="id_WARValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">War Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">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 class="id_WSDLValidator">
-<td valign="top" width="50%" headers="N10073 ">WSDL Validator</td>
-
-<td valign="top" width="50%" headers="N1007A ">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 class="id_WSIValidator">
-<td valign="top" width="50%" headers="N10073 ">WS-I Message Validator</td>
-
-<td valign="top" width="50%" headers="N1007A ">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 class="id_XMLSchemaValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">XML Schema Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">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/" title="">XML Schema Part 1: Structures</a> from the W3C Web site.</td>
-
-</tr>
-
-<tr class="id_XMLValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">XML Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">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 class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rvalerr.html" title="This table lists the common error messages you may encounter 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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita
deleted file mode 100644
index 41da49a..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="taddingfacet" xml:lang="en-us">
-<title outputclass="id_title">Adding a facet to a Java EE project</title>
-<shortdesc outputclass="id_shortdesc">This topic explains how to add a facet
-to an existing project in your workspace.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>projects<indexterm>facets<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>Java EE<indexterm>adding project facets</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p
-conref="cfacets.dita#cfacets/aboutfacet"></p> <p>New projects generally have
-facets added to them when they are created. To add another facet to a project
-that already exists, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, right-click the project
-and then select <uicontrol>Properties</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Project Facets</uicontrol> page in the in
-the Properties window.</cmd><info>This page lists the facets in the project
-and their versions.</info></step>
-<step><cmd>Click <uicontrol>Modify Project</uicontrol> and select the check
-boxes next to the facets you want the project to have.</cmd><info><p>Only
-the facets that are valid for the project are listed:<ul>
-<li>The list of runtimes selected for the project limits the facets shown
-in the list. Only the facets compatible with all selected target runtimes
-are shown.</li>
-<li>The currently selected facets and their version numbers limit the other
-facets shown in the list. For example, if the project contains the Dynamic
-Web Module facet, the EJB Module facet is not listed because these two facets
-cannot be in the same project.</li>
-</ul>You can find out more about the requirements and limitations for each
-facet by right-clicking the facet name and then clicking <uicontrol>Show Constraints</uicontrol>.</p><p>You
-can also choose a preset combination of facets from the <uicontrol>Presets</uicontrol> list.</p></info>
-</step>
-<step><cmd>Choose a version number for the facet by clicking the current version
-number and selecting the version number you want from the drop-down list.</cmd>
-</step>
-<step importance="optional"><cmd>To remove a facet, clear its check box.</cmd>
-<info>Not all facets can be removed.</info></step>
-<step importance="optional"><cmd>If you want to limit the project so it will
-be compatible with one or more runtimes, click on the Runtimes tab and select
-the runtimes that you want the project to be compatible with.</cmd><info>For
-more information on runtimes, see <xref href="tjtargetserver.dita"></xref>.</info>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to exit the Modify Faceted
-Project dialog and then click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 2453d13..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html
+++ /dev/null
@@ -1,107 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding a facet to a Java EE project" />
-<meta name="abstract" content="This topic explains how to add a facet to an existing project in your workspace." />
-<meta name="description" content="This topic explains how to add a facet to an existing project in your workspace." />
-<meta content="projects, facets, adding, Java EE, adding project facets" name="DC.subject" />
-<meta content="projects, facets, adding, Java EE, adding project facets" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddingfacet" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding a facet to a Java EE project</title>
-</head>
-<body id="taddingfacet"><a name="taddingfacet"><!-- --></a>
-
-
-<h1 class="id_title">Adding a facet to a Java EE project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">This topic explains how to add a facet
-to an existing project in your workspace.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>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>
- <p>New projects generally have
-facets added to them when they are created. To add another facet to a project
-that already exists, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java™ EE perspective, right-click the project
-and then select <span class="uicontrol">Properties</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project Facets</span> page in the in
-the Properties window.</span> This page lists the facets in the project
-and their versions.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Modify Project</span> and select the check
-boxes next to the facets you want the project to have.</span> <div class="p">Only
-the facets that are valid for the project are listed:<ul>
-<li>The list of runtimes selected for the project limits the facets shown
-in the list. Only the facets compatible with all selected target runtimes
-are shown.</li>
-
-<li>The currently selected facets and their version numbers limit the other
-facets shown in the list. For example, if the project contains the Dynamic
-Web Module facet, the EJB Module facet is not listed because these two facets
-cannot be in the same project.</li>
-
-</ul>
-You can find out more about the requirements and limitations for each
-facet by right-clicking the facet name and then clicking <span class="uicontrol">Show Constraints</span>.</div>
-<p>You
-can also choose a preset combination of facets from the <span class="uicontrol">Presets</span> list.</p>
-
-</li>
-
-<li class="stepexpand"><span>Choose a version number for the facet by clicking the current version
-number and selecting the version number you want from the drop-down list.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To remove a facet, clear its check box.</span>
- Not all facets can be removed.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to limit the project so it will
-be compatible with one or more runtimes, click on the Runtimes tab and select
-the runtimes that you want the project to be compatible with.</span> For
-more information on runtimes, see <a href="tjtargetserver.html" title="When you develop J2EE applications, you can 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.">Specifying target servers for J2EE projects</a>.
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to exit the Modify Faceted
-Project dialog and then click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
-<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita
deleted file mode 100644
index 212244d..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tchangefacet" xml:lang="en-us">
-<title outputclass="id_title">Changing the version of a facet</title>
-<shortdesc outputclass="id_shortdesc">You can change the version of a facet
-in a Java EE project by editing the facets for the project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>facets<indexterm>changing versions</indexterm></indexterm>
-<indexterm>Java EE<indexterm>changing facet versions</indexterm></indexterm>
-<indexterm>projects<indexterm>changing facet versions</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>Changing
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler
-version of a Java EE project involves changing the version of the <uicontrol>Java</uicontrol> facet.
-For more information, see <xref href="tchangejavalevel.dita"></xref>.</p><p>To
-change the version of a facet in your project, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, right-click the project
-and then select <uicontrol>Properties</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Project Facets</uicontrol> page in the in
-the Properties window.</cmd><info> This page lists the facets in the project
-and their versions.</info></step>
-<step><cmd>Click <uicontrol>Modify Project</uicontrol> and click the facet
-you want to change.</cmd></step>
-<step><cmd>Select the version of the facet from the drop-down box next to
-the facet's name.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to close the Modify Faceted
-Project window and then click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html
deleted file mode 100644
index 0b96230..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Changing the version of a facet" />
-<meta name="abstract" content="You can change the version of a facet in a Java EE project by editing the facets for the project." />
-<meta name="description" content="You can change the version of a facet in a Java EE project by editing the facets for the project." />
-<meta content="facets, changing versions, Java EE, changing facet versions, projects" name="DC.subject" />
-<meta content="facets, changing versions, Java EE, changing facet versions, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tchangefacet" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Changing the version of a facet</title>
-</head>
-<body id="tchangefacet"><a name="tchangefacet"><!-- --></a>
-
-
-<h1 class="id_title">Changing the version of a facet</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can change the version of a facet
-in a Java EE project by editing the facets for the project.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>Changing
-the Java™ compiler
-version of a Java EE project involves changing the version of the <span class="uicontrol">Java</span> facet.
-For more information, see <a href="tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a>.</p>
-<p>To
-change the version of a facet in your project, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java EE perspective, right-click the project
-and then select <span class="uicontrol">Properties</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project Facets</span> page in the in
-the Properties window.</span> This page lists the facets in the project
-and their versions.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Modify Project</span> and click the facet
-you want to change.</span></li>
-
-<li class="stepexpand"><span>Select the version of the facet from the drop-down box next to
-the facet's name.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to close the Modify Faceted
-Project window and then click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</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 Java EE project</a></div>
-<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita
deleted file mode 100644
index f85e99e..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tchangejavalevel" xml:lang="en-us">
-<title outputclass="id_title">Changing the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> compiler version for a Java EE project</title>
-<shortdesc outputclass="id_shortdesc">You can change the version of <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> used
-in a Java EE project by changing the value of the <uicontrol>Java</uicontrol> facet.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE<indexterm>project compiler level</indexterm></indexterm>
-<indexterm>projects<indexterm>Java compiler level</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>The <uicontrol>Java</uicontrol> facet
-applies only to J2EE projects. To set the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> compiler level of a non-Java EE project,
-such as a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> project, see <xref format="html" href="../../org.eclipse.jdt.doc.user/reference/ref-properties-compiler.htm"
-scope="peer">Java Compiler</xref>.</p><p>To change the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler
-version, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, right-click the project
-and then select <uicontrol>Properties</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Project Facets</uicontrol> page in the in
-the Properties window.</cmd><info> This page lists the facets in the project
-and their versions.</info></step>
-<step><cmd>Click <uicontrol>Modify Project</uicontrol>.</cmd></step>
-<step><cmd>Double click the version number next to the<uicontrol>Java</uicontrol> facet
-to select a different level of <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> compiler.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to close the Modify Faceted
-Project window and then click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html
deleted file mode 100644
index cdd9d4d..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html
+++ /dev/null
@@ -1,76 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Changing the Java compiler version for a Java EE project" />
-<meta name="abstract" content="You can change the version of Java used in a Java EE project by changing the value of the Java facet." />
-<meta name="description" content="You can change the version of Java used in a Java EE project by changing the value of the Java facet." />
-<meta content="Java EE, project compiler level, projects, Java compiler level" name="DC.subject" />
-<meta content="Java EE, project compiler level, projects, Java compiler level" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tchangejavalevel" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Changing the Java compiler version for a Java EE project</title>
-</head>
-<body id="tchangejavalevel"><a name="tchangejavalevel"><!-- --></a>
-
-
-<h1 class="id_title">Changing the Java compiler version for a Java EE project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can change the version of Java™ used
-in a Java EE project by changing the value of the <span class="uicontrol">Java</span> facet.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>The <span class="uicontrol">Java</span> facet
-applies only to J2EE projects. To set the Java compiler level of a non-Java EE project,
-such as a Java project, see <a href="../../org.eclipse.jdt.doc.user/reference/ref-properties-compiler.htm">Java Compiler</a>.</p>
-<p>To change the Java compiler
-version, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java EE perspective, right-click the project
-and then select <span class="uicontrol">Properties</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project Facets</span> page in the in
-the Properties window.</span> This page lists the facets in the project
-and their versions.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Modify Project</span>.</span></li>
-
-<li class="stepexpand"><span>Double click the version number next to the<span class="uicontrol">Java</span> facet
-to select a different level of Java compiler.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to close the Modify Faceted
-Project window and then click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</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 Java EE project</a></div>
-<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita
deleted file mode 100644
index fb4f6b8..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimpear" xml:lang="en-us">
-<title outputclass="id_title">Defining and using annotations</title>
-<shortdesc outputclass="id_shortdesc">You can use the @Interface annotation
-to define your own annotation definition.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5<indexterm>annotations</indexterm><indexterm>defining</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p><p><b>Defining
-your own annotations</b></p></context>
-<steps>
-<step><cmd>Use the @Interface annotation to define your own annotation definition:</cmd>
-<info><p><ul>
-<li>Annotation definitions resemble interface definitions</li>
-<li>Annotation method declarations have neither parameters nor <codeph>throws</codeph> clauses,
-and return one of the following elements:<ul>
-<li>primitives</li>
-<li>String</li>
-<li>Class</li>
-<li>enum</li>
-<li>array of the above types</li>
-</ul></li>
-<li>Methods may have default values</li>
-</ul></p><p><codeblock>public @interface CreatedBy{
- String name();
- String date();
- boolean contractor() default false;
-} </codeblock><codeblock>@CreatedBy(name = "Mary Smith",date="02/02/2008");
-public class MyClass{....} </codeblock></p></info></step>
-</steps>
-<postreq outputclass="id_postreq"><p><b>Meta-annotations</b>: Meta-annotations
-(annotations of annotations) provide additional information on how an annotation
-should be used:<ul>
-<li>@Target<ul>
-<li>Restricts the use of an annotation</li>
-<li>Single argument must be from Enum ElementType <ul>
-<li>{TYPE, FIELD,METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE}</li>
-</ul></li>
-</ul></li>
-<li>@Retention<ul>
-<li>Indicates where the annotation information will be retained</li>
-<li>Single argument must be from Enum RetentionPolicy<ul>
-<li>{SOURCE, CLASS, RUNTIME}</li>
-</ul></li>
-</ul></li>
-<li>@Documented<ul>
-<li>Marker for annotations that should be included in Javadoc</li>
-</ul></li>
-<li>@Inherited<ul>
-<li>marker for Type annotations that are to be inherited by subtypes</li>
-</ul></li>
-</ul><b>Other built-in annotations</b>: <ul>
-<li>@Overrides<ul>
-<li>Applied to a method</li>
-<li>Indicates that the compiler should generate an error if the method does
-not actually override a superclass method.</li>
-</ul></li>
-<li>@Deprecated<ul>
-<li>Applied to a method</li>
-<li>Indicates that the compiler should generate a warning when the method
-is used externally</li>
-</ul></li>
-<li>@SuppressWarnings<ul>
-<li>Applies to a type or a method</li>
-<li>Indicates that the compiler should supress warnings for that element and
-all subelements<p><codeblock>@Deprecated
-public void oldMethod() {...}
-
-@ SupressWarnings
-public void yesIknowIuseDeprecatedMethods() {...}</codeblock></p></li>
-</ul></li>
-</ul></p><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html
deleted file mode 100644
index 2aa5ce6..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html
+++ /dev/null
@@ -1,167 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Defining and using annotations" />
-<meta name="abstract" content="You can use the @Interface annotation to define your own annotation definition." />
-<meta name="description" content="You can use the @Interface annotation to define your own annotation definition." />
-<meta content="Java EE 5, annotations, defining" name="DC.subject" />
-<meta content="Java EE 5, annotations, defining" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cannotations.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ctypesofanno.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimpear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Defining and using annotations</title>
-</head>
-<body id="tjimpear"><a name="tjimpear"><!-- --></a>
-
-
-<h1 class="id_title">Defining and using annotations</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can use the @Interface annotation
-to define your own annotation definition.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
-<p><strong>Defining
-your own annotations</strong></p>
-</div>
-
-
-<div class="p"><span>Use the @Interface annotation to define your own annotation definition:</span>
- <div class="p"><ul>
-<li>Annotation definitions resemble interface definitions</li>
-
-<li>Annotation method declarations have neither parameters nor <samp class="codeph">throws</samp> clauses,
-and return one of the following elements:<ul>
-<li>primitives</li>
-
-<li>String</li>
-
-<li>Class</li>
-
-<li>enum</li>
-
-<li>array of the above types</li>
-
-</ul>
-</li>
-
-<li>Methods may have default values</li>
-
-</ul>
-</div>
-<div class="p"><pre>public @interface CreatedBy{
- String name();
- String date();
- boolean contractor() default false;
-} </pre>
-<pre>@CreatedBy(name = "Mary Smith",date="02/02/2008");
-public class MyClass{....} </pre>
-</div>
-</div>
-
-
-<div class="id_postreq"><div class="p"><strong>Meta-annotations</strong>: Meta-annotations
-(annotations of annotations) provide additional information on how an annotation
-should be used:<ul>
-<li>@Target<ul>
-<li>Restricts the use of an annotation</li>
-
-<li>Single argument must be from Enum ElementType <ul>
-<li>{TYPE, FIELD,METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE}</li>
-
-</ul>
-</li>
-
-</ul>
-</li>
-
-<li>@Retention<ul>
-<li>Indicates where the annotation information will be retained</li>
-
-<li>Single argument must be from Enum RetentionPolicy<ul>
-<li>{SOURCE, CLASS, RUNTIME}</li>
-
-</ul>
-</li>
-
-</ul>
-</li>
-
-<li>@Documented<ul>
-<li>Marker for annotations that should be included in Javadoc</li>
-
-</ul>
-</li>
-
-<li>@Inherited<ul>
-<li>marker for Type annotations that are to be inherited by subtypes</li>
-
-</ul>
-</li>
-
-</ul>
-<strong>Other built-in annotations</strong>: <ul>
-<li>@Overrides<ul>
-<li>Applied to a method</li>
-
-<li>Indicates that the compiler should generate an error if the method does
-not actually override a superclass method.</li>
-
-</ul>
-</li>
-
-<li>@Deprecated<ul>
-<li>Applied to a method</li>
-
-<li>Indicates that the compiler should generate a warning when the method
-is used externally</li>
-
-</ul>
-</li>
-
-<li>@SuppressWarnings<ul>
-<li>Applies to a type or a method</li>
-
-<li>Indicates that the compiler should supress warnings for that element and
-all subelements<div class="p"><pre>@Deprecated
-public void oldMethod() {...}
-
-@ SupressWarnings
-public void yesIknowIuseDeprecatedMethods() {...}</pre>
-</div>
-</li>
-
-</ul>
-</li>
-
-</ul>
-</div>
-<p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/ctypesofanno.html">Types of annotations</a></strong><br />
-Java EE 5 defines a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs).</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cannotations.html" title="The goal of Java EE 5 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 supports the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere.">Java EE 5 support for annotations</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita
deleted file mode 100644
index 9639608..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjappproj" xml:lang="en-us">
-<title outputclass="id_title">Creating an application client project</title>
-<shortdesc outputclass="id_shortdesc">You can use a wizard to create a new
-application client project and add it to a new or existing enterprise application
-project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>creating</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>Application
-client projects contain the resources needed for application client modules
-and 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, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Project</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>Java
-EE</uicontrol><uicontrol>Application Client Project</uicontrol></menucascade> and
-click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>Project Name</uicontrol> field, type a name for
-the application client project. </cmd></step>
-<step importance="optional"><cmd>To change the default project location, clear
-the <uicontrol>Use default</uicontrol> check box under <uicontrol>Project
-contents</uicontrol> and select a new location with the <uicontrol>Browse</uicontrol> button.</cmd>
-<info>If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<note>If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible Java EE 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.</note></info></step>
-<step importance="optional"><cmd>To add the new project to an enterprise application
-project, select the <uicontrol>Add project to an EAR</uicontrol> check box
-and select a project in the <uicontrol>EAR Project Name</uicontrol> list.</cmd>
-<info>If you choose to add the project to an existing EAR project, the <uicontrol>Target
-runtime</uicontrol> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> field, select the
-target runtime for the project.</cmd></step>
-<step importance="optional"><cmd>To use a predefined configuration for your
-project, select a configuration in the <uicontrol>Configurations</uicontrol> list.
-You can click the <uicontrol>Modify</uicontrol> button to do the following:</cmd>
-<info><ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <uicontrol>Details</uicontrol> tab.
-You can also choose a preset combination of facets from the <uicontrol>Configurations</uicontrol> list.</li>
-<li>Limit your project to be compatible with one or more runtimes. Click the <uicontrol>Show
-Runtimes</uicontrol> tab and select the runtimes that you want the project
-to be compatible with. </li>
-</ul>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>In the <uicontrol>Source Folder</uicontrol> field, enter the name
-of the folder to use for source code. </cmd></step>
-<step importance="optional"><cmd>To create a default class for the module,
-select the <uicontrol>Create a default Main class</uicontrol> check box.</cmd>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 7768801..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html
+++ /dev/null
@@ -1,132 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating an application client project" />
-<meta name="abstract" content="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project." />
-<meta name="description" content="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project." />
-<meta content="application client projects, creating" name="DC.subject" />
-<meta content="application client projects, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjappproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating an application client project</title>
-</head>
-<body id="tjappproj"><a name="tjappproj"><!-- --></a>
-
-
-<h1 class="id_title">Creating an application client project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can use a wizard to create a new
-application client project and add it to a new or existing enterprise application
-project.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>Application
-client projects contain the resources needed for application client modules
-and 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, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Project</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">Java
-EE</span> > <span class="uicontrol">Application Client Project</span></span> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project Name</span> field, type a name for
-the application client project. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><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 Java EE 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"><strong>Optional: </strong><span>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>
- If you choose to add the project to an existing EAR project, the <span class="uicontrol">Target
-runtime</span> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</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"><strong>Optional: </strong><span>To use a predefined configuration for your
-project, select a configuration in the <span class="uicontrol">Configurations</span> list.
-You can click the <span class="uicontrol">Modify</span> button to do the following:</span>
- <ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <span class="uicontrol">Details</span> tab.
-You can also choose a preset combination of facets from the <span class="uicontrol">Configurations</span> list.</li>
-
-<li>Limit your project to be compatible with one or more runtimes. Click the <span class="uicontrol">Show
-Runtimes</span> tab and select the runtimes that you want the project
-to be compatible with. </li>
-
-</ul>
-Click <span class="uicontrol">Next</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"><strong>Optional: </strong><span>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 class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</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 applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</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>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita
deleted file mode 100644
index de2003e..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjcircleb" xml:lang="en-us">
-<title outputclass="id_title">Correcting cyclical dependencies after an EAR
-is imported</title>
-<shortdesc outputclass="id_shortdesc">You can resolve cyclical dependencies
-after an EAR is imported.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>dependencies<indexterm>correcting cyclical</indexterm></indexterm>
-<indexterm>EAR files<indexterm>correcting cyclical dependencies</indexterm></indexterm>
-<indexterm>projects<indexterm>correcting cyclical dependencies</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <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 <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> 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 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><p>To reorganize your project to correct cyclical dependencies,
-complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Identify all the classes within the JAR files that have cyclical
-dependencies and move those classes into a common <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> project or JAR file.</cmd></step>
-<step><cmd>Use the enterprise application editor to map utility JAR files
-to the common projects.</cmd></step>
-<step><cmd>For each module of the JAR in the application, use the JAR dependency
-editor or properties page to set dependencies only to the JAR files that are
-truly required.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 ab4d048..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Correcting cyclical dependencies after an EAR is imported" />
-<meta name="abstract" content="You can resolve cyclical dependencies after an EAR is imported." />
-<meta name="description" content="You can resolve cyclical dependencies after an EAR is imported." />
-<meta content="dependencies, correcting cyclical, EAR files, correcting cyclical dependencies, projects" name="DC.subject" />
-<meta content="dependencies, correcting cyclical, EAR files, correcting cyclical dependencies, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjcircle.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjcircleb" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Correcting cyclical dependencies after an EAR
-is imported</title>
-</head>
-<body id="tjcircleb"><a name="tjcircleb"><!-- --></a>
-
-
-<h1 class="id_title">Correcting cyclical dependencies after an EAR
-is imported</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can resolve cyclical dependencies
-after an EAR is imported.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <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 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>
-<p>To reorganize your project to correct cyclical dependencies,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li><span>Identify all the classes within the JAR files that have cyclical
-dependencies and 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>For each module of the JAR in the application, use the JAR dependency
-editor or properties page to set dependencies only to the JAR files that are
-truly required.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjcircle.html" title="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.">Cyclical dependencies between Java EE 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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.dita
deleted file mode 100644
index c89f633..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.dita
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjear" xml:lang="en-us">
-<title outputclass="id_title">Creating an enterprise application project</title>
-<shortdesc outputclass="id_shortdesc">Using the wizard to create an enterprise
-application project allows you to package many web applications and modules
-in a project and deploy these modules as a J2EE enterprise application.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>enterprise applications<indexterm>projects<indexterm>creating</indexterm></indexterm></indexterm>
-<indexterm>J2EE<indexterm>enterprise application projects<indexterm>creating</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <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 conref="rjlimitcurrent.dita#rjlimitcurrent/limitation_ear_dbcs"></p><p>To
-create a J2EE enterprise application project, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Project</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>J2EE</uicontrol>
-<uicontrol>Enterprise Application Project</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Project Name</uicontrol> field, type a name for
-the new project. </cmd></step>
-<step importance="optional"><cmd>To change the default project location, clear
-the <uicontrol>Use default</uicontrol> check box under <uicontrol>Project
-contents</uicontrol> and select a new location with the <uicontrol>Browse</uicontrol> button.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> field, select the
-target runtime for the project.</cmd><info>You can click the <uicontrol>New</uicontrol> button
-to create a new runtime for the project to use.</info></step>
-<step importance="optional"><cmd>To use a predefined configuration for your
-project, select a configuration in the <uicontrol>Configuration</uicontrol> list.
-You can click the <uicontrol>Modify</uicontrol> button to do the following:</cmd>
-<info><ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <uicontrol>Details</uicontrol> tab.
-You can also choose a preset combination of facets from the <uicontrol>Configurations</uicontrol> list.</li>
-<li>Limit your project to be compatible with one or more runtimes. Click the <uicontrol>Show
-Runtimes</uicontrol> tab and select the runtimes that you want the project
-to be compatible with. </li>
-</ul>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>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.</cmd></step>
-<step importance="optional"><cmd>To create new modules to add to the project,
-click the <uicontrol>New Module</uicontrol> button to do one of the following:</cmd>
-<choicetable keycol="0">
-<chrow><choption>Creating one module</choption><chdesc>Clear the <uicontrol>Create
-default modules</uicontrol> check box, select the type of module you want
-to create, click <uicontrol>Next</uicontrol> and follow the New Project wizard
-for that type of project.</chdesc></chrow>
-<chrow><choption>Creating two or more modules</choption><chdesc>Select the <uicontrol>Create
-default modules</uicontrol> check box, select the check boxes for each type
-of project you want to create, and click <uicontrol>Finish</uicontrol>.</chdesc>
-</chrow>
-</choicetable>
-<info>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.</info></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 4780da1..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating an enterprise application project" />
-<meta name="abstract" content="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application." />
-<meta name="description" content="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application." />
-<meta content="enterprise applications, projects, creating, J2EE, enterprise application projects" name="DC.subject" />
-<meta content="enterprise applications, projects, creating, J2EE, enterprise application projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating an enterprise application project</title>
-</head>
-<body id="tjear"><a name="tjear"><!-- --></a>
-
-
-<h1 class="id_title">Creating an enterprise application project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Using the wizard to create an enterprise
-application project allows you to package many web applications and modules
-in a project and deploy these modules as a J2EE enterprise application.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <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, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Project</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">J2EE</span>
- > <span class="uicontrol">Enterprise Application Project</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project Name</span> field, type a name for
-the new project. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><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>In the <span class="uicontrol">Target runtime</span> field, select the
-target runtime for the project.</span> You can click the <span class="uicontrol">New</span> button
-to create a new runtime for the project to use.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To use a predefined configuration for your
-project, select a configuration in the <span class="uicontrol">Configuration</span> list.
-You can click the <span class="uicontrol">Modify</span> button to do the following:</span>
- <ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <span class="uicontrol">Details</span> tab.
-You can also choose a preset combination of facets from the <span class="uicontrol">Configurations</span> list.</li>
-
-<li>Limit your project to be compatible with one or more runtimes. Click the <span class="uicontrol">Show
-Runtimes</span> tab and select the runtimes that you want the project
-to be compatible with. </li>
-
-</ul>
-Click <span class="uicontrol">Next</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"><strong>Optional: </strong><span>To create new modules to add to the project,
-click the <span class="uicontrol">New Module</span> button to do one of the following:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N1016C-option" align="left">Option</th>
-<th valign="bottom" id="N1016C-desc" align="left">Description</th></tr></thead>
-<tbody>
-<tr><td valign="top" headers="N1016C-option" id="N10176">Creating one module</td>
-<td valign="top" headers="N1016C-desc N10176">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.</td>
-</tr>
-
-<tr><td valign="top" headers="N1016C-option" id="N10191">Creating two or more modules</td>
-<td valign="top" headers="N1016C-desc N10191">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>.</td>
-
-</tr>
-
-</tbody></table>
-
- 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>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</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 applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</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/tjexpapp.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.dita
deleted file mode 100644
index d99519b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.dita
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjexpapp" xml:lang="en-us">
-<title outputclass="id_title">Exporting an application client project</title>
-<shortdesc outputclass="id_shortdesc">You can export an application client
-project as a JAR file.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>exporting</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>To
-export an application client project from the workbench, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Export</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an export destination</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>App Client JAR file</uicontrol></menucascade>,
-and then click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>Application Client project</uicontrol> list,
-select the application client project you want to export.</cmd></step>
-<step><cmd>In the <uicontrol>Destination</uicontrol> field, enter the full
-path and JAR file name where you want to export the application client project.</cmd>
-</step>
-<step importance="optional"><cmd>To export source files, select the <uicontrol>Export
-source files</uicontrol> check box.</cmd></step>
-<step importance="optional"><cmd>If you are exporting to an existing JAR file
-and you do not want to be warned about overwriting it, select the <uicontrol>Overwrite
-existing file</uicontrol> check box.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 acf2bf7..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting an application client project" />
-<meta name="abstract" content="You can export an application client project as a JAR file." />
-<meta name="description" content="You can export an application client project as a JAR file." />
-<meta content="application client projects, exporting" name="DC.subject" />
-<meta content="application client projects, exporting" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjexpapp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting an application client project</title>
-</head>
-<body id="tjexpapp"><a name="tjexpapp"><!-- --></a>
-
-
-<h1 class="id_title">Exporting an application client project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can export an application client
-project as a JAR file.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>To
-export an application client project from the workbench, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Export</span></span>.</span></li>
-
-<li><span>Under <span class="uicontrol">Select an export destination</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">App Client JAR file</span></span>,
-and then click <span class="uicontrol">Next</span>.</span></li>
-
-<li><span>In the <span class="uicontrol">Application Client project</span> list,
-select the application client project you want to export.</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.</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 the <span class="uicontrol">Overwrite
-existing file</span> check box.</span></li>
-
-<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</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 applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.dita
deleted file mode 100644
index c51e5b2..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjexpear" xml:lang="en-us">
-<title outputclass="id_title">Exporting an enterprise application into an
-EAR file</title>
-<shortdesc outputclass="id_shortdesc">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.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EAR<indexterm>files<indexterm>exporting</indexterm></indexterm></indexterm>
-<indexterm>enterprise applications<indexterm>projects<indexterm>exporting</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>To
-export an enterprise application project into an EAR file, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Export</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an export destination</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>EAR file</uicontrol></menucascade>,
-and then click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>EAR project</uicontrol> list, select the enterprise
-application project you want to export.</cmd></step>
-<step><cmd>In the <uicontrol>Destination</uicontrol> field, enter the full
-path and EAR file name where you want to export the enterprise application
-project that is selected in the <uicontrol>EAR application</uicontrol> field.</cmd>
-</step>
-<step importance="optional"><cmd>To export source files, select the <uicontrol>Export
-source files</uicontrol> check box.</cmd></step>
-<step importance="optional"><cmd>If you are exporting to an existing EAR file
-and you do not want to be warned about overwriting it, select the <uicontrol>Overwrite
-existing file</uicontrol> check box.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<result outputclass="id_result">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.</result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 bee3bf5..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html
+++ /dev/null
@@ -1,95 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting an enterprise application into an EAR file" />
-<meta name="abstract" content="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." />
-<meta name="description" content="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." />
-<meta content="EAR, files, exporting, enterprise applications, projects" name="DC.subject" />
-<meta content="EAR, files, exporting, enterprise applications, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjexpear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting an enterprise application into an
-EAR file</title>
-</head>
-<body id="tjexpear"><a name="tjexpear"><!-- --></a>
-
-
-<h1 class="id_title">Exporting an enterprise application into an
-EAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">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="id_context"> <p class="anchor_topictop" />
- <p>To
-export an enterprise application project into an EAR file, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Export</span></span>.</span></li>
-
-<li><span>Under <span class="uicontrol">Select an export destination</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">EAR file</span></span>,
-and then click <span class="uicontrol">Next</span>.</span></li>
-
-<li><span>In the <span class="uicontrol">EAR project</span> list, select the enterprise
-application project you want to export.</span></li>
-
-<li><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><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 EAR file
-and you do not want to be warned about overwriting it, select the <span class="uicontrol">Overwrite
-existing file</span> check box.</span></li>
-
-<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_result">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 class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</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 applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.dita
deleted file mode 100644
index aa2405b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjexprar" xml:lang="en-us">
-<title outputclass="id_title">Exporting connector projects to RAR files</title>
-<shortdesc outputclass="id_shortdesc">You can export a connector project to
-a RAR file in preparation for deploying it to a server.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>connector projects<indexterm>exporting</indexterm></indexterm>
-<indexterm>RAR files<indexterm>exporting</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>To
-export the contents of a connector project to a RAR file, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Export</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an export destination</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>RAR file</uicontrol></menucascade>,
-and then click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>Connector project</uicontrol> list, select the
-connector project to export.</cmd></step>
-<step><cmd>In the <uicontrol>Destination</uicontrol> field, enter the full
-path and RAR file name where you want to export the connector project.</cmd>
-</step>
-<step importance="optional"><cmd>To export source files, select the <uicontrol>Export
-source files</uicontrol> check box.</cmd></step>
-<step importance="optional"><cmd>If you are exporting to an existing RAR file
-and you do not want to be warned about overwriting it, select the <uicontrol>Overwrite
-existing file</uicontrol> check box.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd><stepresult outputclass="id_result">The
-wizard exports the contents of the RAR project to the specified RAR file.</stepresult>
-</step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 0a50592..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html
+++ /dev/null
@@ -1,79 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting connector projects to RAR files" />
-<meta name="abstract" content="You can export a connector project to a RAR file in preparation for deploying it to a server." />
-<meta name="description" content="You can export a connector project to a RAR file in preparation for deploying it to a server." />
-<meta content="connector projects, exporting, RAR files" name="DC.subject" />
-<meta content="connector projects, exporting, RAR files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjexprar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting connector projects to RAR files</title>
-</head>
-<body id="tjexprar"><a name="tjexprar"><!-- --></a>
-
-
-<h1 class="id_title">Exporting connector projects to RAR files</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can export a connector project to
-a RAR file in preparation for deploying it to a server.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>To
-export the contents of a connector project to a RAR file, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Export</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an export destination</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">RAR file</span></span>,
-and then click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Connector project</span> list, select the
-connector project to export.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Destination</span> field, enter the full
-path and RAR file name where you want to export the connector project.</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 RAR file
-and you do not want to be warned about overwriting it, select the <span class="uicontrol">Overwrite
-existing file</span> check box.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span> The
-wizard exports the contents of the RAR project to the specified RAR file.
-</li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.dita
deleted file mode 100644
index 78a47c1..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimpapp" xml:lang="en-us">
-<title outputclass="id_title">Importing an application client JAR file</title>
-<shortdesc outputclass="id_shortdesc">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.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>importing</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>To
-import an application client JAR file using the wizard, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Import</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an import source</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>App Client JAR file</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Application Client file</uicontrol> field, enter
-the location and name of the application client JAR file that you want to
-import.</cmd></step>
-<step><cmd>In the <uicontrol>Application Client project</uicontrol> field,
-type a new project name or accept the default project name. </cmd><info>The
-application client project will be created based on the version of the application
-client JAR file, and it will use the default location.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> 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.</cmd></step>
-<step importance="optional"><cmd>To add the new module to an enterprise application
-project, select the <uicontrol>Add project to an EAR</uicontrol> check box
-and then select an existing enterprise application project from the list or
-create a new one by clicking <uicontrol>New</uicontrol>.</cmd><info><note>If
-you type a new enterprise application project name, the enterprise application
-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.</note></info>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to import the application client
-JAR file.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 6cbdb2a..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html
+++ /dev/null
@@ -1,98 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing an application client JAR file" />
-<meta name="abstract" content="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." />
-<meta name="description" content="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." />
-<meta content="application client projects, importing" name="DC.subject" />
-<meta content="application client projects, importing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimpapp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing an application client JAR file</title>
-</head>
-<body id="tjimpapp"><a name="tjimpapp"><!-- --></a>
-
-
-<h1 class="id_title">Importing an application client JAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">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="id_context"> <p class="anchor_topictop" />
- <p>To
-import an application client JAR file using the wizard, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Import</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">App Client JAR file</span></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.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Application Client project</span> field,
-type a new project name or accept the default project name. </span> The
-application client project will be created based on the version of the application
-client JAR file, and it will use the default location.</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"><strong>Optional: </strong><span>To add the new module to an enterprise application
-project, select the <span class="uicontrol">Add project to an EAR</span> check box
-and then select an existing enterprise application project from the list or
-create a new one by clicking <span class="uicontrol">New</span>.</span> <div class="note"><span class="notetitle">Note:</span> If
-you type a new enterprise application project name, the enterprise application
-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 class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</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 applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.dita
deleted file mode 100644
index cd6c4ae..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimpear" xml:lang="en-us">
-<title outputclass="id_title">Importing an enterprise application EAR file</title>
-<shortdesc outputclass="id_shortdesc">Enterprise application projects are
-deployed into EAR files. You can import an enterprise application project
-by importing it from a deployed EAR file.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EAR<indexterm>files<indexterm>importing</indexterm></indexterm></indexterm>
-<indexterm>enterprise applications<indexterm>projects<indexterm>importing</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>You
-can also choose to import utility JAR files as utility <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> 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,
-complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Import</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an import source</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>EAR file</uicontrol></menucascade> and
-click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>EAR file</uicontrol> field, enter the location
-and name of the application client JAR file that you want to import. </cmd>
-</step>
-<step><cmd>In the <uicontrol>EAR project</uicontrol> field, accept the default
-project name or type a new project name. </cmd></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> drop-down list, select
-the application server that you want to target for your development.</cmd>
-<info>This selection affects the run time settings by modifying the class
-path entries for the project. Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>Select any utility JAR files from the project that you want to
-import as utility projects.</cmd></step>
-<step><cmd>In the <uicontrol>Module Root Location</uicontrol> field, specify
-the root directory for all of the projects that will be imported or created
-during import, and click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>On the EAR Module and Utility JAR Projects page, select the projects
-that you want to import with the EAR file. You can edit the new project name
-for each module and utility project to be imported.</cmd><info></info></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to import the contents of the
-EAR file.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 e179f22..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html
+++ /dev/null
@@ -1,102 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing an enterprise application EAR file" />
-<meta name="abstract" content="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file." />
-<meta name="description" content="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file." />
-<meta content="EAR, files, importing, enterprise applications, projects" name="DC.subject" />
-<meta content="EAR, files, importing, enterprise applications, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcircleb.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjcircle.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimpear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing an enterprise application EAR file</title>
-</head>
-<body id="tjimpear"><a name="tjimpear"><!-- --></a>
-
-
-<h1 class="id_title">Importing an enterprise application EAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">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="id_context"> <p class="anchor_topictop" />
- <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,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Import</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">EAR file</span></span> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">EAR file</span> field, enter the location
-and name of the application client JAR file that you want to import. </span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">EAR project</span> field, accept the default
-project name or type a new project name. </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.</span>
- This selection affects the run time settings by modifying the class
-path entries for the project. Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>Select any utility JAR files from the project that you want to
-import as utility projects.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Module Root Location</span> field, specify
-the root directory for all of the projects that will be imported or created
-during import, and click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>On the EAR Module and Utility JAR Projects page, select the projects
-that you want to import with the EAR file. You can edit the new project name
-for each module and utility project to be imported.</span> </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to import the contents of the
-EAR file.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</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 applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cjcircle.html" title="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.">Cyclical dependencies between Java EE modules</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</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/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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.dita
deleted file mode 100644
index 5d9a294..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.dita
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimprar" xml:lang="en-us">
-<title outputclass="id_title">Importing a connector project RAR file</title>
-<shortdesc outputclass="id_shortdesc">Connector projects are deployed into
-RAR files. You can import a connector project by importing a deployed RAR
-file.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>connector projects<indexterm>importing</indexterm></indexterm>
-<indexterm>RAR files<indexterm>importing</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>To
-import a connector project RAR file using the wizard, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Import</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an import source</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>RAR file</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Connector file</uicontrol> field, enter the full
-path and name of the connector RAR file that you want to import. </cmd></step>
-<step><cmd>In the <uicontrol>Connector module</uicontrol> combination box,
-type a new project name or select a connector project from the drop-down list. </cmd>
-<info>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.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> drop-down list, select
-the application server that you want to target for your development. </cmd>
-<info>This selection affects the run-time settings by modifying the class
-path entries for the project.</info></step>
-<step importance="optional"><cmd>To add the new module to an enterprise application
-project, select the <uicontrol>Add project to an EAR</uicontrol> check box
-and then select an existing enterprise application project from the list
-or create a new one by clicking <uicontrol>New</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>EAR application</uicontrol> combination box,
-type a new project name or select an existing enterprise application project
-from the drop-down list. Or, click the <uicontrol>New</uicontrol> button to
-launch the New Enterprise Application Project wizard.</cmd><info><note>If
-you type a new enterprise application project name, the enterprise application
- 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.</note></info>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to import the connector RAR
-file.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 ec292ed..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html
+++ /dev/null
@@ -1,96 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing a connector project RAR file" />
-<meta name="abstract" content="Connector projects are deployed into RAR files. You can import a connector project by importing a deployed RAR file." />
-<meta name="description" content="Connector projects are deployed into RAR files. You can import a connector project by importing a deployed RAR file." />
-<meta content="connector projects, importing, RAR files" name="DC.subject" />
-<meta content="connector projects, importing, RAR files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimprar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing a connector project RAR file</title>
-</head>
-<body id="tjimprar"><a name="tjimprar"><!-- --></a>
-
-
-<h1 class="id_title">Importing a connector project RAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Connector projects are deployed into
-RAR files. You can import a connector project by importing a deployed RAR
-file.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>To
-import a connector project RAR file using the wizard, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Import</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">RAR file</span></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. </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. </span>
- 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.</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. </span>
- This selection affects the run-time settings by modifying the class
-path entries for the project.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To add the new module to an enterprise application
-project, select the <span class="uicontrol">Add project to an EAR</span> check box
-and then select an existing enterprise application project from the list
-or create a new one by clicking <span class="uicontrol">New</span>.</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 enterprise application project name, the enterprise application
- 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 class="id_postreq"><p class="anchor_topicbottom" />
-</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/tjrar.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.dita
deleted file mode 100644
index 861366d..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.dita
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjrar" xml:lang="en-us">
-<title outputclass="id_title">Creating a connector project</title>
-<shortdesc outputclass="id_shortdesc">A connector is a J2EE standard extension
-mechanism for containers to provide connectivity to enterprise information
-systems (EISs).</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>connector projects<indexterm>creating</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>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 connector
-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><note
-type="restriction">J2EE 1.2 specification level does not include connector
-capability.</note><p>To create a new connector project, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Project</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>J2EE</uicontrol>
-<uicontrol>Connector Project</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Project Name</uicontrol> field, type a name for
-the connector project. </cmd></step>
-<step importance="optional"><cmd>To change the default project location, clear
-the <uicontrol>Use default</uicontrol> check box under <uicontrol>Project
-contents</uicontrol> and select a new location with the <uicontrol>Browse</uicontrol> button.</cmd>
-<info>If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<note>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.</note></info></step>
-<step importance="optional"><cmd>If you want to add the new project to an
-enterprise application project, select the <uicontrol>Add project to an EAR</uicontrol> check
-box and select a project in the <uicontrol>EAR Project Name</uicontrol> list.</cmd>
-<info>If you choose to add the project to an existing EAR project, the <uicontrol>Target
-runtime</uicontrol> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> field, select the
-target runtime for the project.</cmd></step>
-<step importance="optional"><cmd>To use a predefined configuration for your
-project, select a configuration in the <uicontrol>Configuration</uicontrol> list.
-You can click the <uicontrol>Modify</uicontrol> button to do the following:</cmd>
-<info><ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <uicontrol>Details</uicontrol> tab.
-You can also choose a preset combination of facets from the <uicontrol>Configurations</uicontrol> list.</li>
-<li>Limit your project to be compatible with one or more runtimes. Click the <uicontrol>Show
-Runtimes</uicontrol> tab and select the runtimes that you want the project
-to be compatible with. </li>
-</ul>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>In the <uicontrol>Source Folder</uicontrol> field, enter the name
-of the folder to use for source code.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 bc3f6bb..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html
+++ /dev/null
@@ -1,121 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a connector project" />
-<meta name="abstract" content="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs)." />
-<meta name="description" content="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs)." />
-<meta content="connector projects, creating" name="DC.subject" />
-<meta content="connector projects, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjrar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a connector project</title>
-</head>
-<body id="tjrar"><a name="tjrar"><!-- --></a>
-
-
-<h1 class="id_title">Creating a connector project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">A connector is a J2EE standard extension
-mechanism for containers to provide connectivity to enterprise information
-systems (EISs).</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>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 connector
-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, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Project</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">J2EE</span>
- > <span class="uicontrol">Connector Project</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project Name</span> field, type a name for
-the connector project. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><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"><strong>Optional: </strong><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>
- If you choose to add the project to an existing EAR project, the <span class="uicontrol">Target
-runtime</span> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</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"><strong>Optional: </strong><span>To use a predefined configuration for your
-project, select a configuration in the <span class="uicontrol">Configuration</span> list.
-You can click the <span class="uicontrol">Modify</span> button to do the following:</span>
- <ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <span class="uicontrol">Details</span> tab.
-You can also choose a preset combination of facets from the <span class="uicontrol">Configurations</span> list.</li>
-
-<li>Limit your project to be compatible with one or more runtimes. Click the <span class="uicontrol">Show
-Runtimes</span> tab and select the runtimes that you want the project
-to be compatible with. </li>
-
-</ul>
-Click <span class="uicontrol">Next</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 class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.dita
deleted file mode 100644
index 17a51dd..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.dita
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjtargetserver" xml:lang="en-us">
-<title outputclass="id_title">Specifying target servers for J2EE projects</title>
-<shortdesc outputclass="id_shortdesc">When you develop J2EE applications,
-you can 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.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>J2EE<indexterm>target servers</indexterm></indexterm>
-<indexterm>projects<indexterm>target servers</indexterm></indexterm><indexterm>target
-servers<indexterm>J2EE applications</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>In
-order to support different application servers that use different JDK levels
-for their <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> Runtime Environment (JRE), the workbench prompts
-you for a target server setting for each J2EE project. 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 prompting you to specify a target server, the workbench
-enforces that proper entries are added for running on the server you choose.</p><p>You
-can also add more than one target server for your project. In this case, the
-workbench prevents you from adding any facets not supported by all of the
-target servers. If you add more than one target server, choose a server that
-will contribute to the project's class path as the primary server.</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 org.eclipse.wst.common.project.facet.core.xml file in
-the project's .settings folder. You should not edit this file manually; instead,
-use the properties window as described in this topic.</p><p>All J2EE project
-creation and import wizards prompt 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 <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="JavaBeans">JavaBeans</tm> 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><note>Utility <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> 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.</note><p>To modify
-the target runtime and default server for an existing project, complete the
-following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, right-click the enterprise
-application or module project, and select <uicontrol>Properties</uicontrol>.</cmd>
-</step>
-<step><cmd>Select the <uicontrol>Targeted Runtimes</uicontrol> page in the
-Properties dialog.</cmd></step>
-<step><cmd>In the <uicontrol>Targeted Runtimes</uicontrol> list, select the
-check boxes next to each of the runtimes that you want to develop the project
-for. If you don't see the runtime that you want to use, you need to add it
-to the runtimes in the workbench. For more information, see <xref format=""
-href="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita" scope="peer">Defining
-the installed server runtime environments</xref>.</cmd><info><note>Only the
-runtimes compatible with the project's facets are shown. You can select the <uicontrol>Show
-all runtimes</uicontrol> check box to display the runtimes not compatible
-with the project's current facet configuration. These runtimes are grayed
-out.</note></info></step>
-<step><cmd>To select the primary runtime, click on a runtime and then click
-the <uicontrol>Make Primary</uicontrol> button.</cmd><info>If you select any
-runtimes for the project, you must make one of those runtimes the primary
-runtime for the project. If you select only one runtime from the list, that
-runtime is automatically made the primary runtime. The primary runtime is
-shown in bold text.</info></step>
-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
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 481a9da..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html
+++ /dev/null
@@ -1,127 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Specifying target servers for J2EE projects" />
-<meta name="abstract" content="When you develop J2EE applications, you can 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." />
-<meta name="description" content="When you develop J2EE applications, you can 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." />
-<meta content="J2EE, target servers, projects, target servers, J2EE applications" name="DC.subject" />
-<meta content="J2EE, target servers, projects, target servers, J2EE applications" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjtargetserver" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Specifying target servers for J2EE projects</title>
-</head>
-<body id="tjtargetserver"><a name="tjtargetserver"><!-- --></a>
-
-
-<h1 class="id_title">Specifying target servers for J2EE projects</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">When you develop J2EE applications,
-you can 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="id_context"><p class="anchor_topictop" />
- <p>In
-order to support different application servers that use different JDK levels
-for their Java™ Runtime Environment (JRE), the workbench prompts
-you for a target server setting for each J2EE project. 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 prompting you to specify a target server, the workbench
-enforces that proper entries are added for running on the server you choose.</p>
-<p>You
-can also add more than one target server for your project. In this case, the
-workbench prevents you from adding any facets not supported by all of the
-target servers. If you add more than one target server, choose a server that
-will contribute to the project's class path as the primary server.</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 org.eclipse.wst.common.project.facet.core.xml file in
-the project's .settings folder. You should not edit this file manually; instead,
-use the properties window as described in this topic.</p>
-<p>All J2EE project
-creation and import wizards prompt 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, complete the
-following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java EE perspective, right-click the enterprise
-application or module project, and select <span class="uicontrol">Properties</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Targeted Runtimes</span> page in the
-Properties dialog.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Targeted Runtimes</span> list, select the
-check boxes next to each of the runtimes that you want to develop the project
-for. If you don't see the runtime that you want to use, you need to add it
-to the runtimes in the workbench. For more information, see <a href="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html">Defining the installed server runtime environments</a>.</span> <div class="note"><span class="notetitle">Note:</span> Only the
-runtimes compatible with the project's facets are shown. You can select the <span class="uicontrol">Show
-all runtimes</span> check box to display the runtimes not compatible
-with the project's current facet configuration. These runtimes are grayed
-out.</div>
-</li>
-
-<li class="stepexpand"><span>To select the primary runtime, click on a runtime and then click
-the <span class="uicontrol">Make Primary</span> button.</span> If you select any
-runtimes for the project, you must make one of those runtimes the primary
-runtime for the project. If you select only one runtime from the list, that
-runtime is automatically made the primary runtime. The primary runtime is
-shown in bold text.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</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 applications.">J2EE architecture</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html">Defining the installed server runtime environments</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.dita
deleted file mode 100644
index d17be81..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.dita
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjval" xml:lang="en-us">
-<title outputclass="id_title">Validating code in enterprise applications</title>
-<shortdesc outputclass="id_shortdesc">The workbench includes validators that
-check certain files in your enterprise application module projects for errors.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>build validation<indexterm>enabling</indexterm></indexterm>
-<indexterm>code validation<indexterm>overview</indexterm></indexterm><indexterm>validation<indexterm>overview</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>By
-default, the workbench validates your files automatically after any build,
-including automatic builds. You can also begin the validation process manually
-without building.</p><p>On the workbench Preferences window, you can enable
-or disable validators to be used on your projects. Also, you can enable or
-disable validators for each enterprise application module project individually
-on the Properties page for that project.</p><p>Each validator can apply to
-certain types of files, certain project natures, and certain project facets.
-When a validator applies to a project facet or nature, the workbench uses
-that validator only on projects that have that facet or nature. Likewise,
-most validators apply only to certain types of files, so the workbench uses
-those validators only on those types of files.</p><p>To validate your files,
-complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step importance="optional"><cmd>Review the check box options available near
-the top of the window to customize your validation settings:</cmd>
-<choicetable>
-<chhead><choptionhd>Option</choptionhd><chdeschd>Description</chdeschd></chhead>
-<chrow><choption>Allow projects to override these preference settings</choption>
-<chdesc>Select to set individual validation settings for one or more of your
-projects.</chdesc></chrow>
-<chrow><choption>Suspend all validators</choption><chdesc>Select to prevent
-validation at the global level.</chdesc></chrow>
-<chrow><choption>Save all modified resources automatically prior to validating</choption>
-<chdesc>Select to save resources you have modified before the validation begins.</chdesc>
-</chrow><chrow><choption>Show a confirmation dialog when performing manual validation</choption>
-<chdesc>Select to show an informational dialog after a manual validation request has completed.</chdesc>
-</chrow>
-</choicetable>
-</step>
-<step><cmd>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</cmd><info>Each validator has
-a check box to specify whether it is used on manual validation and/or on build
-validation.</info></step>
-<step><cmd>Tune a validator by clicking
-the button in the <uicontrol>Settings</uicontrol> column.</cmd>
-<info>Not all validators have additional settings.</info></step>
-<step><cmd>Begin the validation process by one of the following methods:</cmd>
-<choices>
-<choice>Right-click a project and click <uicontrol>Validate</uicontrol>.</choice>
-<choice>Start a build.</choice>
-</choices>
-</step>
-</steps>
-<result outputclass="id_result">Any err<?Pub Caret?>ors found by the validators
-are listed in the Problems view.<p>If you want to set individual validation
-settings for one or more of your projects, see <xref href="tjvalglobalpref.dita"></xref> for
-more information.</p></result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000003949?>
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 04ab6a2..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html
+++ /dev/null
@@ -1,132 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Validating code in enterprise applications" />
-<meta name="abstract" content="The workbench includes validators that check certain files in your enterprise application module projects for errors." />
-<meta name="description" content="The workbench includes validators that check certain files in your enterprise application module projects for errors." />
-<meta content="build validation, enabling, code validation, overview, validation" name="DC.subject" />
-<meta content="build validation, enabling, code validation, overview, validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjval" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Validating code in enterprise applications</title>
-</head>
-<body id="tjval"><a name="tjval"><!-- --></a>
-
-
-<h1 class="id_title">Validating code in enterprise applications</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">The workbench includes validators that
-check certain files in your enterprise application module projects for errors.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>By
-default, the workbench validates your files automatically after any build,
-including automatic builds. You can also begin the validation process manually
-without building.</p>
-<p>On the workbench Preferences window, you can enable
-or disable validators to be used on your projects. Also, you can enable or
-disable validators for each enterprise application module project individually
-on the Properties page for that project.</p>
-<p>Each validator can apply to
-certain types of files, certain project natures, and certain project facets.
-When a validator applies to a project facet or nature, the workbench uses
-that validator only on projects that have that facet or nature. Likewise,
-most validators apply only to certain types of files, so the workbench uses
-those validators only on those types of files.</p>
-<p>To validate your files,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Review the check box options available near
-the top of the window to customize your validation settings:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N100A9-option">Option</th>
-<th valign="bottom" id="N100A9-desc">Description</th></tr></thead>
-<tbody>
-
-<tr><td valign="top" headers="N100A9-option" id="N100C2"><strong>Allow projects to override these preference settings</strong></td>
-
-<td valign="top" headers="N100A9-desc N100C2">Select to set individual validation settings for one or more of your
-projects.</td>
-</tr>
-
-<tr><td valign="top" headers="N100A9-option" id="N100D2"><strong>Suspend all validators</strong></td>
-<td valign="top" headers="N100A9-desc N100D2">Select to prevent
-validation at the global level.</td>
-</tr>
-
-<tr><td valign="top" headers="N100A9-option" id="N100E1"><strong>Save all modified resources automatically prior to validating</strong></td>
-
-<td valign="top" headers="N100A9-desc N100E1">Select to save resources you have modified before the validation begins.</td>
-
-</tr>
-<tr><td valign="top" headers="N100A9-option" id="N100F1"><strong>Show a confirmation dialog when performing manual validation</strong></td>
-
-<td valign="top" headers="N100A9-desc N100F1">Select to show an informational dialog after a manual validation request has completed.</td>
-
-</tr>
-
-</tbody></table>
-
-</li>
-
-<li class="stepexpand"><span>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</span> Each validator has
-a check box to specify whether it is used on manual validation and/or on build
-validation.</li>
-
-<li class="stepexpand"><span>Tune a validator by clicking
-the button in the <span class="uicontrol">Settings</span> column.</span>
- Not all validators have additional settings.</li>
-
-<li class="stepexpand"><span>Begin the validation process by one of the following methods:</span>
-<ul>
-<li>Right-click a project and click <span class="uicontrol">Validate</span>.</li>
-
-<li>Start a build.</li>
-
-</ul>
-
-</li>
-
-</ol>
-
-<div class="id_result">Any errors found by the validators
-are listed in the Problems view.<p>If you want to set individual validation
-settings for one or more of your projects, see <a href="tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a> for
-more information.</p>
-</div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rvalerr.html" title="This table lists the common error messages you may encounter 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/tjvaldisable.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.dita
deleted file mode 100644
index afe3aa1..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.dita
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvaldisable" xml:lang="en-us">
-<title outputclass="id_title">Disabling validation</title>
-<shortdesc outputclass="id_shortdesc">You can disable one or more validators
-individually or disable validation entirely. Also, you can set validation
-settings for your entire workspace and for individual projects.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>disabling</indexterm></indexterm>
-<indexterm>code validation<indexterm>disabling</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p>To
-disable validators in your project or workspace, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step><cmd>To disable individual validators, clear the check boxes next to
-each validator that you want to disable.</cmd><info>Each validator has a check
-box to specify whether it is enabled for manual validation or on a build.</info>
-</step>
-<step importance="optional"><cmd><?Pub Caret1?>You can also change the following
-check box options on this page:</cmd>
-<choicetable>
-<chhead><choptionhd>Option</choptionhd><chdeschd>Description</chdeschd></chhead>
-<chrow><choption>Allow projects to override these preference settings</choption>
-<chdesc>Select to set individual validation settings for one or more of your
-projects.</chdesc></chrow>
-<chrow><choption>Suspend all validators</choption><chdesc>Select to prevent
-validation at the global level. If you select this check box, you can still
-enable validation at the project level.</chdesc></chrow>
-</choicetable>
-</step>
-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<result>If you want to set individual validation settings for one or more
-of your projects, see <xref href="tjvalglobalpref.dita"></xref></result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002445?>
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 15fbb8f..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html
+++ /dev/null
@@ -1,100 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Disabling validation" />
-<meta name="abstract" content="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects." />
-<meta name="description" content="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects." />
-<meta content="validation, disabling, code validation" name="DC.subject" />
-<meta content="validation, disabling, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvaldisable" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Disabling validation</title>
-</head>
-<body id="tjvaldisable"><a name="tjvaldisable"><!-- --></a>
-
-
-<h1 class="id_title">Disabling validation</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can disable one or more validators
-individually or disable validation entirely. Also, you can set validation
-settings for your entire workspace and for individual projects.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>To
-disable validators in your project or workspace, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><span>To disable individual validators, clear the check boxes next to
-each validator that you want to disable.</span> Each validator has a check
-box to specify whether it is enabled for manual validation or on a build.
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>You can also change the following
-check box options on this page:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N1009D-option">Option</th>
-<th valign="bottom" id="N1009D-desc">Description</th></tr></thead>
-<tbody>
-
-<tr><td valign="top" headers="N1009D-option" id="N100B6"><strong>Allow projects to override these preference settings</strong></td>
-
-<td valign="top" headers="N1009D-desc N100B6">Select to set individual validation settings for one or more of your
-projects.</td>
-</tr>
-
-<tr><td valign="top" headers="N1009D-option" id="N100C6"><strong>Suspend all validators</strong></td>
-<td valign="top" headers="N1009D-desc N100C6">Select to prevent
-validation at the global level. If you select this check box, you can still
-enable validation at the project level.</td>
-</tr>
-
-</tbody></table>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section">If you want to set individual validation settings for one or more
-of your projects, see <a href="tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<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 according to the validation settings.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning 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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.dita
deleted file mode 100644
index 50487df..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvalglobalpref" xml:lang="en-us">
-<title outputclass="id_title">Overriding global validation preferences</title>
-<shortdesc outputclass="id_shortdesc">For a given project, you can override
-the global validation preferences.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>overriding global preferences</indexterm></indexterm>
-<indexterm>code validation<indexterm>overriding global preferences</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <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, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step><cmd>Select the <uicontrol>Allow projects to override these preference
-settings</uicontrol> check box and click <uicontrol>OK</uicontrol>.</cmd>
-<stepresult>Now individual projects can override the global preferences.</stepresult>
-</step>
-<step><cmd>Right-click a project and then click <uicontrol>Properties</uicontrol>.</cmd><?Pub Caret?>
-</step>
-<step><cmd>In the left pane of the Properties window, click <uicontrol>Validation</uicontrol>.</cmd>
-</step>
-<step><cmd>Select the <uicontrol>Override validation preferences</uicontrol> check
-box.</cmd><info>This check box is available only if you checked the <uicontrol>Allow
-projects to override these preference settings</uicontrol> check box on the
-workbench validation preferences page.</info></step>
-<step><cmd>To prevent validation for this project, select the <uicontrol>Suspend
-all validators</uicontrol> check box.</cmd></step>
-<step><cmd>In the list of validators, select the check boxes next to each
-validator you want to use.</cmd><info>Each validator has a check box to specify
-whether it is used on manual validation or on a build.</info></step>
-<step><cmd>Choose an alternate implementation for a validator by clicking
-the button in the <uicontrol>Settings</uicontrol> column, then click <uicontrol>OK</uicontrol>.</cmd>
-<info>Not all validators have alternate implementations.</info></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002816?>
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 894560d..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html
+++ /dev/null
@@ -1,94 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Overriding global validation preferences" />
-<meta name="abstract" content="For a given project, you can override the global validation preferences." />
-<meta name="description" content="For a given project, you can override the global validation preferences." />
-<meta content="validation, overriding global preferences, code validation" name="DC.subject" />
-<meta content="validation, overriding global preferences, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvalglobalpref" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Overriding global validation preferences</title>
-</head>
-<body id="tjvalglobalpref"><a name="tjvalglobalpref"><!-- --></a>
-
-
-<h1 class="id_title">Overriding global validation preferences</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">For a given project, you can override
-the global validation preferences.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <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, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Allow projects to override these preference
-settings</span> check box and click <span class="uicontrol">OK</span>.</span>
- Now individual projects can override the global preferences.
-</li>
-
-<li class="stepexpand"><span>Right-click a project and then click <span class="uicontrol">Properties</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the left pane of the Properties window, click <span class="uicontrol">Validation</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Override validation preferences</span> check
-box.</span> This check box is available only if you checked the <span class="uicontrol">Allow
-projects to override these preference settings</span> check box on the
-workbench validation preferences page.</li>
-
-<li class="stepexpand"><span>To prevent validation for this project, select the <span class="uicontrol">Suspend
-all validators</span> check box.</span></li>
-
-<li class="stepexpand"><span>In the list of validators, select the check boxes next to each
-validator you want to use.</span> Each validator has a check box to specify
-whether it is used on manual validation or on a build.</li>
-
-<li class="stepexpand"><span>Choose an alternate implementation for a validator by clicking
-the button in the <span class="uicontrol">Settings</span> column, then click <span class="uicontrol">OK</span>.</span>
- Not all validators have alternate implementations.</li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning 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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.dita
deleted file mode 100644
index 03b800f..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvalmanual" xml:lang="en-us">
-<title outputclass="id_title">Manually validating code</title>
-<shortdesc outputclass="id_shortdesc">When you run a manual validation, all
-resources in the selected project are validated according to the validation
-settings.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>manual</indexterm></indexterm><indexterm>code
-validation<indexterm>manual</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>The
-validators used depend on the global and project validation settings. When
-you validate a project manually, the global settings are used unless both
-of the following are true:<ul>
-<li>The <uicontrol>Allow projects to override these preference settings</uicontrol> check
-box is selected on the global validation preferences page.</li>
-<li>The <uicontrol>Override validation preferences</uicontrol> check box is
-selected on the project's validation preferences page.</li>
-</ul></p><p>Whether the workbench uses the global or project validation preferences,
-only the validators selected to run on manual validation are used when you
-run a manual validation.</p><p>To manually invoke an immediate code validation,
-complete the following steps<?Pub Caret?>:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Select the project that you want to validate.</cmd></step>
-<step><cmd>Right-click the project and then click <uicontrol>Validate</uicontrol>.</cmd>
-<info>If this option is not available, validation is disabled or there are
-no validators enabled for the project. To enable validation at the global
-level, see <xref href="tjval.dita"></xref>. To enable validators for this
-project, see <xref href="tjvalglobalpref.dita"></xref>.</info></step>
-</steps>
-<result outputclass="id_result">The workbench validates the project using
-the enabled validators. Any errors found by the validators are listed in the
-Problems view.</result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002296?>
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 b5bbfd2..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html
+++ /dev/null
@@ -1,88 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Manually validating code" />
-<meta name="abstract" content="When you run a manual validation, all resources in the selected project are validated according to the validation settings." />
-<meta name="description" content="When you run a manual validation, all resources in the selected project are validated according to the validation settings." />
-<meta content="validation, manual, code validation" name="DC.subject" />
-<meta content="validation, manual, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvalmanual" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Manually validating code</title>
-</head>
-<body id="tjvalmanual"><a name="tjvalmanual"><!-- --></a>
-
-
-<h1 class="id_title">Manually validating code</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">When you run a manual validation, all
-resources in the selected project are validated according to the validation
-settings.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <div class="p">The
-validators used depend on the global and project validation settings. When
-you validate a project manually, the global settings are used unless both
-of the following are true:<ul>
-<li>The <span class="uicontrol">Allow projects to override these preference settings</span> check
-box is selected on the global validation preferences page.</li>
-
-<li>The <span class="uicontrol">Override validation preferences</span> check box is
-selected on the project's validation preferences page.</li>
-
-</ul>
-</div>
-<p>Whether the workbench uses the global or project validation preferences,
-only the validators selected to run on manual validation are used when you
-run a manual validation.</p>
-<p>To manually invoke an immediate code validation,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Select the project that you want to validate.</span></li>
-
-<li class="stepexpand"><span>Right-click the project and then click <span class="uicontrol">Validate</span>.</span>
- If this option is not available, validation is disabled or there are
-no validators enabled for the project. To enable validation at the global
-level, see <a href="tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a>. To enable validators for this
-project, see <a href="tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a>.</li>
-
-</ol>
-
-<div class="id_result">The workbench validates the project using
-the enabled validators. Any errors found by the validators are listed in the
-Problems view.</div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling 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/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning 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.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.dita
deleted file mode 100644
index 5e5e5cf..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvalselect" xml:lang="en-us">
-<title outputclass="id_title">Selecting code validators</title>
-<shortdesc outputclass="id_shortdesc">You can select specific validators to
-run during manual and build code validation. You can set each validator to
-run on manual validation, build validation, both, or neither. </shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>selecting validators</indexterm></indexterm>
-<indexterm>code validation<indexterm>selecting validators</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p>To
-choose the validators that you want to use for a project, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step><cmd>Clear the <uicontrol>Suspend all validators</uicontrol> check box.</cmd>
-</step>
-<step importance="optional"><cmd><?Pub Caret1?>If you want to set individual
-validation settings for one or more of your projects, select the <uicontrol>Allow
-projects to override these preference settings</uicontrol> check box.</cmd>
-</step>
-<step><cmd>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</cmd><info>Each validator has
-a check box to specify whether it is used on manual validation or on a build.<note>If
-you deselect any validator that is currently selected, any messages associated
-with the deselected validator will be removed from the task list,
-the next time you perform a full build.</note></info>
-</step>
-<step><cmd>Tune a validator by clicking
-the button in the <uicontrol>Settings</uicontrol> column.</cmd>
-<info>Not all validators have additional settings.</info></step>
-</steps>
-<result>If you want to set individual validation settings for one or more
-of your projects, see <xref href="tjvalglobalpref.dita"></xref>. Like the
-global validation preferences, you can set validators at the project level
-to run on manual validation, build validation, both, or neither.</result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002685?>
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 c4e4aa2..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html
+++ /dev/null
@@ -1,93 +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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Selecting code validators" />
-<meta name="abstract" content="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither." />
-<meta name="description" content="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither." />
-<meta content="validation, selecting validators, code validation" name="DC.subject" />
-<meta content="validation, selecting validators, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvalselect" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Selecting code validators</title>
-</head>
-<body id="tjvalselect"><a name="tjvalselect"><!-- --></a>
-
-
-<h1 class="id_title">Selecting code validators</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can select specific validators to
-run during manual and build code validation. You can set each validator to
-run on manual validation, build validation, both, or neither. </p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>To
-choose the validators that you want to use for a project, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><span>Clear the <span class="uicontrol">Suspend all validators</span> check box.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to set individual
-validation settings for one or more of your projects, select the <span class="uicontrol">Allow
-projects to override these preference settings</span> check box.</span>
-</li>
-
-<li class="stepexpand"><span>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</span> Each validator has
-a check box to specify whether it is used on manual validation or on a build.<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,
-the next time you perform a full build.</div>
-
-</li>
-
-<li class="stepexpand"><span>Tune a validator by clicking
-the button in the <span class="uicontrol">Settings</span> column.</span>
- Not all validators have additional settings.</li>
-
-</ol>
-
-<div class="section">If you want to set individual validation settings for one or more
-of your projects, see <a href="tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a>. Like the
-global validation preferences, you can set validators at the project level
-to run on manual validation, build validation, both, or neither.</div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling 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 according to the validation settings.">Manually validating code</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita
deleted file mode 100644
index c6bcc6b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="cjviewfiltersCait" xml:lang="en-us">
-<title id="id_title">Filtering in the Project Explorer view</title>
-<shortdesc outputclass="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>filters<indexterm>Project Explorer view</indexterm></indexterm>
-<indexterm>views<indexterm>Project Explorer filters</indexterm></indexterm>
-<indexterm>projects<indexterm>filtering</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p>To
-enable or disable filters, complete the following steps</p></context>
-<steps>
-<step><cmd>Open the Select Common Navigator Filters window by selecting <uicontrol>Customize
-View...</uicontrol> from the drop-down menu at the top right corner of the
-view. </cmd></step>
-<step><cmd>On the <uicontrol>Filters</uicontrol> tab, select the check boxes
-next to the filters you want to enable.</cmd><info> For example, when the <uicontrol>Closed
-projects</uicontrol> 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".</info></step>
-<step><cmd>On the <uicontrol>Content</uicontrol> 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. Select the check boxes
-next to the filters you want to hide.</cmd><info>For example, if you clear
-the check box next to <uicontrol>J2EE EJB Deployment Descriptors</uicontrol>,
-the deployment descriptors are hidden from each project in the view.</info>
-</step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html
deleted file mode 100644
index 6288e32..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.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 content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<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 content="task" name="DC.Type" />
-<meta name="DC.Title" content="Filtering in the Project Explorer view" />
-<meta name="abstract" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta name="description" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta content="filters, Project Explorer view, views, Project Explorer filters, projects, filtering" name="DC.subject" />
-<meta content="filters, Project Explorer view, views, Project Explorer filters, projects, filtering" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjview.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjviewfiltersCait" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Filtering in the Project Explorer view</title>
-</head>
-<body id="cjviewfiltersCait"><a name="cjviewfiltersCait"><!-- --></a>
-
-
-<h1 class="topictitle1">Filtering in the Project Explorer view</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>To
-enable or disable filters, complete the following steps</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the Select Common Navigator Filters window by selecting <span class="uicontrol">Customize
-View...</span> from the drop-down menu at the top right corner of the
-view. </span></li>
-
-<li class="stepexpand"><span>On the <span class="uicontrol">Filters</span> tab, select the check boxes
-next to the filters you want to enable.</span> 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".</li>
-
-<li class="stepexpand"><span>On the <span class="uicontrol">Content</span> 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. Select the check boxes
-next to the filters you want to hide.</span> For example, if you clear
-the check box next to <span class="uicontrol">J2EE EJB Deployment Descriptors</span>,
-the deployment descriptors are hidden from each project in the view.
-</li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjview.html" title="While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources.">Project Explorer view in the Java EE perspective</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
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 7f47694..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.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 18dcbf5..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,145 +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
-featureName=JST Enterprise User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=JST enterprise user documentation
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "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\
-June 06, 2007\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\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.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 278b5c0..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.enterprise_userdoc.feature"
- label="%featureName"
- version="3.0.4.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" 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 5644598..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/license.html
+++ /dev/null
@@ -1,98 +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>June 06, 2007</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>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.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.jem.ui/.classpath b/plugins/org.eclipse.jem.beaninfo.vm.common/.classpath
similarity index 78%
rename from plugins/org.eclipse.jem.ui/.classpath
rename to plugins/org.eclipse.jem.beaninfo.vm.common/.classpath
index f70476f..27da7db 100644
--- a/plugins/org.eclipse.jem.ui/.classpath
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/.classpath
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="ui"/>
- <classpathentry kind="src" path="beaninfoui"/>
+ <classpathentry kind="src" path="beaninfoCommon"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.cvsignore b/plugins/org.eclipse.jem.beaninfo.vm.common/.cvsignore
new file mode 100644
index 0000000..9b8171d
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/.cvsignore
@@ -0,0 +1,4 @@
+bin
+build.xml
+bin_beaninfocommon
+bin_vm_beaninfovm
diff --git a/plugins/org.eclipse.jem.ui/.project b/plugins/org.eclipse.jem.beaninfo.vm.common/.project
similarity index 67%
copy from plugins/org.eclipse.jem.ui/.project
copy to plugins/org.eclipse.jem.beaninfo.vm.common/.project
index 71c70e0..e3ce769 100644
--- a/plugins/org.eclipse.jem.ui/.project
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.jem.ui</name>
+ <name>org.eclipse.jem.beaninfo.vm.common</name>
<comment></comment>
<projects>
</projects>
@@ -20,9 +20,19 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>com.ibm.rtp.tools.rose.builder</name>
+ <arguments>
+ <dictionary>
+ <key>rose</key>
+ <value></value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.ibm.rtp.tools.rose.toolnature</nature>
</natures>
</projectDescription>
diff --git a/plugins/org.eclipse.jem.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.core.prefs
similarity index 98%
rename from plugins/org.eclipse.jem.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.core.prefs
index 63f80b5..445b263 100644
--- a/plugins/org.eclipse.jem.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.core.prefs
@@ -1,292 +1,291 @@
-#Sat Mar 31 22:59:40 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+#Wed Nov 26 00:55:05 EST 2008
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.comment.line_length=150
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.lineSplit=150
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
diff --git a/plugins/org.eclipse.jem.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.ui.prefs
similarity index 93%
rename from plugins/org.eclipse.jem.ui/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.ui.prefs
index 6c8e1bc..855e136 100644
--- a/plugins/org.eclipse.jem.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,4 @@
-#Tue Feb 21 10:09:19 EST 2006
+#Tue Feb 21 10:09:18 EST 2006
eclipse.preferences.version=1
formatter_profile=_jve
formatter_settings_version=10
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..59dc168
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+#Thu Jun 16 11:09:08 EDT 2005
+eclipse.preferences.version=1
+selfhosting.binExcludes=/org.eclipse.jem.beaninfo/bin_vm_beaninfovm
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.beaninfo.vm.common/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a3c071d
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.jem.beaninfo.vm.common
+Bundle-Version: 2.0.200.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-Localization: plugin
+Export-Package: org.eclipse.jem.beaninfo.common,
+ org.eclipse.jem.internal.beaninfo.common;x-internal:=true
+Import-Package: org.eclipse.jem.internal.proxy.common;resolution:=optional,
+ org.eclipse.jem.internal.proxy.core;resolution:=optional
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Description: %Bundle-Description.0
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/about.html b/plugins/org.eclipse.jem.beaninfo.vm.common/about.html
new file mode 100644
index 0000000..afceed0
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/about.html
@@ -0,0 +1,25 @@
+<!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>May 2, 2006</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
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
new file mode 100644
index 0000000..3b63c76
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+/*
+
+
+ */
+package org.eclipse.jem.beaninfo.common;
+
+
+
+/**
+ * Constants for the BaseBeanInfo for arguments. This class is common between
+ * the IDE and the remote vm so that these constants can be used on both sides.
+ * <p>
+ * These are constants used in FeatureAttributes as keys. The other special
+ * constants that are not keys in FeatureAttributes are left in BaseBeanInfo
+ * since they are not needed on both sides.
+ *
+ * @since 1.2.0
+ */
+public interface IBaseBeanInfoConstants {
+
+ /**
+ * Indicator used to describe a factory instantiation pattern.
+ * <p>
+ * This will be on the attributes of the BeanDescriptor for the factory class. It will be complete, in that if this
+ * factory is inherited from another factory, it must copy in the superclass's factory attribute. They won't be
+ * automatically merged.
+ * <p>
+ * The format is an Object[][]. The first dimension at index zero is for toolkit wide information and then indexes one and beyond are one for each creation method name. The second dimension is for one entry
+ * of classwide data and the rest are the data for
+ * each creation method.
+ * <p>
+ * The first entry at Object[0] will be <code>{initString, isShared, onFreeform}</code> where:
+ * <dl>
+ * <dt>initString
+ * <dd>The init string that should be used to create an instance of the toolkit if it needs one, or <code>null</code> if it doesn't
+ * need one (i.e. all static) or if the default constructor should be used.
+ * This is used when a component is dropped from the palette that is for a toolkit component.
+ * <dt>isShared
+ * <dd><code>false</code> if each call to the creation method should have a new instance of the toolkit. This means that the toolkit manages only
+ * one instance. This is more like a controller than a toolkit in this case. <code>true</code> if it should
+ * try to reuse the toolkit of the parent if it has one, or any other found toolkit of the same type, (i.e. a subtype will be acceptable).
+ * This is used when a component is dropped from the palette that is for a toolkit component.
+ * <dt>onFreeform
+ * <dd><code>true</code> if the toolkit is created that it should appear on the freeform surface to be selectable. This would be of use
+ * if the toolkit had properties that need to be set. If the toolkit had no properties then it doesn't need to be selectable and should
+ * not be on the freeform. Use <code>false</code> in that case.
+ * </dl>
+ * <p>
+ * The second and other entries of the array are of the format:
+ * <code>{methodName, returnedClassname, isStatic, Object[], ...}</code> where:
+ * <dl>
+ * <dt>methodName
+ * <dd>The name of the creation method this entry is for (String).
+ * <dt>returnedClassname
+ * <dd>The name of the class that is created and returned from the method (String).
+ * <dt>isStatic
+ * <dd><code>Boolean.TRUE</code> if the method is a static method, <code>Boolean.FALSE</code> if not.
+ * This is used when a component is dropped from the palette that is for a toolkit component.
+ * <dt>Object[]
+ * <dd>Zero or more arrays. The array contains the name of the properties for each method signature that each
+ * respective argument is for, or <code>null</code> if that arg is not a property. There can be more than one array if there
+ * is more than one factory method of the same name, and returns the same type, but what is different is only the number of arguments.
+ * If there is a
+ * factory method that has no properties as arguments or has no arguments, don't include an array for it. For example if there was only one factory method and it had no
+ * arguments then there would not be any arrays.
+ * Currently cannot handle where more than one method has the same number of arguments but different types for the arguments.
+ * </dl>
+ * <p>
+ * A example is:
+ * <pre><code>
+ * new Object[][] {
+ * {"new a.b.c.Toolkit(\"ABC\")", Boolean.TRUE, Boolean.FALSE},
+ * {"createButton", "a.b.c.Button", Boolean.FALSE, new Object[] {"parent", "text"}, new Object[] {"parent"}}
+ * }
+ * </code>
+ * </pre>
+ * <p>
+ * This example says that this class is toolkit (factory). To construct an instead use <code>"new a.b.c.Toolkit(\"ABC\")"</code> and it is shared
+ * with other objects created from this factory instance. Also, the factory method is "createButton", returns an "a.b.c.Button", and it is
+ * not a static call (i.e. use a toolkit instance to create it). It has two forms of factory methods. One is two arguments where the first
+ * arg is the parent property and the second arg is the text property. The other form has only one argument, the parent property.
+ * <p>
+ * The way this is used in a palette entry to drop a new object that a toolkit can create is to have an expression of the form
+ * <code>{toolkit:classname}.factorymethod(args)</code>. So for the above example it would be <code>{toolkit:a.b.c.Toolkit}.createButton(parent)</code>.
+ * The classname <b>must</b> be fully-qualified and if an inner class it must use the "$" instead of "." for the name, i.e. a.b.c.Toolkit.InnerFactory
+ * would be a.b.c.Toolkit$InnerFactory.
+ * <p>
+ * <b>NOTE:</b> This is an EXPERIMENTAL API and can change in the future until committed.
+ *
+ * @since 1.2.0
+ */
+ public static final String FACTORY_CREATION = "FACTORY_CREATION";//$NON-NLS-1$
+
+ /**
+ * Category indicator for apply property arguments. Category is a pre-defined attribute name too. That is where the category is stored in a
+ * descriptor.
+ *
+ * @since 1.1.0
+ */
+ public static final String CATEGORY = "category"; //$NON-NLS-1$
+
+ /**
+ * Enumeration values indicator for apply property arguments. Enumeration values is a pre-defined attribute name too. That is where the
+ * enumeration values are stored.
+ *
+ * @since 1.1.0
+ */
+ public static final String ENUMERATIONVALUES = "enumerationValues";//$NON-NLS-1$
+
+ // The keys for icon file names, NOT THE java.awt.icon key.
+ public static final String ICONCOLOR16X16URL = "ICON_COLOR_16x16_URL"; //$NON-NLS-1$
+ public static final String ICONCOLOR32X32URL = "ICON_COLOR_32x32_URL"; //$NON-NLS-1$ // Not used
+ public static final String ICONMONO16X16URL = "ICON_MONO_16x16_URL"; //$NON-NLS-1$ // Not used
+ public static final String ICONMONO32X32URL = "ICON_MONO_32x32_URL"; //$NON-NLS-1$ // Not used
+
+
+ /**
+ * FeatureAttribute key for explicit property changes. The value is a Boolean. <code>true</code>
+ * indicates that the Customize Bean customizer supplied by the BeanInfo will indicate which
+ * properties it has changed through firing {@link java.beans.PropertyChangeEvent} instead of the
+ * Visual Editor automatically trying to determine the set of changed properties.
+ * <p>
+ * The default if not set is <code>false</code>.
+ *
+ * @since 1.1.0.1
+ */
+ public static final String EXPLICIT_PROPERTY_CHANGE = "EXPLICIT_PROPERTY_CHANGE"; //$NON-NLS-1$
+
+ /**
+ * Used by Visual Editor as feature attribute key/value to indicate that it must create an implicit setting of a property(s).
+ * For example {@link javax.swing.JFrame#getContentPane()}. There must be a content pane
+ * set in the VE model so that users can drop the components on it. Setting this here
+ * means that the default content pane from the JFrame will show up in the editor to use.
+ * <p>
+ * This should be used with care in that not all properties are required to always show up.
+ * They can be queried when needed.
+ * <p>
+ * The value can be either a {@link String} for one property. Or it can be a {@link String[]} for more
+ * than one property.
+ *
+ * @since 1.2.0
+ */
+ public static final String REQUIRED_IMPLICIT_PROPERTIES = "requiredImplicitProperties"; //$NON-NLS-1$
+
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
new file mode 100644
index 0000000..724b0d8
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.common;
+
+
+/**
+ * This is the data structure for sending the BeanDescriptor info from
+ * the BeanInfo vm to the IDE vm. It is serializable so that it can
+ * be serialized for transmission.
+ * <p>
+ * It contains the properties of the BeanDescriptor.
+ * @since 1.1.0
+ */
+public class BeanRecord extends FeatureRecord {
+
+ private static final long serialVersionUID = 1105979920664L;
+
+ public String customizerClassName;
+ public boolean mergeInheritedProperties;
+ public boolean mergeInheritedOperations;
+ public boolean mergeInheritedEvents;
+ /**
+ * Names of properties that are to not be inherited in getAllProperties(). It is set only
+ * if the list is not the full list of inherited properties.
+ * If all inherited or mergeInheritedProperties is false, then the field will be <code>null</code>. Save space that way.
+ */
+ public String[] notInheritedPropertyNames;
+ /**
+ * Names of operations that are to not be inherited in getEAllOperations(). It is set only
+ * if the list is not the full list of inherited operations.
+ * If all are inherited or if mergeInheritedOperations is false, then the field will be <code>null</code>. Save space that way.
+ */
+ public String[] notInheritedOperationNames;
+ /**
+ * Names of events that are to not be inherited in getAllEvents(). It is set only
+ * if the list is not the full list of inherited events.
+ * If all are inherited or if mergeInheritedEvents is false, then the field will be <code>null</code>. Save space that way.
+ */
+ public String[] notInheritedEventNames;
+
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
new file mode 100644
index 0000000..b235382
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.common;
+
+
+/**
+ * This is the data structure for sending the EventSetDescriptor info from
+ * the BeanInfo vm to the IDE vm. It is serializable so that it can
+ * be serialized for transmission.
+ * <p>
+ * It contains the properties of the EventSetDescriptor.
+ * @since 1.1.0
+ */
+public class EventSetRecord extends FeatureRecord {
+
+ private static final long serialVersionUID = 1105980773420L;
+
+ public ReflectMethodRecord addListenerMethod;
+ public String eventAdapterClassName;
+ public MethodRecord[] listenerMethodDescriptors;
+ public String listenerTypeName;
+ public ReflectMethodRecord removeListenerMethod;
+ public boolean inDefaultEventSet;
+ public boolean unicast;
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
new file mode 100644
index 0000000..860b55f
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
@@ -0,0 +1,785 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+/*
+
+
+ */
+package org.eclipse.jem.internal.beaninfo.common;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.Arrays;
+import java.util.logging.Level;
+import java.util.regex.Pattern;
+
+import org.eclipse.jem.internal.proxy.common.MapTypes;
+
+
+
+/**
+ * This is the value for a FeatureAttribute. It wrappers the true java object.
+ * Use the getObject method to get the java value.
+ * <p>
+ * We can only represent Strings, primitives, and arrays. (Primitives will converted
+ * to their wrapper class (e.g. Long), and byte, short, and int will move up to Long,
+ * and float will move up to Double). And any kind of valid array on the java BeanInfo side
+ * will be converted to an Object array on the IDE side. We don't have the capability to allow more complex objects
+ * because the IDE may not have the necessary classes available to it that
+ * the BeanInfo may of had available to it. Invalid objects will be represented
+ * by the singleton instance of {@link org.eclipse.jem.internal.beaninfo.common.InvalidObject}.
+ * <p>
+ * <b>Note:</b>
+ * Class objects that are values of Feature attributes on the java BeanInfo side will be
+ * converted to simple strings containing the classname when moved to the client (IDE) side.
+ * That is because the classes probably will not be available on the IDE side, but can be
+ * used to reconstruct the class when used back on the java vm side.
+ * @since 1.1.0
+ */
+public class FeatureAttributeValue implements Serializable {
+
+ private transient Object value;
+ private transient Object internalValue;
+ private boolean implicitValue;
+ private static final long serialVersionUID = 1105717634844L;
+
+ /**
+ * Create the value with the given init string.
+ * <p>
+ * This is not meant to be used by clients.
+ * @param initString
+ *
+ * @since 1.1.0
+ */
+ public FeatureAttributeValue(String initString) {
+ // Use the init string to create the value. This is our
+ // own short-hand for this.
+ if (initString.startsWith(IMPLICIT)) {
+ setImplicitValue(true);
+ initString = initString.substring(IMPLICIT.length());
+ }
+ value = parseString(initString);
+ }
+
+ /**
+ * This is used when customer wants to fluff one up.
+ *
+ *
+ * @since 1.1.0
+ */
+ public FeatureAttributeValue() {
+
+ }
+
+ /**
+ * @return Returns the value.
+ *
+ * @since 1.1.0
+ */
+ public Object getValue() {
+ return value;
+ }
+
+ /**
+ * Set a value.
+ * @param value The value to set.
+ * @since 1.1.0
+ */
+ public void setValue(Object value) {
+ this.value = value;
+ this.setInternalValue(null);
+ }
+
+ /**
+ * Set the internal value.
+ * @param internalValue The internalValue to set.
+ *
+ * @since 1.1.0
+ */
+ public void setInternalValue(Object internalValue) {
+ this.internalValue = internalValue;
+ }
+
+ /**
+ * This is the internal value. It is the <code>value</code> massaged into an easier to use form
+ * in the IDE. It will not be serialized out. It will not be reconstructed from an init string.
+ * <p>
+ * It does not need to be used. It will be cleared if
+ * a new value is set. For example, if the value is a complicated array (because you can't have
+ * special classes in the attribute value on the BeanInfo side) the first usage of this value can
+ * be translated into an easier form to use, such as a map.
+ *
+ * @return Returns the internalValue.
+ *
+ * @since 1.1.0
+ */
+ public Object getInternalValue() {
+ return internalValue;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ public String toString() {
+ if (value == null)
+ return super.toString();
+ StringBuffer out = new StringBuffer(100);
+ if (isImplicitValue())
+ out.append(IMPLICIT);
+ makeString(value, out);
+ return out.toString();
+ }
+
+
+ /**
+ * Helper method to take the object and turn it into the
+ * string form that is required for EMF serialization.
+ * <p>
+ * This is used internally. It can be used for development
+ * purposes by clients, but they would not have any real
+ * runtime need for this.
+ * <p>
+ * Output format would be (there won't be any newlines in the actual string)
+ * <pre>
+ * String: "zxvzxv"
+ * Number: number
+ * Boolean: true or false
+ * Character: 'c'
+ * null: null
+ *
+ * Array: (all arrays will be turned into Object[])
+ * [dim]{e1, e2}
+ * [dim1][dim2]{[dim1a]{e1, e2}, [dim2a]{e3, e4}}
+ * where en are objects that follow the pattern for single output above.
+ *
+ * Any invalid object (i.e. not one of the ones we handle) will be:
+ * INV
+ *
+ * Arrays of invalid types (not Object, String, Number, Boolean, Character,
+ * or primitives) will be marked as INV.
+ * </pre>
+ * @param value
+ * @return serialized form as a string.
+ *
+ * @since 1.1.0
+ */
+ public static String makeString(Object value) {
+ StringBuffer out = new StringBuffer(100);
+ makeString(value, out);
+ return out.toString();
+ }
+
+ private static final Pattern QUOTE = Pattern.compile("\""); // Pattern for searching for double-quote. Make it static so don't waste time compiling each time. //$NON-NLS-1$
+ private static final String NULL = "null"; // Output string for null //$NON-NLS-1$
+ private static final String INVALID = "INV"; // Invalid object flag. //$NON-NLS-1$
+ private static final String IMPLICIT = "implicit,"; // Implicit flag. //$NON-NLS-1$
+
+ /*
+ * Used for recursive building of the string.
+ */
+ private static void makeString(Object value, StringBuffer out) {
+ if (value == null)
+ out.append(NULL);
+ else if (value instanceof String || value instanceof Class) {
+ // String: "string" or "string\"stringend" if str included a double-quote.
+ out.append('"');
+ // If class, turn value into the classname.
+ String str = value instanceof String ? (String) value : ((Class) value).getName();
+ if (str.indexOf('"') != -1) {
+ // Replace double-quote with escape double-quote so we can distinquish it from the terminating double-quote.
+ out.append(QUOTE.matcher(str).replaceAll("\\\\\"")); // Don't know why we need the back-slash to be doubled for replaceall, but it doesn't work otherwise. //$NON-NLS-1$
+ } else
+ out.append(str);
+ out.append('\"');
+ } else if (value instanceof Number) {
+ // Will go out as either a integer number or a floating point number.
+ // When read back in it will be either a Long or a Double.
+ out.append(value);
+ } else if (value instanceof Boolean) {
+ // It will go out as either true or false.
+ out.append(value);
+ } else if (value instanceof Character) {
+ // Character: 'c' or '\'' if char was a quote.
+ out.append('\'');
+ Character c = (Character) value;
+ if (c.charValue() != '\'')
+ out.append(c.charValue());
+ else
+ out.append("\\'"); //$NON-NLS-1$
+ out.append('\'');
+ } else if (value.getClass().isArray()) {
+ // Handle array format.
+ Class type = value.getClass();
+ // See if final type is a valid type.
+ Class ft = type.getComponentType();
+ int dims = 1;
+ while (ft.isArray()) {
+ dims++;
+ ft = ft.getComponentType();
+ }
+ if (ft == Object.class || ft == String.class || ft == Boolean.class || ft == Character.class || ft.isPrimitive() || Number.class.isAssignableFrom(ft)) {
+ // [length][][] {....}
+ out.append('[');
+ int length = Array.getLength(value);
+ out.append(length);
+ out.append(']');
+ while(--dims > 0) {
+ out.append("[]"); //$NON-NLS-1$
+ }
+ out.append('{');
+ for (int i=0; i < length; i++) {
+ if (i != 0)
+ out.append(',');
+ makeString(Array.get(value, i), out);
+ }
+ out.append('}');
+ } else
+ out.append(INVALID); // Any other kind of array is invalid.
+ } else {
+ out.append(INVALID);
+ }
+ }
+
+
+ /**
+ * Helper method to take the string input from EMF serialization and turn it
+ * into an Object.
+ * <p>
+ * This is used internally. It can be used for development
+ * purposes by clients, but they would not have any real
+ * runtime need for this.
+ * <p>
+ * The object will be an object, null, or an Object array. Any value
+ * that is invalid will be set to the {@link InvalidObject#INSTANCE} static
+ * instance.
+ *
+ * @param input
+ * @return object decoded from the input.
+ *
+ * @see #makeString(Object)
+ * @since 1.1.0
+ */
+ public static Object parseString(String input) {
+ return parseString(new StringParser(input));
+ }
+
+ private static class StringParser {
+ private int next=0;
+ private int length;
+ private String input;
+
+ public StringParser(String input) {
+ this.input = input;
+ this.length = input.length();
+ }
+
+ public String toString() {
+ return "StringParser: \""+input+'"'; //$NON-NLS-1$
+ }
+
+ public void skipWhitespace() {
+ while(next < length) {
+ if (!Character.isWhitespace(input.charAt(next++))) {
+ next--; // Put it back as not yet read since it is not whitespace.
+ break;
+ }
+ }
+ }
+
+ /**
+ * Return the next index
+ * @return
+ *
+ * @since 1.1.0
+ */
+ public int nextIndex() {
+ return next;
+ }
+
+ /**
+ * Get the length of the input
+ * @return input length
+ *
+ * @since 1.1.0
+ */
+ public int getLength() {
+ return length;
+ }
+
+
+ /**
+ * Read the current character and go to next.
+ * @return current character
+ *
+ * @since 1.1.0
+ */
+ public char read() {
+ return next<length ? input.charAt(next++) : 0;
+ }
+
+ /**
+ * Backup the parser one character.
+ *
+ *
+ * @since 1.1.0
+ */
+ public void backup() {
+ if (--next < 0)
+ next = 0;
+ }
+
+ /**
+ * Peek at the char at the next index, but don't increment afterwards.
+ * @return
+ *
+ * @since 1.1.0
+ */
+ public char peek() {
+ return next<length ? input.charAt(next) : 0;
+ }
+
+ /**
+ * Have we read the last char.
+ * @return <code>true</code> if read last char.
+ *
+ * @since 1.1.0
+ */
+ public boolean atEnd() {
+ return next>=length;
+ }
+
+ /**
+ * Reset to the given next index.
+ * @param nextIndex the next index to do a read at.
+ *
+ * @since 1.1.0
+ */
+ public void reset(int nextIndex) {
+ if (nextIndex<=length)
+ next = nextIndex;
+ else
+ next = length;
+ }
+
+ /**
+ * Skip the next number of chars.
+ * @param skip number of chars to skip.
+ *
+ * @since 1.1.0
+ */
+ public void skip(int skip) {
+ if ((next+=skip) > length)
+ next = length;
+ }
+
+ /**
+ * Return the string input.
+ * @return the string input
+ *
+ * @since 1.1.0
+ */
+ public String getInput() {
+ return input;
+ }
+
+ }
+
+ /*
+ * Starting a parse for an object at the given index.
+ * Return the parsed object or InvalidObject if no
+ * object or if there was an error parsing.
+ */
+ private static Object parseString(StringParser parser) {
+ parser.skipWhitespace();
+ if (!parser.atEnd()) {
+ char c = parser.read();
+ switch (c) {
+ case '"':
+ // Start of a quoted string. Scan for closing quote, ignoring escaped quotes.
+ int start = parser.nextIndex(); // Index of first char after '"'
+ char[] dequoted = null; // Used if there is an escaped quote. That is the only thing we support escape on, quotes.
+ int dequoteIndex = 0;
+ while (!parser.atEnd()) {
+ char cc = parser.read();
+ if (cc == '"') {
+ // If we didn't dequote, then just do substring.
+ if (dequoted == null)
+ return parser.getInput().substring(start, parser.nextIndex()-1); // next is char after '"', so end of string index is index of '"'
+ else {
+ // We have a dequoted string. So turn into a string.
+ // Gather the last group
+ int endNdx = parser.nextIndex()-1;
+ parser.getInput().getChars(start, endNdx, dequoted, dequoteIndex);
+ dequoteIndex+= (endNdx-start);
+ return new String(dequoted, 0, dequoteIndex);
+ }
+ } else if (cc == '\\') {
+ // We had an escape, see if next is a quote. If it is we need to strip out the '\'.
+ if (parser.peek() == '"') {
+ if (dequoted == null) {
+ dequoted = new char[parser.getLength()];
+ }
+ int endNdx = parser.nextIndex()-1;
+ parser.getInput().getChars(start, endNdx, dequoted, dequoteIndex); // Get up to, but not including '\'
+ dequoteIndex+= (endNdx-start);
+ // Now also add in the escaped quote.
+ dequoted[dequoteIndex++] = parser.read();
+ start = parser.nextIndex(); // Next group is from next index.
+ }
+ }
+ }
+ break; // If we got here, it is invalid.
+
+ case '-':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ // Possible number.
+ // Scan to next non-digit, or not part of valid number.
+ boolean numberComplete = false;
+ boolean floatType = false;
+ boolean foundE = false;
+ boolean foundESign = false;
+ start = parser.nextIndex()-1; // We want to include the sign or first digit in the number.
+ while (!parser.atEnd() && !numberComplete) {
+ char cc = parser.read();
+ switch (cc) {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ break; // This is good, go on.
+ case '.':
+ if (floatType)
+ return InvalidObject.INSTANCE; // We already found a '.', two are invalid.
+ floatType = true;
+ break;
+ case 'e':
+ case 'E':
+ if (foundE)
+ return InvalidObject.INSTANCE; // We already found a 'e', two are invalid.
+ foundE = true;
+ floatType = true; // An 'e' makes it a float, if not already.
+ break;
+ case '+':
+ case '-':
+ if (!foundE || foundESign)
+ return InvalidObject.INSTANCE; // A +/- with no 'e' first is invalid. Or more than one sign.
+ foundESign = true;
+ break;
+ default:
+ // Anything else is end of number.
+ parser.backup(); // Back it up so that next parse will start with this char.
+ numberComplete = true; // So we stop scanning
+ break;
+ }
+ }
+ try {
+ if (!floatType)
+ return Long.valueOf(parser.getInput().substring(start, parser.nextIndex()));
+ else
+ return Double.valueOf(parser.getInput().substring(start, parser.nextIndex()));
+ } catch (NumberFormatException e) {
+ }
+ break; // If we got here, it is invalid.
+
+ case 't':
+ case 'T':
+ case 'f':
+ case 'F':
+ // Possible boolean.
+ if (parser.getInput().regionMatches(true, parser.nextIndex()-1, "true", 0, 4)) { //$NON-NLS-1$
+ parser.skip(3); // Skip over rest of string.
+ return Boolean.TRUE;
+ } else if (parser.getInput().regionMatches(true, parser.nextIndex()-1, "false", 0, 5)) { //$NON-NLS-1$
+ parser.skip(4); // Skip over rest of string.
+ return Boolean.FALSE;
+ }
+ break; // If we got here, it is invalid.
+
+ case '\'':
+ // Possible character
+ char cc = parser.read();
+ // We really only support '\\' and '\'' anything else will be treated as ignore '\' because we don't know handle full escapes.
+ if (cc == '\\')
+ cc = parser.read(); // Get what's after it.
+ else if (cc == '\'')
+ break; // '' is invalid.
+ if (parser.peek() == '\'') {
+ // So next char after "character" is is a quote. This is good.
+ parser.read(); // Now consume the quote
+ return new Character(cc);
+ }
+ break; // If we got here, it is invalid.
+
+ case 'n':
+ // Possible null.
+ if (parser.getInput().regionMatches(parser.nextIndex()-1, "null", 0, 4)) { //$NON-NLS-1$
+ parser.skip(3); // Skip over rest of string.
+ return null;
+ }
+ break; // If we got here, it is invalid.
+
+ case 'I':
+ // Possible invalid value.
+ if (parser.getInput().regionMatches(parser.nextIndex()-1, INVALID, 0, INVALID.length())) {
+ parser.skip(INVALID.length()-1); // Skip over rest of string.
+ return InvalidObject.INSTANCE;
+ }
+ break; // If we got here, it is invalid.
+
+ case '[':
+ // Possible array.
+ // The next field should be a number, so we'll use parseString to get the number.
+ Object size = parseString(parser);
+ if (size instanceof Long) {
+ parser.skipWhitespace();
+ cc = parser.read(); // Se if next is ']'
+ if (cc == ']') {
+ // Good, well-formed first dimension
+ int dim = 1;
+ boolean valid = true;
+ // See if there are more of just "[]". the number of them is the dim.
+ while (true) {
+ parser.skipWhitespace();
+ cc = parser.read();
+ if (cc == '[') {
+ parser.skipWhitespace();
+ cc = parser.read();
+ if (cc == ']')
+ dim++;
+ else {
+ // This is invalid.
+ valid = false;
+ parser.backup();
+ break; // No more dims.
+ }
+ } else {
+ parser.backup();
+ break; // No more dims.
+ }
+ }
+ if (valid) {
+ parser.skipWhitespace();
+ cc = parser.read();
+ if (cc == '{') {
+ // Good, we're at the start of the initialization code.
+ int[] dims = new int[dim];
+ int len = ((Long) size).intValue();
+ dims[0] = len;
+ Object array = Array.newInstance(Object.class, dims);
+ Arrays.fill((Object[]) array, null); // Because newInstance used above fills the array created with empty arrays when a dim>1.
+
+ // Now we start filling it in.
+ Object invSetting = null; // What we will use for the invalid setting. If this is a multidim, this needs to be an array. Will not create it until needed.
+ Object entry = parseString(parser); // Get the first entry
+ Class compType = array.getClass().getComponentType();
+ int i = -1;
+ while (true) {
+ if (++i < len) {
+ if (compType.isInstance(entry)) {
+ // Good, it can be assigned.
+ Array.set(array, i, entry);
+ } else {
+ // Bad. Need to set invalid.
+ if (invSetting == null) {
+ // We haven't created it yet.
+ if (dim == 1)
+ invSetting = InvalidObject.INSTANCE; // Great, one dimensional, we can use invalid directly
+ else {
+ // Multi-dim. Need to create a valid array that we can set.
+ int[] invDims = new int[dim - 1];
+ Arrays.fill(invDims, 1); // Length one all of the way so that the final component can be invalid object
+ invSetting = Array.newInstance(Object.class, invDims);
+ Object finalEntry = invSetting; // Final array (with component type of just Object). Start with the full array and work down.
+ for (int j = invDims.length - 1; j > 0; j--) {
+ finalEntry = Array.get(finalEntry, 0);
+ }
+ Array.set(finalEntry, 0, InvalidObject.INSTANCE);
+ }
+ }
+ Array.set(array, i, invSetting);
+ }
+ }
+
+ parser.skipWhitespace();
+ cc = parser.read();
+ if (cc == ',') {
+ // Good, get next
+ entry = parseString(parser);
+ } else if (cc == '}') {
+ // Good, reached the end.
+ break;
+ } else {
+ if (!parser.atEnd()) {
+ parser.backup();
+ entry = parseString(parser); // Technically this should be invalid, but we'll let a whitespace also denote next entry.
+ } else {
+ // It's really screwed up. The string just ended. Log it.
+ Exception e = new IllegalStateException(parser.toString());
+ try {
+ // See if Beaninfo plugin is available (we are running under eclipse). If so, use it, else just print to error.
+ // We may be in the remote vm and so it won't be available.
+ Class biPluginClass = Class.forName("org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin"); //$NON-NLS-1$
+ Method getPlugin = biPluginClass.getMethod("getPlugin", (Class[]) null); //$NON-NLS-1$
+ Method getLogger = biPluginClass.getMethod("getLogger", (Class[]) null); //$NON-NLS-1$
+ Method log = getLogger.getReturnType().getMethod("log", new Class[] {Throwable.class, Level.class}); //$NON-NLS-1$
+ Object biPlugin = getPlugin.invoke(null, (Object[]) null);
+ Object logger = getLogger.invoke(biPlugin, (Object[]) null);
+ log.invoke(logger, new Object[] {e, Level.WARNING});
+ return InvalidObject.INSTANCE;
+ } catch (SecurityException e1) {
+ } catch (IllegalArgumentException e1) {
+ } catch (ClassNotFoundException e1) {
+ } catch (NoSuchMethodException e1) {
+ } catch (IllegalAccessException e1) {
+ } catch (InvocationTargetException e1) {
+ } catch (NullPointerException e1) {
+ }
+ e.printStackTrace(); // Not in eclipse, so just print stack trace.
+ return InvalidObject.INSTANCE;
+ }
+ }
+ }
+
+ return array;
+ }
+ }
+ }
+ }
+ break; // If we got here, it is invalid.
+ }
+ }
+ return InvalidObject.INSTANCE;
+ }
+
+ private void writeObject(ObjectOutputStream out) throws IOException {
+ // Write out any hidden stuff
+ out.defaultWriteObject();
+ writeObject(value, out);
+ }
+
+ private void writeObject(Object value, ObjectOutputStream out) throws IOException {
+ if (value == null)
+ out.writeObject(value);
+ else {
+ if (value instanceof Class)
+ out.writeObject(((Class) value).getName());
+ else if (!value.getClass().isArray()) {
+ if (value instanceof String || value instanceof Number || value instanceof Boolean || value instanceof Character)
+ out.writeObject(value);
+ else
+ out.writeObject(InvalidObject.INSTANCE);
+ } else {
+ // Array is tricky. See if it is one we can handle, if not then invalid.
+ // To indicate array, we will first write out the Class of the Component type of the array (it will
+ // be converted to be Object or Object[]...).
+ // This will be the clue that an array is coming. Class values will never
+ // be returned, so that is how we can tell it is an array.
+ // Note: The reason we are using the component type (converted to Object) is because to reconstruct on the other side we need
+ // to use the component type plus length of the array's first dimension.
+ //
+ // We can not just serialize the array in the normal way because it may contain invalid values, and we need to
+ // handle that. Also, if it wasn't an Object array, we need to turn it into an object array. We need consistency
+ // in that it should always be an Object array.
+ // So output format will be:
+ // Class(component type)
+ // int(size of first dimension)
+ // Object(value of first entry) - Actually use out writeObject() format to allow nesting of arrays.
+ // Object(value of second entry)
+ // ... up to size of dimension.
+ Class type = value.getClass();
+ // See if final type is a valid type.
+ Class ft = type.getComponentType();
+ int dims = 1;
+ while (ft.isArray()) {
+ dims++;
+ ft = ft.getComponentType();
+ }
+ if (ft == Object.class || ft == String.class || ft == Boolean.class || ft == Character.class || ft.isPrimitive() || ft == Class.class || Number.class.isAssignableFrom(ft)) {
+ String jniType = dims == 1 ? "java.lang.Object" : MapTypes.getJNITypeName("java.lang.Object", dims-1); //$NON-NLS-1$ //$NON-NLS-2$
+ try {
+ Class componentType = Class.forName(jniType);
+ out.writeObject(componentType);
+ int length = Array.getLength(value);
+ out.writeInt(length);
+ for (int i = 0; i < length; i++) {
+ writeObject(Array.get(value, i), out);
+ }
+ } catch (ClassNotFoundException e) {
+ // This should never happen. Object arrays are always available.
+ }
+ } else
+ out.writeObject(InvalidObject.INSTANCE);
+ }
+ }
+ }
+
+
+ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ // Read in any hidden stuff
+ in.defaultReadObject();
+
+ value = readActualObject(in);
+ }
+
+ private Object readActualObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ Object val = in.readObject();
+ if (val instanceof Class) {
+ // It must be an array. Only Class objects that come in are Arrays of Object.
+ int length = in.readInt();
+ Object array = Array.newInstance((Class) val, length);
+ for (int i = 0; i < length; i++) {
+ Array.set(array, i, readActualObject(in));
+ }
+ return array;
+ } else
+ return val; // It is the value itself.
+ }
+
+
+ /**
+ * Is this FeatureAttributeValue an implicit value, i.e. one that came from
+ * BeanInfo Introspection and not from an override file.
+ *
+ * @return Returns the implicitValue.
+ *
+ * @since 1.2.0
+ */
+ public boolean isImplicitValue() {
+ return implicitValue;
+ }
+
+
+ /**
+ * Set the implicit value flag.
+ * @param implicitValue The implicitValue to set.
+ *
+ * @see #isImplicitValue()
+ * @since 1.2.0
+ */
+ public void setImplicitValue(boolean implicitValue) {
+ this.implicitValue = implicitValue;
+ }
+
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
new file mode 100644
index 0000000..9d392fc
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.common;
+
+import java.io.Serializable;
+
+
+/**
+ * This is the data structure for sending the FeatureDescriptor info from
+ * the BeanInfo vm to the IDE vm. It is serializable so that it can
+ * be serialized for transmission.
+ * <p>
+ * It contains the properties of the FeatureDescriptor.
+ * @since 1.1.0
+ */
+public class FeatureRecord implements Serializable {
+
+ private static final long serialVersionUID = 1105979276648L;
+
+ public String name; // Some decorators use this and others don't. Each decorator type will decide whether this is of importance.
+ public String displayName;
+ public String shortDescription;
+ public String category;
+ public boolean expert;
+ public boolean hidden;
+ public boolean preferred;
+ public String[] attributeNames;
+ public FeatureAttributeValue[] attributeValues;
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
new file mode 100644
index 0000000..e067449
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.common;
+
+
+/**
+ * These are constants needed for transferring BeanInfo results from the BeanInfo VM.
+ * @since 1.1.0
+ */
+public interface IBeanInfoIntrospectionConstants {
+
+ /**
+ * Introspection bit flag indicating do the BeanDecorator. Sent to ModelingBeanInfo.introspect method.
+ * @since 1.1.0
+ */
+ public static final int DO_BEAN_DECOR = 0x1;
+
+ /**
+ * Introspection bit flag indicating do the Properties. Sent to ModelingBeanInfo.introspect method.
+ * @since 1.1.0
+ */
+ public static final int DO_PROPERTIES = 0x2;
+
+ /**
+ * Introspection bit flag indicating do the Methods. Sent to ModelingBeanInfo.introspect method.
+ * @since 1.1.0
+ */
+ public static final int DO_METHODS = 0x4;
+
+ /**
+ * Introspection bit flag indicating do the Events. Sent to ModelingBeanInfo.introspect method.
+ * @since 1.1.0
+ */
+ public static final int DO_EVENTS = 0x8;
+
+ /**
+ * BeanDecorator was sent command id.
+ * <p>
+ * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
+ * The stream will be broken into sections.
+ * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
+ * Following the command id will be the type of input specific data.
+ * <p>
+ * The data following the command id will be a BeanRecord from the ObjectInputStream.
+ *
+ * @see BeanRecord
+ * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
+ * @since 1.1.0
+ */
+ public static final int BEAN_DECORATOR_SENT = 1;
+
+ /**
+ * PropertyDecorators send command id.
+ * <p>
+ * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
+ * The stream will be broken into sections.
+ * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
+ * Following the command id will be the type of input specific data.
+ * <p>
+ * The first object will be an int and will be the number of properties and each object after that
+ * will be a PropertyRecord/IndexedPropertyRecord.
+ *
+ * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
+ * @see PropertyRecord
+ * @see IndexedPropertyRecord
+ */
+ public static final int PROPERTY_DECORATORS_SENT = 2;
+
+ /**
+ * MethodDecorators send command id.
+ * <p>
+ * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
+ * The stream will be broken into sections.
+ * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
+ * Following the command id will be the type of input specific data.
+ * <p>
+ * The InputStream will be Objects (use ObjectInputStream).
+ * The first object will be an int and will be the number of methods and each object after that
+ * will be a MethodRecord.
+ *
+ * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
+ * @see MethodRecord
+ */
+ public static final int METHOD_DECORATORS_SENT = 3;
+
+ /**
+ * EventSetDecorators send command id.
+ * <p>
+ * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
+ * The stream will be broken into sections.
+ * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
+ * Following the command id will be the type of input specific data.
+ * <p>
+ * The first object will be an int and will be the number of events and each object after that
+ * will be a EventSetRecord.
+ *
+ * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
+ * @see MethodRecord
+ */
+ public static final int EVENT_DECORATORS_SENT = 4;
+
+ /**
+ * Done send command id.
+ * <p>
+ * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
+ * The stream will be broken into sections.
+ * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
+ * Following the command id will be the type of input specific data.
+ * <p>
+ * This command id means there is no more data and it should return.
+ *
+ * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
+ * @see MethodRecord
+ */
+ public static final int DONE = 5;
+
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
new file mode 100644
index 0000000..88d2916
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.common;
+
+
+/**
+ * This is the data structure for sending the IndexedPropertyDescriptor info from
+ * the BeanInfo vm to the IDE vm. It is serializable so that it can
+ * be serialized for transmission.
+ * <p>
+ * It contains the properties of the IndexedPropertyDescriptor.
+ * @since 1.1.0
+ */
+public class IndexedPropertyRecord extends PropertyRecord {
+ private static final long serialVersionUID = 1105983227990L;
+
+ public ReflectMethodRecord indexedReadMethod;
+ public ReflectMethodRecord indexedWriteMethod;
+ public String indexedPropertyTypeName;
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
new file mode 100644
index 0000000..7e731ce
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.common;
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+
+
+/**
+ * An indicator object for invalid object type. This is used with feature attribute
+ * values from the BeanInfo classes. We can only handle certain types when we
+ * bring them over from the BeanInfo VM. That is because the classes instantiated
+ * in the BeanInfo class may not be available in the IDE. So any invalid value
+ * will be replaced by this class instance.
+ * <p>
+ * This is a singleton class.
+ * There will be one instance (InvalidObject.INSTANCE) in the system. That way
+ * "==" can be used to test for it.
+ *
+ * @since 1.1.0
+ */
+public class InvalidObject implements Serializable {
+
+ /**
+ * Singleton instance of InvalidObject.
+ * @since 1.1.0
+ */
+ public static final InvalidObject INSTANCE = new InvalidObject();
+
+ private static final long serialVersionUID = 1105643804370L;
+
+ /*
+ * Nobody else should create one of these.
+ */
+ private InvalidObject() {
+ }
+
+ private Object readResolve() throws ObjectStreamException {
+ return INSTANCE;
+ }
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
new file mode 100644
index 0000000..4b37be9
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.common;
+
+
+/**
+ * This is the data structure for sending the MethodDescriptor info from
+ * the BeanInfo vm to the IDE vm. It is serializable so that it can
+ * be serialized for transmission.
+ * <p>
+ * It contains the properties of the MethodDescriptor.
+ * @since 1.1.0
+ */
+public class MethodRecord extends FeatureRecord {
+
+ private static final long serialVersionUID = 1105982213110L;
+
+ /**
+ * Method signature for the method this record describes.
+ */
+ public ReflectMethodRecord methodForDescriptor;
+ /**
+ * Parameter records array. It may be <code>null</code> if there aren't any.
+ */
+ public ParameterRecord[] parameters;
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
new file mode 100644
index 0000000..5b2f370
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.common;
+
+
+/**
+ * This is the data structure for sending the ParameterDescriptor info from
+ * the BeanInfo vm to the IDE vm. It is serializable so that it can
+ * be serialized for transmission.
+ * <p>
+ * It contains the properties of the ParameterDescriptor.
+ * <p>
+ * The only field of importance is the name, and that comes from FeatureRecord.
+ * @since 1.1.0
+ */
+public class ParameterRecord extends FeatureRecord {
+
+ private static final long serialVersionUID = 1105982438955L;
+
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
new file mode 100644
index 0000000..3e03241
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.common;
+
+
+/**
+ * This is the data structure for sending the PropertyDescriptor info from
+ * the BeanInfo vm to the IDE vm. It is serializable so that it can
+ * be serialized for transmission.
+ * <p>
+ * It contains the properties of the PropertyDescriptor.
+ * @since 1.1.0
+ */
+public class PropertyRecord extends FeatureRecord {
+ private static final long serialVersionUID = 1105979276648L;
+
+ public String propertyEditorClassName;
+ public String propertyTypeName;
+ public ReflectMethodRecord readMethod;
+ public ReflectMethodRecord writeMethod;
+ public ReflectFieldRecord field;
+ public boolean bound;
+ public boolean constrained;
+ public Boolean designTime;
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
new file mode 100644
index 0000000..9829839
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.common;
+
+import java.io.Serializable;
+
+
+/**
+ * This is the data structure for sending the java.lang.reflect.Field info from
+ * the BeanInfo vm to the IDE vm. It is serializable so that it can
+ * be serialized for transmission.
+ * <p>
+ * It contains the properties of the java.lang.reflect.Field.
+ * @since 1.1.0
+ */
+public class ReflectFieldRecord implements Serializable {
+
+ private static final long serialVersionUID = 1105981512453L;
+
+ public String className;
+ public String fieldName;
+ public boolean readOnly;
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
new file mode 100644
index 0000000..9f11291
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.common;
+
+import java.io.Serializable;
+
+
+/**
+ * This is the data structure for sending the java.lang.reflect.Method info from
+ * the BeanInfo vm to the IDE vm. It is serializable so that it can
+ * be serialized for transmission.
+ * <p>
+ * It contains the properties of the java.lang.reflect.Method.
+ * @since 1.1.0
+ */
+public class ReflectMethodRecord implements Serializable {
+
+ private static final long serialVersionUID = 1105981512773L;
+
+ public String className;
+ public String methodName;
+ public String[] parameterTypeNames; // Maybe null if no parameters.
+}
diff --git a/plugins/org.eclipse.jem.ui/build.properties b/plugins/org.eclipse.jem.beaninfo.vm.common/build.properties
similarity index 74%
rename from plugins/org.eclipse.jem.ui/build.properties
rename to plugins/org.eclipse.jem.beaninfo.vm.common/build.properties
index b96ba1e..4488430 100644
--- a/plugins/org.eclipse.jem.ui/build.properties
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/build.properties
@@ -1,22 +1,20 @@
###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
+# Copyright (c) 2003, 2006 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-#
+#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- icons/,\
+src.excludes = **/.cvsignore
+bin.includes = plugin.properties,\
about.html,\
- .options,\
META-INF/,\
.
-src.includes = about.html
-output.. = bin/
-source.. = ui/,\
- beaninfoui/
jars.compile.order = .
+src.includes = about.html
+source.. = beaninfoCommon/
+output.. = bin/
+
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/plugin.properties b/plugins/org.eclipse.jem.beaninfo.vm.common/plugin.properties
new file mode 100644
index 0000000..5b14a74
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm.common/plugin.properties
@@ -0,0 +1,4 @@
+#Properties file for org.eclipse.jem.beaninfo.vm.common
+Bundle-Name.0 = JEM Beaninfo Common Jar
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Description.0 = This bundle is used only as a jar by the org.eclipse.jem.beaninfo bundle, so it should never be "pre-req'd" by others, only by o.e.jem.beaninfo. Other adopters would use only that o.e.jem.beaninfo bundle.
diff --git a/plugins/org.eclipse.jem.ui/.classpath b/plugins/org.eclipse.jem.beaninfo.vm/.classpath
similarity index 78%
copy from plugins/org.eclipse.jem.ui/.classpath
copy to plugins/org.eclipse.jem.beaninfo.vm/.classpath
index f70476f..18d82c6 100644
--- a/plugins/org.eclipse.jem.ui/.classpath
+++ b/plugins/org.eclipse.jem.beaninfo.vm/.classpath
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="ui"/>
- <classpathentry kind="src" path="beaninfoui"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="vm_beaninfovm"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.jem.ui/.project b/plugins/org.eclipse.jem.beaninfo.vm/.project
similarity index 93%
rename from plugins/org.eclipse.jem.ui/.project
rename to plugins/org.eclipse.jem.beaninfo.vm/.project
index 71c70e0..8770b20 100644
--- a/plugins/org.eclipse.jem.ui/.project
+++ b/plugins/org.eclipse.jem.beaninfo.vm/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.jem.ui</name>
+ <name>org.eclipse.jem.beaninfo.vm</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.beaninfo.vm/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..7e97998
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Nov 26 01:23:00 EST 2008
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.compliance=1.4
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.beaninfo.vm/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e8041c9
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.jem.beaninfo.vm
+Bundle-Version: 2.0.200.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-Localization: plugin
+Bundle-Vendor: %Bundle-Vendor.0
+Export-Package: org.eclipse.jem.beaninfo.vm,
+ org.eclipse.jem.internal.beaninfo.vm;x-internal:=true
+Require-Bundle: org.eclipse.jem.beaninfo.vm.common;bundle-version="[2.0.200,3.0.0)";visibility:=reexport
+Import-Package: org.eclipse.jem.internal.proxy.common;resolution:=optional
+Bundle-Description: %Bundle-Description.0
diff --git a/plugins/org.eclipse.jem.ui/about.html b/plugins/org.eclipse.jem.beaninfo.vm/about.html
similarity index 100%
rename from plugins/org.eclipse.jem.ui/about.html
rename to plugins/org.eclipse.jem.beaninfo.vm/about.html
diff --git a/plugins/org.eclipse.jem.ui/build.properties b/plugins/org.eclipse.jem.beaninfo.vm/build.properties
similarity index 71%
copy from plugins/org.eclipse.jem.ui/build.properties
copy to plugins/org.eclipse.jem.beaninfo.vm/build.properties
index b96ba1e..35f8228 100644
--- a/plugins/org.eclipse.jem.ui/build.properties
+++ b/plugins/org.eclipse.jem.beaninfo.vm/build.properties
@@ -1,22 +1,19 @@
###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
+# Copyright (c) 2003, 2008 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.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,\
- plugin.properties,\
- icons/,\
+src.excludes = **/.cvsignore
+bin.includes = plugin.properties,\
about.html,\
- .options,\
META-INF/,\
.
src.includes = about.html
+source.. = vm_beaninfovm/
output.. = bin/
-source.. = ui/,\
- beaninfoui/
-jars.compile.order = .
+
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/plugin.properties b/plugins/org.eclipse.jem.beaninfo.vm/plugin.properties
new file mode 100644
index 0000000..3ee10c4
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/plugin.properties
@@ -0,0 +1,4 @@
+#Properties file for org.eclipse.jem.beaninfo.vm
+Bundle-Name.0 = JEM Beaninfo VM Jar
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Description.0 = This bundle is used only as a jar by the org.eclipse.jem.beaninfo bundle, so it should never be "pre-req'd" by others, only by o.e.jem.beaninfo. Extenders would use only that o.e.jem.beaninfo bundle.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
new file mode 100644
index 0000000..b51b630
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
@@ -0,0 +1,850 @@
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+package org.eclipse.jem.beaninfo.vm;
+
+/*
+
+
+ */
+
+import java.awt.Image;
+import java.beans.*;
+import java.lang.reflect.*;
+
+import org.eclipse.jem.beaninfo.common.IBaseBeanInfoConstants;
+
+
+/**
+ * A BaseBeanInfo that provides common support for BeanInfos within the JEM environment.
+ *
+ * @since 1.1.0
+ */
+public abstract class BaseBeanInfo extends SimpleBeanInfo implements IBaseBeanInfoConstants {
+
+ // Constants to use to create all descriptors etc.
+ protected static java.util.ResourceBundle RESBUNDLE = java.util.ResourceBundle.getBundle("org.eclipse.jem.beaninfo.vm.beaninfo"); //$NON-NLS-1$
+
+ /**
+ * Bound indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String BOUND = "bound";//$NON-NLS-1$
+
+ /**
+ * Constrained indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String CONSTRAINED = "constrained";//$NON-NLS-1$
+
+ /**
+ * Property editor class indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String PROPERTYEDITORCLASS = "propertyEditorClass";//$NON-NLS-1$
+
+ /**
+ * Read Method indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String READMETHOD = "readMethod";//$NON-NLS-1$
+
+ /**
+ * Write method indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String WRITEMETHOD = "writeMethod";//$NON-NLS-1$
+
+ /**
+ * Displayname indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String DISPLAYNAME = "displayName";//$NON-NLS-1$
+
+ /**
+ * Expert indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String EXPERT = "expert";//$NON-NLS-1$
+
+ /**
+ * Hidden indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String HIDDEN = "hidden";//$NON-NLS-1$
+
+ /**
+ * Preferred indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String PREFERRED = "preferred";//$NON-NLS-1$
+
+ /**
+ * Short description indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String SHORTDESCRIPTION = "shortDescription";//$NON-NLS-1$
+
+ /**
+ * Customizer class indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String CUSTOMIZERCLASS = "customizerClass";//$NON-NLS-1$
+
+ /**
+ * In Default eventset indicator for apply property arguments.
+ *
+ * @since 1.1.0
+ */
+ public static final String INDEFAULTEVENTSET = "inDefaultEventSet";//$NON-NLS-1$
+
+ /**
+ * This is a Feature Attribute Key. When this key exists, the value is a java.lang.reflect.Field. It means this property
+ * is a field and not a getter/setter. The getter/setter will be ignored and the property type will be the type of the field.
+ * <p>
+ * At this time, do not use field on an indexed property. This is currently an undefined situation.
+ *
+ * @since 1.1.0
+ */
+ public static final String FIELDPROPERTY = "field"; //$NON-NLS-1$
+
+ /**
+ * Obscure indicator for apply property arguments. Obsure is a pre-defined attribute name too. That is where the obscure setting is stored.
+ * <p>
+ * Obsure means most users don't need it. In the future such features won't even be cached so as to reduce the in-memory costs. Currently this
+ * flag is ignored.
+ *
+ * @since 1.1.0
+ */
+ public static final String OBSCURE = "ivjObscure";//$NON-NLS-1$
+
+ /**
+ * Design time indicator for apply property arguments. Design time is a pre-defined attribute name too. That is where the design time setting is
+ * stored.
+ * <p>
+ * Design time means:
+ * <ul>
+ * <li>Not set: Will be a property that can be connected to, and shows on property sheet (if not hidden).
+ * <li><code>true</code>: Special property (it will show on property sheet if not hidden), but it can't be connected to. Usually this is a
+ * property that is fluffed up for the IDE purposes but doesn't have a get/set method. This means it is a property for design time and not for
+ * runtime.
+ * <li><code>false</code>: This property will not show up on property sheet but it can be connected to.
+ * </ul>
+ *
+ * @since 1.1.0
+ */
+ public static final String DESIGNTIMEPROPERTY = "ivjDesignTimeProperty"; //$NON-NLS-1$
+
+ /**
+ * EventAdapterClass indicator for apply property arguments. Event adapter class is a pre-defined attribute name too. That is where the event
+ * adapter is stored.
+ * <p>
+ * Adapter class for eventSetDescriptors that provide default no-op implementation of the interface methods. For example
+ * <code>java.awt.event.WindowListener</code> has an adapter of <code>java.awt.event.WindowAdapter</code>. What is stored is actually the
+ * class name, not the class itself.
+ *
+ * @since 1.1.0
+ */
+ public static final String EVENTADAPTERCLASS = "eventAdapterClass"; //$NON-NLS-1$
+
+
+ public static final boolean JVM_1_3 = System.getProperty("java.version", "").startsWith("1.3"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+ /**
+ * Empty args list for those descriptors that don't have arguments.
+ * @since 1.1.0
+ */
+ public static final Object[] EMPTY_ARGS = new Object[0];
+
+ /**
+ * Capitalize the string. This uppercases only the first character. So if you have property name of "abc" it will become "Abc".
+ *
+ * @param s
+ * @return string with first letter capitalized.
+ *
+ * @since 1.1.0
+ */
+ public static String capitalize(String s) {
+ if (s.length() == 0) { return s; }
+ char chars[] = s.toCharArray();
+ chars[0] = Character.toUpperCase(chars[0]);
+ return new String(chars);
+ }
+
+ /**
+ * Create a BeanDescriptor object given an array of keyword/value arguments. Use the keywords defined in this class, e.g. BOUND, EXPERT, etc.
+ *
+ * @param cls
+ * bean for which the bean descriptor is being created.
+ * @param args
+ * arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
+ * @return new bean descriptor
+ *
+ * @since 1.1.0
+ */
+ public static BeanDescriptor createBeanDescriptor(Class cls, Object[] args) {
+ Class customizerClass = null;
+
+ if (args != null) {
+ /* Find the specified customizerClass */
+ for (int i = 0; i < args.length; i += 2) {
+ if (CUSTOMIZERCLASS.equals(args[i])) {
+ customizerClass = (Class) args[i + 1];
+ break;
+ }
+ }
+ }
+
+ BeanDescriptor bd = new BeanDescriptor(cls, customizerClass);
+
+ if (args != null) {
+ for (int i = 0; i < args.length; i += 2) {
+ String key = (String) args[i];
+ Object value = args[i + 1];
+ setFeatureDescriptorValue(bd, key, value);
+ }
+ }
+ return bd;
+ }
+
+ /**
+ * Create a beans EventSetDescriptor given the following:
+ *
+ * @param cls
+ * The bean class
+ * @param name
+ * Name of event set
+ * @param args
+ * arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args.
+ * @param lmds
+ * array of MethodDescriptors defining the listener methods
+ * @param listenerType
+ * type of listener
+ * @param addListenerName
+ * add listener method name
+ * @param removeListenerNameremove
+ * listener method name
+ * @return new event set descriptor
+ * @since 1.1.0
+ */
+ public static EventSetDescriptor createEventSetDescriptor(Class cls, String name, Object[] args, MethodDescriptor[] lmds, Class listenerType,
+ String addListenerName, String removeListenerName) {
+ EventSetDescriptor esd = null;
+ Class[] paramTypes = { listenerType};
+ try {
+ java.lang.reflect.Method addMethod = null;
+ java.lang.reflect.Method removeMethod = null;
+ try {
+ /* get addListenerMethod with parameter types. */
+ addMethod = cls.getMethod(addListenerName, paramTypes);
+ } catch (Exception ie) {
+ throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
+ new Object[] { addListenerName}));
+ }
+ ;
+ try {
+ /* get removeListenerMethod with parameter types. */
+ removeMethod = cls.getMethod(removeListenerName, paramTypes);
+ } catch (Exception ie) {
+ throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
+ new Object[] { removeListenerName}));
+ }
+ ;
+
+ esd = new EventSetDescriptor(name, listenerType, lmds, addMethod, removeMethod);
+ } catch (Exception ie) {
+ throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_E1_EXC_"), //$NON-NLS-1$
+ new Object[] { name}));
+ }
+ ;
+ if (args != null) {
+ // set the event set descriptor properties
+ for (int i = 0; i < args.length; i += 2) {
+ String key = (String) args[i];
+ Object value = args[i + 1];
+ if (INDEFAULTEVENTSET.equals(key)) {
+ esd.setInDefaultEventSet(((Boolean) value).booleanValue());
+ } else
+ setFeatureDescriptorValue(esd, key, value);
+ }
+ }
+ return esd;
+ }
+
+ /**
+ * Create a bean's MethodDescriptor.
+ *
+ * @param cls
+ * class of the method.
+ * @param name
+ * name of the method.
+ * @param args
+ * arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
+ * @param params
+ * parameter descriptors or <code>null</code> if no parameter descriptors.
+ * @param paramTypes
+ * parameter types
+ * @return new method descriptor
+ *
+ * @since 1.1.0
+ */
+ public static MethodDescriptor createMethodDescriptor(Class cls, String name, Object[] args, ParameterDescriptor[] params, Class[] paramTypes) {
+ MethodDescriptor md = null;
+ try {
+ java.lang.reflect.Method aMethod = null;
+ try {
+ /* getMethod with parameter types. */
+ aMethod = cls.getMethod(name, paramTypes);
+ } catch (Exception ie) {
+ throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
+ new Object[] { name}));
+ }
+ ;
+ if (params != null && params.length > 0)
+ md = new MethodDescriptor(aMethod, params);
+ else
+ md = new MethodDescriptor(aMethod);
+ } catch (Exception ie) {
+ throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_Method_EXC_"), //$NON-NLS-1$
+ new Object[] { name}));
+ }
+ ;
+ if (args != null) {
+ // set the method properties
+ for (int i = 0; i < args.length; i += 2) {
+ String key = (String) args[i];
+ Object value = args[i + 1];
+ setFeatureDescriptorValue(md, key, value);
+ }
+ }
+ return md;
+ }
+
+ private static PropertyDescriptor createOtherPropertyDescriptor(String name, Class cls) throws IntrospectionException {
+ Method readMethod = null;
+ Method writeMethod = null;
+ String base = capitalize(name);
+ Class[] parameters = new Class[0];
+
+ // First we try boolean accessor pattern
+ try {
+ readMethod = cls.getMethod("is" + base, parameters);//$NON-NLS-1$
+ } catch (Exception ex1) {
+ }
+ if (readMethod == null) {
+ try {
+ // Else we try the get accessor pattern.
+ readMethod = cls.getMethod("get" + base, parameters);//$NON-NLS-1$
+ } catch (Exception ex2) {
+ // Find by matching methods of the class
+ readMethod = findMethod(cls, "get" + base, 0);//$NON-NLS-1$
+ }
+ }
+
+ if (readMethod == null) {
+ // For write-only properties, find the write method
+ writeMethod = findMethod(cls, "set" + base, 1);//$NON-NLS-1$
+ } else {
+ // In Sun's code, reflection fails if there are two
+ // setters with the same name and the first setter located
+ // does not have the same return type of the getter.
+ // This fixes that.
+ parameters = new Class[1];
+ parameters[0] = readMethod.getReturnType();
+ try {
+ writeMethod = cls.getMethod("set" + base, parameters);//$NON-NLS-1$
+ } catch (Exception ex3) {
+ }
+ }
+ // create the property descriptor
+ if ((readMethod != null) || (writeMethod != null)) {
+ return new PropertyDescriptor(name, readMethod, writeMethod);
+ } else {
+ throw new IntrospectionException(java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_find_the_acc1_EXC_"), //$NON-NLS-1$
+ new Object[] { name}));
+ }
+ }
+
+ /**
+ * Create a beans parameter descriptor.
+ *
+ * @param name
+ * name of parameter
+ * @param args
+ * arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
+ * @return new parameter descriptor
+ *
+ * @since 1.1.0
+ */
+ public static ParameterDescriptor createParameterDescriptor(String name, Object[] args) {
+ ParameterDescriptor pd = null;
+ try {
+ pd = new ParameterDescriptor();
+ } catch (Exception ie) {
+ throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_Param1_EXC_"), //$NON-NLS-1$
+ new Object[] { name}));
+ }
+ ;
+ // set the name
+ pd.setName(name);
+ if (args != null) {
+ // set the method properties
+ for (int i = 0; i < args.length; i += 2) {
+ String key = (String) args[i];
+ Object value = args[i + 1];
+ setFeatureDescriptorValue(pd, key, value);
+ }
+ }
+ return pd;
+ }
+
+ private static Method GETCLASS;
+
+ static {
+ try {
+ GETCLASS = Object.class.getMethod("getClass", (Class[]) null); //$NON-NLS-1$
+ } catch (SecurityException e) {
+ } catch (NoSuchMethodException e) {
+ }
+ }
+ /**
+ * Create a property descriptor describing a field property.
+ * <p>
+ * Note: This is non-standard. The VE knows how to handle this, but any one else using BeanInfo will see this as a property with
+ * no getter or setter.
+ * @param name
+ * @param field
+ * @param args arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
+ * @return
+ *
+ * @since 1.1.0
+ */
+ public static PropertyDescriptor createFieldPropertyDescriptor(String name, Field field, Object[] args) {
+ try {
+ PropertyDescriptor pd = new PropertyDescriptor(name, null, null);
+ pd.setValue(FIELDPROPERTY, field); // Set the field property so we know it is a field.
+ applyFieldArguments(pd, args);
+ // Need to set in a phony read method because Introspector will throw it away otherwise. We just use Object.getClass for this.
+ // We will ignore the property type for fields. If used outside of VE then it will look like a class property.
+ pd.setReadMethod(GETCLASS);
+ return pd;
+ } catch (IntrospectionException e) {
+ throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
+ new Object[] { name}));
+ return null;
+ }
+ }
+
+ /**
+ * Create a bean's property descriptor.
+ *
+ * @param cls
+ * class of who owns the property (usually the bean). It is used to look up get/set methods for the property.
+ * @param name
+ * name of the property. It will use get{Name} and set{Name} to find get/set methods.
+ * @param args
+ * arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc.
+ * @return new property descriptor
+ *
+ * @since 1.1.0
+ */
+ public static PropertyDescriptor createPropertyDescriptor(Class cls, String name, Object[] args) {
+ PropertyDescriptor pd = null;
+ try {
+ // Create assuming that the getter/setter follows reflection patterns
+ pd = new PropertyDescriptor(name, cls);
+ } catch (IntrospectionException e) {
+ // Try creating a property descriptor for read-only, write-only
+ // or if Sun's reflection fails
+ try {
+ pd = createOtherPropertyDescriptor(name, cls);
+ } catch (IntrospectionException ie) {
+ throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
+ new Object[] { name}));
+ }
+ }
+
+ applyPropertyArguments(pd, args, cls);
+
+ return pd;
+ }
+
+
+ /**
+ * Create a new PropertyDescriptor based upon the PD sent in. It will clone the sent in one, and apply the args to override any specific setting.
+ * Class cls is used for finding read/write methods, if any.
+ *
+ * This is used when wanting to override only a few specific settings from a property descriptor from the super class.
+ *
+ * @param fromPDS
+ * The PropertyDescriptor array to find the entry to clone. It will be changed in place in the array.
+ * @param name
+ * The name of the property to find and clone and override.
+ * @param cls
+ * The class to use to find read/write methods in args. If no read/write methods specified, then this may be null.
+ * @param args
+ * The arguments to override from fromPD. arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if none to override
+ */
+ public void replacePropertyDescriptor(PropertyDescriptor[] pds, String name, Class cls, Object[] args) {
+ PropertyDescriptor pd = null;
+ int iPD = findPropertyDescriptor(pds, name);
+ if (iPD == -1)
+ return;
+ PropertyDescriptor fromPD = pds[iPD];
+ try {
+
+ pd = pds[iPD] = new PropertyDescriptor(fromPD.getName(), null, null);
+ } catch (IntrospectionException e) {
+ throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
+ new Object[] { fromPD.getName()}));
+ }
+
+ // Now copy over the contents of fromPD.
+ clonePropertySettings(fromPD, pd);
+
+ // Now apply the overrides
+ applyPropertyArguments(pd, args, cls);
+ return;
+ }
+
+ private void clonePropertySettings(PropertyDescriptor fromPD, PropertyDescriptor pd) {
+ try {
+ pd.setReadMethod(fromPD.getReadMethod());
+ pd.setWriteMethod(fromPD.getWriteMethod());
+ pd.setPropertyEditorClass(fromPD.getPropertyEditorClass());
+ pd.setBound(fromPD.isBound());
+ pd.setConstrained(fromPD.isConstrained());
+ cloneFeatureSettings(fromPD, pd);
+ } catch (IntrospectionException e) {
+ throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
+ new Object[] { fromPD.getName()}));
+ }
+ }
+
+ private void cloneFeatureSettings(FeatureDescriptor fromFD, FeatureDescriptor fd) {
+ fd.setExpert(fromFD.isExpert());
+ fd.setHidden(fromFD.isHidden());
+ fd.setPreferred(fromFD.isPreferred());
+ fd.setShortDescription(fromFD.getShortDescription());
+ fd.setDisplayName(fromFD.getDisplayName());
+
+ java.util.Enumeration keys = fromFD.attributeNames();
+ while (keys.hasMoreElements()) {
+ String key = (String) keys.nextElement();
+ Object value = fromFD.getValue(key);
+ fd.setValue(key, value);
+ }
+ }
+
+ /*
+ * The common property arguments between field and standard properties.
+ */
+ private static boolean applyCommonPropertyArguments(PropertyDescriptor pd, String key, Object value) {
+ if (BOUND.equals(key)) {
+ pd.setBound(((Boolean) value).booleanValue());
+ } else if (CONSTRAINED.equals(key)) {
+ pd.setConstrained(((Boolean) value).booleanValue());
+ } else if (PROPERTYEDITORCLASS.equals(key)) {
+ pd.setPropertyEditorClass((Class) value);
+ } else if (FIELDPROPERTY.equals(key))
+ return true; // This should not be applied except through createFieldProperty.
+ else
+ return false;
+ return true;
+
+ }
+
+ private static void applyPropertyArguments(PropertyDescriptor pd, Object[] args, Class cls) {
+ if (args != null) {
+ for (int i = 0; i < args.length; i += 2) {
+ String key = (String) args[i];
+ Object value = args[i + 1];
+
+ if (!applyCommonPropertyArguments(pd, key, value)) {
+ if (READMETHOD.equals(key)) {
+ String methodName = (String) value;
+ Method method;
+ try {
+ method = cls.getMethod(methodName, new Class[0]);
+ pd.setReadMethod(method);
+ } catch (Exception e) {
+ throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("{0}_no_read_method_EXC_"), //$NON-NLS-1$
+ new Object[] { cls, methodName}));
+ }
+ } else if (WRITEMETHOD.equals(key)) {
+ String methodName = (String) value;
+ try {
+ if (methodName == null) {
+ pd.setWriteMethod(null);
+ } else {
+ Method method;
+ Class type = pd.getPropertyType();
+ method = cls.getMethod(methodName, new Class[] { type});
+ pd.setWriteMethod(method);
+ }
+ } catch (Exception e) {
+ throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("{0}_no_write_method_EXC_"), //$NON-NLS-1$
+ new Object[] { cls, methodName}));
+ }
+ } else {
+ // arbitrary value
+ setFeatureDescriptorValue(pd, key, value);
+ }
+ }
+ }
+ }
+ }
+
+ private static void applyFieldArguments(PropertyDescriptor pd, Object[] args) {
+ if (args != null) {
+ for (int i = 0; i < args.length; i += 2) {
+ String key = (String) args[i];
+ Object value = args[i + 1];
+
+ if (!applyCommonPropertyArguments(pd, key, value)) {
+ if (READMETHOD.equals(key)) {
+ // ignored for field.
+ } else if (WRITEMETHOD.equals(key)) {
+ // ignored for field.
+ } else {
+ // arbitrary value
+ setFeatureDescriptorValue(pd, key, value);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Find the method by comparing (name & parameter size) against the methods in the class. This is an expensive call and should be used only if
+ * getMethod with specific parameter types can't find method.
+ *
+ * @return java.lang.reflect.Method
+ * @param aClass
+ * java.lang.Class
+ * @param methodName
+ * java.lang.String
+ * @param parameterCount
+ * int
+ */
+ public static java.lang.reflect.Method findMethod(java.lang.Class aClass, java.lang.String methodName, int parameterCount) {
+ try {
+ /*
+ * Since this method attempts to find a method by getting all methods from the class, this method should only be called if getMethod
+ * cannot find the method.
+ */
+ java.lang.reflect.Method methods[] = aClass.getMethods();
+ for (int index = 0; index < methods.length; index++) {
+ java.lang.reflect.Method method = methods[index];
+ if ((method.getParameterTypes().length == parameterCount) && (method.getName().equals(methodName))) { return method; }
+ ;
+ }
+ ;
+ } catch (java.lang.Throwable exception) {
+ return null;
+ }
+ ;
+ return null;
+ }
+
+ /**
+ * Find a property descriptor of a given name in the list.
+ *
+ * @param pds
+ * The array of property descriptors to search, may be null.
+ * @param name
+ * The name to search for.
+ * @return The found property descriptor index, or -1 if not found.
+ */
+ public static int findPropertyDescriptor(PropertyDescriptor[] pds, String name) {
+ for (int i = 0; i < pds.length; i++) {
+ if (name.equals(pds[i].getName()))
+ return i;
+ }
+ return -1;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.beans.BeanInfo#getDefaultEventIndex()
+ */
+ public int getDefaultEventIndex() {
+ return -1;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.beans.BeanInfo#getDefaultPropertyIndex()
+ */
+ public int getDefaultPropertyIndex() {
+ return -1;
+ }
+
+
+ /* (non-Javadoc)
+ * @see java.beans.SimpleBeanInfo#getBeanDescriptor()
+ */
+ public BeanDescriptor getBeanDescriptor() {
+ // Default is to create an empty one.
+ return createBeanDescriptor(getBeanClass(), EMPTY_ARGS);
+ }
+
+ /**
+ * Implementation for BeanInfo. This implementation will return the BeanInfo of the superclass.
+ *
+ * @see BeanInfo#getAdditionalBeanInfo()
+ * @since 1.1.0
+ */
+ public BeanInfo[] getAdditionalBeanInfo() {
+ try {
+ BeanInfo[] result = new BeanInfo[] { Introspector.getBeanInfo(getBeanClass().getSuperclass())};
+ PropertyDescriptor[] oPDs = result[0].getPropertyDescriptors();
+ PropertyDescriptor[] nPDs = overridePropertyDescriptors(oPDs);
+ if (oPDs != nPDs)
+ result[0] = new OverridePDBeanInfo(result[0], nPDs);
+ return result;
+ } catch (IntrospectionException e) {
+ return new BeanInfo[0];
+ }
+ }
+
+ private static class OverridePDBeanInfo implements BeanInfo {
+
+ private BeanInfo originalBeanInfo;
+
+ private PropertyDescriptor[] overridePDs;
+
+ public OverridePDBeanInfo(BeanInfo bi, PropertyDescriptor[] pds) {
+ originalBeanInfo = bi;
+ overridePDs = pds;
+ }
+
+ public BeanInfo[] getAdditionalBeanInfo() {
+ return originalBeanInfo.getAdditionalBeanInfo();
+ }
+
+ public BeanDescriptor getBeanDescriptor() {
+ return originalBeanInfo.getBeanDescriptor();
+ }
+
+ public int getDefaultEventIndex() {
+ return originalBeanInfo.getDefaultEventIndex();
+ }
+
+ public int getDefaultPropertyIndex() {
+ return originalBeanInfo.getDefaultPropertyIndex();
+ }
+
+ public EventSetDescriptor[] getEventSetDescriptors() {
+ return originalBeanInfo.getEventSetDescriptors();
+ }
+
+ public Image getIcon(int iconKind) {
+ return originalBeanInfo.getIcon(iconKind);
+ }
+
+ public MethodDescriptor[] getMethodDescriptors() {
+ return originalBeanInfo.getMethodDescriptors();
+ }
+
+ public PropertyDescriptor[] getPropertyDescriptors() {
+ return overridePDs;
+ }
+ }
+
+ /**
+ * Allow overrides to parent beaninfo. Subclasses should override this method if they wish to override and change any inherited properties. This
+ * allows removal of inherited properties or changes of specific properties (such as change from hidden to not hidden).
+ *
+ * Note: If there any changes, this must return a DIFFERENT array. If it returns the same array, then the changes will not be accepted. If just
+ * overriding, should use pds.clone() to get the new array and then change the specific entries.
+ *
+ * @param pds
+ * @return The new changed array or the same array if no changes.
+ * @since 1.1.0
+ */
+ protected PropertyDescriptor[] overridePropertyDescriptors(PropertyDescriptor[] pds) {
+ return pds;
+ }
+
+ /**
+ * Get the bean class this beaninfo is for. Used by subclasses to quickly get the bean class without having to code it over and over.
+ *
+ * @return bean class for this beaninfo.
+ *
+ * @since 1.1.0
+ */
+ public abstract Class getBeanClass();
+
+ /**
+ * Called whenever the bean information class throws an exception. By default it prints a message and then a stacktrace to sys err.
+ *
+ * @param exception
+ * java.lang.Throwable
+ * @since 1.1.0
+ */
+ public void handleException(Throwable exception) {
+ System.err.println(RESBUNDLE.getString("UNCAUGHT_EXC_")); //$NON-NLS-1$
+ exception.printStackTrace();
+ }
+
+ private static void setFeatureDescriptorValue(FeatureDescriptor fd, String key, Object value) {
+ if (DISPLAYNAME.equals(key)) {
+ fd.setDisplayName((String) value);
+ } else if (EXPERT.equals(key)) {
+ fd.setExpert(((Boolean) value).booleanValue());
+ } else if (HIDDEN.equals(key)) {
+ fd.setHidden(((Boolean) value).booleanValue());
+ } else if (PREFERRED.equals(key)) {
+ fd.setPreferred(((Boolean) value).booleanValue());
+ if (JVM_1_3) {
+ // Bug in 1.3 doesn't preserve the preferred flag, so we will put it into the attributes too.
+ fd.setValue(PREFERRED, value);
+ }
+ } else if (SHORTDESCRIPTION.equals(key)) {
+ fd.setShortDescription((String) value);
+ }
+ // Otherwise assume an arbitrary-named value
+ // Assume that the FeatureDescriptor private hashTable\
+ // contains only arbitrary-named attributes
+ else {
+ fd.setValue(key, value);
+ }
+ }
+
+ /**
+ * Fatal errors are handled by calling this method. By default it throws an Error exception.
+ *
+ * @param e
+ * exception exception message placed into the new Error thrown.
+ * @param s
+ * message added to exception message. <code>null</code> if nothing to add.
+ *
+ * @throws Error
+ * turns exception into an Error.
+ * @since 1.1.0
+ */
+ protected static void throwError(Exception e, String s) {
+ throw new Error(e.toString() + " " + s);//$NON-NLS-1$
+ }
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
new file mode 100644
index 0000000..5a2a5a9
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
@@ -0,0 +1,31 @@
+###############################################################################
+# Copyright (c) 2003, 2005 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.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: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties,v $
+# $Revision: 1.1 $ $Date: 2008/11/26 06:40:21 $
+#
+
+
+#
+# Properties for the IvjBeanInfo
+#
+
+#
+# IvjBeanInfo Strings
+#
+Cannot_get_the_meth1_EXC_ = IWAV0011E Cannot get the method {0}.
+Cannot_create_the_E1_EXC_ = IWAV0012E Cannot create the EventSetDescriptor for {0}.
+Cannot_create_Method_EXC_ = IWAV0013E Cannot create the MethodDescriptor for {0}.
+Cannot_find_the_acc1_EXC_ = IWAV0014E Cannot find at least the write or read accessor for property {0}.
+Cannot_create_Param1_EXC_ = IWAV0015E Cannot create the ParameterDescriptor for {0}.
+Cannot_create_the_P1 = Cannot create the PropertyDescriptor for {0}.
+{0}_no_read_method_EXC_ = IWAV0016E Class {0} doesn''t have the requested read accessor {1}.
+{0}_no_write_method_EXC_ = IWAV0017E Class {0} doesn''t have the requested write accessor {1}.
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
new file mode 100644
index 0000000..26e8ded
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
@@ -0,0 +1,32 @@
+###############################################################################
+# Copyright (c) 2003, 2005 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.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: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties,v $
+# $Revision: 1.1 $ $Date: 2008/11/26 06:40:21 $
+#
+
+
+#
+# Properties for the VCE Beaninfo
+#
+
+#
+# IvjBeanInfo Strings
+#
+Cannot_get_the_meth1_EXC_ = IWAV0007E Cannot get the method {0}.
+Cannot_create_the_E1_EXC_ = IWAV0008E Cannot create the EventSetDescriptor for {0}.
+Cannot_create_Method_EXC_ = IWAV0009E Cannot create the MethodDescriptor for {0}.
+Cannot_find_the_acc1_EXC_ = IWAV0010E Cannot find at least the write or read accessor for property {0}.
+Cannot_create_Param1_EXC_ = IWAV0146E Cannot create the ParameterDescriptor for {0}.
+Cannot_create_the_P1_EXC_ = IWAV0147E Cannot create the PropertyDescriptor for {0}.
+{0}_no_read_method_EXC_ = IWAV0148E Class {0} doesn''t have the requested read accessor {1}.
+{0}_no_write_method_EXC_ = IWAV0149E Class {0} doesn''t have the requested write accessor {1}.
+UNCAUGHT_EXC_ = IWAV0123E --------- UNCAUGHT EXCEPTION ---------
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
new file mode 100644
index 0000000..3c99de2
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.vm;
+/*
+
+
+ */
+
+import java.beans.*;
+/**
+ * Equality tester for BeanDescriptors
+ */
+public class BeanDescriptorEquality extends FeatureDescriptorEquality {
+ static void INIT() {
+ try {
+ MAP_EQUALITY.put(BeanDescriptor.class, (BeanDescriptorEquality.class).getConstructor(new Class[] {BeanDescriptor.class}));
+ } catch (NoSuchMethodException e) {
+ }
+ }
+
+ /**
+ * Constructor for BeanDescriptorEquality.
+ */
+ public BeanDescriptorEquality() {
+ super();
+ }
+
+
+ public BeanDescriptorEquality(BeanDescriptor descr) {
+ super(descr);
+ }
+
+ /**
+ * Calculate the hashcode for the current feature, add this
+ * to the hashcode received from super.calculateHashCode
+ * and return the new value.
+ *
+ * NOTE: for subclasses, it is MANDITORY that the first line be:
+ * int hashcode = super.calculateHashCode();
+ * and the last line be:
+ * return hashcode*31 + (your calculated hashcode for just this subclass);
+ */
+ protected int calculateHashCode() {
+ int hashcode = super.calculateHashCode();
+ BeanDescriptor bd = (BeanDescriptor) fFeature;
+ int hc = bd.getBeanClass().hashCode();
+ if (bd.getCustomizerClass() != null)
+ hc += bd.getCustomizerClass().hashCode();
+
+ return hashcode*31 + hc;
+ }
+
+ public boolean equals(Object obj) {
+ if (identityTest(obj))
+ return true;
+ if (!super.equals(obj))
+ return false;
+
+ BeanDescriptor ob = (BeanDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
+ BeanDescriptor fb = (BeanDescriptor) fFeature;
+
+ if (ob.getBeanClass() != fb.getBeanClass())
+ return false;
+ if (ob.getCustomizerClass() != fb.getCustomizerClass())
+ return false;
+
+ return true;
+ }
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
new file mode 100644
index 0000000..b53aa8a
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
@@ -0,0 +1,145 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.vm;
+/*
+
+
+ */
+
+import java.beans.*;
+import java.util.*;
+import java.lang.reflect.Method;
+/**
+ * Equality tester for EventSetDescriptors
+ */
+public class EventSetDescriptorEquality extends FeatureDescriptorEquality {
+
+ static void INIT() {
+ try {
+ MAP_EQUALITY.put(EventSetDescriptor.class, (EventSetDescriptorEquality.class).getConstructor(new Class[] {EventSetDescriptor.class}));
+ } catch (NoSuchMethodException e) {
+ }
+ }
+
+ private ArrayList fListenerMethodDescriptors; // Array of MethodDescriptorEquality's.
+
+ /**
+ * Constructor for EventSetDescriptorEquality.
+ */
+ public EventSetDescriptorEquality() {
+ super();
+ }
+
+
+ public EventSetDescriptorEquality(EventSetDescriptor descr) {
+ super(descr);
+ }
+
+ /**
+ * A new feature is being set into this object,
+ * clear any cache members so that they can be reconstructed.
+ *
+ * NOTE: Subclasses - remember to call super.clearFeature();
+ */
+ protected void clearFeature() {
+ super.clearFeature();
+ fListenerMethodDescriptors = null;
+ }
+
+ protected ArrayList listenerMethodDescriptors() {
+ if (fListenerMethodDescriptors == null) {
+ MethodDescriptor[] mds = ((EventSetDescriptor) fFeature).getListenerMethodDescriptors();
+ fListenerMethodDescriptors = new ArrayList(mds.length);
+ for (int i=0; i<mds.length; i++)
+ fListenerMethodDescriptors.add(new MethodDescriptorEquality(mds[i]));
+ }
+ return fListenerMethodDescriptors;
+ }
+
+ /**
+ * Calculate the hashcode for the current feature, add this
+ * to the hashcode received from super.calculateHashCode
+ * and return the new value.
+ *
+ * NOTE: for subclasses, it is MANDITORY that the first line be:
+ * int hashcode = super.calculateHashCode();
+ * and the last line be:
+ * return hashcode*31 + (your calculated hashcode for just this subclass);
+ */
+ protected int calculateHashCode() {
+ int hashcode = super.calculateHashCode();
+ EventSetDescriptor bd = (EventSetDescriptor) fFeature;
+ int hc = bd.getAddListenerMethod().hashCode();
+ Method[] methods = bd.getListenerMethods();
+ int mhc = 0;
+ for (int i=0; i<methods.length; i++)
+ mhc = mhc*31 + methods[i].hashCode();
+ hc += mhc;
+ hc += listenerMethodDescriptors().hashCode();
+ hc += bd.getListenerType().hashCode();
+ hc += bd.getRemoveListenerMethod().hashCode();
+ hc += (bd.isInDefaultEventSet() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+ hc += (bd.isUnicast() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+
+ return hashcode*31 + hc;
+ }
+
+
+ public boolean equals(Object obj) {
+ if (identityTest(obj))
+ return true;
+
+ if (!super.equals(obj))
+ return false;
+
+ EventSetDescriptor oe = (EventSetDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
+ EventSetDescriptor fe = (EventSetDescriptor) fFeature;
+
+ EventSetDescriptorEquality oee = (EventSetDescriptorEquality) obj;
+
+ if (!oe.getAddListenerMethod().equals(fe.getAddListenerMethod()))
+ return false;
+ if (!java.util.Arrays.equals(oe.getListenerMethods(), fe.getListenerMethods()))
+ return false;
+ if (oe.getListenerType() != fe.getListenerType())
+ return false;
+ if (oe.getRemoveListenerMethod() != fe.getRemoveListenerMethod())
+ return false;
+ if (oe.isInDefaultEventSet() != fe.isInDefaultEventSet())
+ return false;
+ if (oe.isUnicast() != oe.isUnicast())
+ return false;
+
+ if (fListenerMethodDescriptors != null || oee.fListenerMethodDescriptors != null) {
+ // We are in a Map lookup situation, so one side has listener method equalities, so we will compare that way.
+ if (!oee.listenerMethodDescriptors().equals(listenerMethodDescriptors()))
+ return false;
+ } else {
+ // We are in the building the list phases, don't waste space building entire list.
+ MethodDescriptor[] ours = fe.getListenerMethodDescriptors();
+ MethodDescriptor[] theirs = oe.getListenerMethodDescriptors();
+ if (ours.length != theirs.length)
+ return false;
+ if (ours.length > 0) {
+ MethodDescriptorEquality workingOurs = new MethodDescriptorEquality();
+ MethodDescriptorEquality workingThiers = new MethodDescriptorEquality();
+ for (int i = 0; i < ours.length; i++) {
+ workingOurs.setFeature(ours[i]);
+ workingThiers.setFeature(theirs[i]);
+ if (!workingOurs.equals(workingThiers))
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
new file mode 100644
index 0000000..9888393
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
@@ -0,0 +1,201 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.vm;
+/*
+
+
+ */
+
+import java.beans.*;
+import java.util.*;
+import java.lang.reflect.*;
+/**
+ * This object is used to test for semantic equality (equals())
+ * between feature objects. It is needed because Feature's don't
+ * provide a semantic equality, only an identity equality. Need
+ * semantic equality so that keys in map can be found equal
+ * semantically.
+ */
+
+public class FeatureDescriptorEquality {
+ protected FeatureDescriptor fFeature;
+
+ private HashMap fValues; // The key/values for this feature. We grab them out
+ // so that we don't have to keep re-getting them for equality
+ // compares. This is done the first time needed in the equals
+ // statement.
+
+ private int fHashCode = 0; // Hashcode of this equality object. The hashcode for the feature is expensive
+ // so we will calculate it once (the assumption is that
+ // features once created aren't changed, which for our
+ // purposes here in beaninfo land is good).
+
+ protected static HashMap MAP_EQUALITY = new HashMap(10); // Map from descriptor to equality type.
+ static {
+ try {
+ MAP_EQUALITY.put(FeatureDescriptor.class, (FeatureDescriptorEquality.class).getConstructor(new Class[] {FeatureDescriptor.class}));
+ } catch (NoSuchMethodException e) {
+ }
+ // Need to set up the others.
+ BeanDescriptorEquality.INIT();
+ EventSetDescriptorEquality.INIT();
+ IndexedPropertyDescriptorEquality.INIT();
+ MethodDescriptorEquality.INIT();
+ ParameterDescriptorEquality.INIT();
+ }
+
+ /**
+ * Create the appropriate descriptor equality for this object.
+ */
+ public static FeatureDescriptorEquality createEquality(FeatureDescriptor descr) {
+ try {
+ return (FeatureDescriptorEquality) ((Constructor) MAP_EQUALITY.get(descr.getClass())).newInstance(new Object[] {descr});
+ } catch (IllegalAccessException e) {
+ } catch (InstantiationException e) {
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public FeatureDescriptorEquality() {
+ }
+
+ /**
+ * NOTE: Every subclass needs to implement an override for the methods:
+ * calculateHashCode
+ * equals
+ * clearFeature - if it has any cache values
+ */
+
+ public FeatureDescriptorEquality(FeatureDescriptor feature) {
+ setFeature(feature);
+ }
+
+ public final void setFeature(FeatureDescriptor feature) {
+ clearFeature();
+ fFeature = feature;
+ }
+
+ /**
+ * A new feature is being set into this object,
+ * clear any cache members so that they can be reconstructed.
+ *
+ * NOTE: Subclasses - remember to call super.clearFeature();
+ */
+ protected void clearFeature() {
+ fValues = null;
+ fHashCode = 0;
+ }
+
+ public final int hashCode() {
+ if (fHashCode == 0)
+ fHashCode = calculateHashCode();
+ return fHashCode;
+ }
+
+ protected final HashMap values() {
+ if (fValues == null) {
+ fValues = new HashMap(5);
+
+ Enumeration keys = fFeature.attributeNames();
+ while (keys.hasMoreElements()) {
+ String key = (String) keys.nextElement();
+ fValues.put(key, fFeature.getValue(key));
+ }
+ }
+ return fValues;
+ }
+
+ /**
+ * Calculate the hashcode for the current feature, add this
+ * to the hashcode received from super.calculateHashCode
+ * and return the new value.
+ *
+ * NOTE: for subclasses, it is MANDITORY that the first line be:
+ * int hashcode = super.calculateHashCode();
+ * and the last line be:
+ * return hashcode*31 + (your calculated hashcode for just this subclass);
+ */
+ protected int calculateHashCode() {
+ int hashcode = 0;
+ if (fFeature.getName() != null)
+ hashcode += fFeature.getName().hashCode();
+
+ if (fFeature.getDisplayName() != fFeature.getName())
+ hashcode += fFeature.getDisplayName().hashCode();
+ if (fFeature.getShortDescription() != fFeature.getDisplayName())
+ hashcode += fFeature.getShortDescription().hashCode();
+
+ hashcode += (fFeature.isExpert() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+ hashcode += (fFeature.isHidden() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+ hashcode += (fFeature.isPreferred() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+
+ hashcode += values().hashCode();
+ return hashcode;
+ }
+
+ /**
+ * equals: See if this is equal semantically.
+ *
+ * NOTE: Every subclass needs to implement this and
+ * the first few lines should be:
+ * if (identityTest())
+ * return true;
+ * if (!super.equals(obj))
+ * return false;
+ */
+
+ public boolean equals(Object obj) {
+ if (identityTest(obj))
+ return true;
+ if (!(obj instanceof FeatureDescriptorEquality))
+ return false;
+
+ FeatureDescriptorEquality ofe = (FeatureDescriptorEquality) obj;
+ FeatureDescriptor of = ofe.fFeature;
+
+ if (fFeature.getClass() != of.getClass())
+ return false;
+
+ if (!fFeature.getName().equals(of.getName()))
+ return false;
+ if (!fFeature.getDisplayName().equals(of.getDisplayName()))
+ return false;
+ if (!fFeature.getShortDescription().equals(of.getShortDescription()))
+ return false;
+ if (fFeature.isExpert() != of.isExpert() ||
+ fFeature.isHidden() != of.isHidden() ||
+ fFeature.isPreferred() != of.isPreferred())
+ return false;
+
+ if (!values().equals(ofe.values()))
+ return false;
+ return true;
+ }
+
+ /*
+ * Identity test: Tests for quick identity of
+ * descriptors. If this returns true, then
+ * no other tests required.
+ */
+ protected boolean identityTest(Object obj) {
+ if (!(obj instanceof FeatureDescriptorEquality))
+ return false;
+ if (this == obj)
+ return true;
+
+ if (((FeatureDescriptorEquality) obj).fFeature == fFeature)
+ return true;
+
+ return false;
+ }
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
new file mode 100644
index 0000000..42100e4
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.vm;
+/*
+
+
+ */
+
+import java.beans.*;
+/**
+ * IndexedPropertyDescriptor equality tester
+ */
+public class IndexedPropertyDescriptorEquality extends PropertyDescriptorEquality {
+
+ static void INIT() {
+ try {
+ MAP_EQUALITY.put(IndexedPropertyDescriptor.class, (IndexedPropertyDescriptorEquality.class).getConstructor(new Class[] {PropertyDescriptor.class}));
+ MAP_EQUALITY.put(PropertyDescriptor.class, (IndexedPropertyDescriptorEquality.class).getConstructor(new Class[] {PropertyDescriptor.class}));
+ } catch (NoSuchMethodException e) {
+ }
+ }
+
+ public IndexedPropertyDescriptorEquality() {
+ }
+
+ public IndexedPropertyDescriptorEquality(PropertyDescriptor descr) {
+ super(descr);
+ }
+ /**
+ * Calculate the hashcode for the current feature, add this
+ * to the hashcode received from super.calculateHashCode
+ * and return the new value.
+ *
+ * NOTE: for subclasses, it is MANDITORY that the first line be:
+ * int hashcode = super.calculateHashCode();
+ * and the last line be:
+ * return hashcode*31 + (your calculated hashcode for just this subclass);
+ */
+ protected int calculateHashCode() {
+ int hashcode = super.calculateHashCode();
+ if (fFeature instanceof IndexedPropertyDescriptor) {
+ IndexedPropertyDescriptor pd = (IndexedPropertyDescriptor) fFeature;
+
+ int hc = pd.getIndexedPropertyType().hashCode();
+
+ if (pd.getIndexedReadMethod() != null)
+ hc += pd.getIndexedReadMethod().hashCode();
+ if (pd.getIndexedWriteMethod() != null)
+ hc += pd.getIndexedWriteMethod().hashCode();
+ return hashcode*31 + hc;
+ } else
+ return hashcode;
+ }
+
+ public boolean equals(Object obj) {
+ if (!(obj instanceof FeatureDescriptorEquality))
+ return false;
+ if (identityTest(obj))
+ return true;
+ if (fFeature.getClass() != ((FeatureDescriptorEquality) obj).fFeature.getClass())
+ return false; // If they aren't both PropertyDesciptors or IndexedPropertyDescriptors, then they don't match.
+ if (!super.equals(obj))
+ return false;
+
+ if (fFeature instanceof IndexedPropertyDescriptor) {
+ IndexedPropertyDescriptor op = (IndexedPropertyDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
+ IndexedPropertyDescriptor fp = (IndexedPropertyDescriptor) fFeature;
+
+ if (op.getIndexedPropertyType() != fp.getIndexedPropertyType())
+ return false;
+ if (op.getIndexedReadMethod() != fp.getIndexedReadMethod())
+ return false;
+ if (op.getIndexedWriteMethod() != fp.getIndexedWriteMethod())
+ return false;
+ }
+
+ return true;
+ }
+
+
+
+
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
new file mode 100644
index 0000000..a56159c
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.vm;
+/*
+
+
+ */
+
+import java.beans.*;
+import java.util.*;
+/**
+ * Equality tester for MethodDescriptors
+ */
+public class MethodDescriptorEquality extends FeatureDescriptorEquality {
+
+ static void INIT() {
+ try {
+ MAP_EQUALITY.put(MethodDescriptor.class, (MethodDescriptorEquality.class).getConstructor(new Class[] {MethodDescriptor.class}));
+ } catch (NoSuchMethodException e) {
+ }
+ }
+
+ private ArrayList fParameterDescriptors; // Array of ParameterDescriptorEquality's.
+
+ public MethodDescriptorEquality() {
+ }
+
+ public MethodDescriptorEquality(MethodDescriptor descr) {
+ super(descr);
+ }
+
+ /**
+ * A new feature is being set into this object,
+ * clear any cache members so that they can be reconstructed.
+ *
+ * NOTE: Subclasses - remember to call super.clearFeature();
+ */
+ protected void clearFeature() {
+ super.clearFeature();
+ fParameterDescriptors = null;
+ }
+
+ protected ArrayList parameterDescriptors() {
+ if (fParameterDescriptors == null) {
+ ParameterDescriptor[] pds = ((MethodDescriptor) fFeature).getParameterDescriptors();
+ if (pds != null) {
+ fParameterDescriptors = new ArrayList(pds.length);
+ for (int i=0; i<pds.length; i++)
+ fParameterDescriptors.add(new ParameterDescriptorEquality(pds[i]));
+ }
+ }
+ return fParameterDescriptors;
+ }
+ /**
+ * Calculate the hashcode for the current feature, add this
+ * to the hashcode received from super.calculateHashCode
+ * and return the new value.
+ *
+ * NOTE: for subclasses, it is MANDITORY that the first line be:
+ * int hashcode = super.calculateHashCode();
+ * and the last line be:
+ * return hashcode*31 + (your calculated hashcode for just this subclass);
+ */
+ protected int calculateHashCode() {
+ int hashcode = super.calculateHashCode();
+ MethodDescriptor bd = (MethodDescriptor) fFeature;
+ int hc = bd.getMethod().hashCode();
+ if (parameterDescriptors() != null)
+ hc += parameterDescriptors().hashCode();
+
+ return hashcode*31 + hc;
+ }
+
+ public boolean equals(Object obj) {
+ if (identityTest(obj))
+ return true;
+
+ if (!super.equals(obj))
+ return false;
+
+ MethodDescriptorEquality oem = (MethodDescriptorEquality) obj;
+ MethodDescriptor om = (MethodDescriptor) oem.fFeature;
+ MethodDescriptor fm = (MethodDescriptor) fFeature;
+
+ if (fm.getMethod() != om.getMethod())
+ return false;
+
+ if (fParameterDescriptors != null || oem.fParameterDescriptors != null) {
+ // We are in a Map lookup situation, so one side has listener method equalities, so we will compare that way.
+ if (parameterDescriptors() == null)
+ if (((MethodDescriptorEquality) obj).parameterDescriptors() != null)
+ return false;
+ else ;
+ else
+ if (!parameterDescriptors().equals(((MethodDescriptorEquality) obj).parameterDescriptors()))
+ return false;
+ } else {
+ // We are in the building the list phases, don't waste space building entire list.
+ ParameterDescriptor[] ours = fm.getParameterDescriptors();
+ ParameterDescriptor[] theirs = om.getParameterDescriptors();
+ if (ours == theirs)
+ return true;
+ else if (ours == null)
+ if (theirs != null)
+ return false;
+ else
+ ;
+ else if (theirs == null)
+ return false;
+ else if (ours.length != theirs.length)
+ return false;
+ else if (ours.length > 0) {
+ ParameterDescriptorEquality workingOurs = new ParameterDescriptorEquality();
+ ParameterDescriptorEquality workingThiers = new ParameterDescriptorEquality();
+ for (int i = 0; i < ours.length; i++) {
+ workingOurs.setFeature(ours[i]);
+ workingThiers.setFeature(theirs[i]);
+ if (!workingOurs.equals(workingThiers))
+ return false;
+ }
+ }
+ }
+
+
+ return true;
+ }
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
new file mode 100644
index 0000000..1344589
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
@@ -0,0 +1,863 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.vm;
+
+/*
+
+
+ */
+
+import java.beans.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.*;
+import java.util.*;
+
+import org.eclipse.jem.beaninfo.common.IBaseBeanInfoConstants;
+import org.eclipse.jem.beaninfo.vm.BaseBeanInfo;
+import org.eclipse.jem.internal.beaninfo.common.*;
+import org.eclipse.jem.internal.proxy.common.*;
+
+/**
+ * This class is the beaninfo class that is created when beaninfo modeling introspects a bean. Its purpose is to gather together and analyze the
+ * beaninfo. For example, it checks with the supertype beaninfo to see if all of the supertype's descriptors are included in this list. If they are,
+ * then it knows that it does a straight inheritance of the supertype's descriptors, and those descriptors can be removed from the list. This makes it
+ * easier on the model side so that there isn't a great proliferation of descriptors all describing the same properties. In that case they can be
+ * merged from the supertype model. If some are not found, then that means this beaninfo is trying to hide some of them, and in that case this is the
+ * definitive list and inheritance shouldn't be used on the model side. However, for those features which are essentially the inherited feature (i.e.
+ * the BeanInfo simply filtered out some inherited but not all), they will be returnable (by name). The IDE side will take these that are "inherited"
+ * and will return the actual structured feature from the inherited class.
+ *
+ * The test for seeing if the super feature is included in the beaninfo is first to see if the the feature is in the beaninfo by name, if it is then
+ * it is marked as included. Then a check is made on equality, if they are equal, then the feature is removed from the beaninfo list, but the merge
+ * flag is still left on, and removed inherited feature is added to the list of inherited features. If all inherited features are found, this list is
+ * cleared and flag is set which simply says merge all inherited. This allows merging to occur but it also allows overrides to occur.
+ *
+ * Note: Test for identity is different between JDK 1.5 and above and below. 1.5 and above, we can use actual equals() because the same descriptor is
+ * returned from inherited features. In 1.3, clones were always returned and equals() would answer false, so we need to create a special equality
+ * descriptor which turns the equals() into one that can test clones for semantic equality. See Java Bug ID#4996673 The problem was supposed to be
+ * fixed in 1.4 but it was not fixed. Originally a new clone was created each time a beaninfo was requested. That is no longer done in 1.4, but the
+ * processing to create the original beaninfo does a clone accidently under the covers. Looking at 1.5 it looks this was fixed, but it hasn't been
+ * tested here yet.
+ */
+
+public abstract class ModelingBeanInfo implements ICallback {
+
+ private static boolean PRE15;
+ static {
+ String version = System.getProperty("java.version", ""); //$NON-NLS-1$ //$NON-NLS-2$
+ PRE15 = version.startsWith("1."); //$NON-NLS-1$
+ if (PRE15) {
+ // Continue to check, get the revision.
+ int revision = 0;
+ if (version.length() > 2) {
+ int revEnd = version.indexOf('.', 2);
+ revision = version.length() > 2 ? Integer.parseInt(revEnd != -1 ? version.substring(2, revEnd) : version.substring(2)) : 0;
+ PRE15 = revision < 5;
+ }
+ }
+ }
+
+ static class FeatureEqualitySet extends HashSet {
+
+ /**
+ * Comment for <code>serialVersionUID</code>
+ *
+ * @since 1.1.0
+ */
+ private static final long serialVersionUID = -3744776740604328324L;
+ private FeatureDescriptorEquality workingKey;
+
+ public FeatureEqualitySet(List features) {
+ super(features.size());
+ // Get first feature to fiqure out type of working key. This will not be reentrant.
+ workingKey = FeatureDescriptorEquality.createEquality((FeatureDescriptor) features.get(0));
+ this.addAll(features);
+ }
+
+ /**
+ * @see java.util.Collection#add(Object)
+ */
+ public boolean add(Object o) {
+ return super.add(FeatureDescriptorEquality.createEquality((FeatureDescriptor) o));
+ }
+
+ /**
+ * @see java.util.Collection#contains(Object)
+ */
+ public boolean contains(Object o) {
+ workingKey.setFeature((FeatureDescriptor) o);
+ return super.contains(workingKey);
+ }
+
+ }
+
+ // The following fields indicate if the super info should be merged
+ // in on the model side. no merge means there were no inherited methods at all. So the
+ // beaninfo presented is definitive. If merge, then get...Descriptors will return just
+ // the ones for this level, and getSuper...Descriptors will return the inherited ones.
+ // Though in this case, if the returned super list is null, then that means use ALL of
+ // the inherited ones.
+ // The super list returns simply the names, don't need to have the full descriptors in that case.
+ protected boolean fMergeInheritedEvents = false, fMergeInheritedMethods = false, fMergeInheritedProperties = false;
+
+ protected final BeanInfo fTargetBeanInfo; // The beaninfo being modeled.
+
+ // Local descriptors
+ protected EventSetDescriptor[] fEventSets;
+
+ protected MethodDescriptor[] fMethods;
+
+ protected PropertyDescriptor[] fProperties;
+
+ // Not inherited descriptor names, will be null if no merge or if merge all. This is list of names to NOT merge. It is usually shorter than the list to merge from super.
+
+ // Methods are special. You can have duplicates, so name is not sufficient.
+ // So for methods,
+ // will use an array of Strings where:
+ // For each one the full signature
+ // will be in the list, e.g. "name:methodName(argtype,..." where argtype is the fullyqualified
+ // classname (using "." notation for inner classes), and using format "java.lang.String[]" for
+ // arrays.
+ //
+ // This is because even if there are no duplicates, it will take less time/space to simply create the entries
+ // then it would to create a set to see if there are duplicates and then create the final array.
+ protected String[] fNotInheritedEventSets;
+
+ protected String[] fNotInheritedMethods;
+
+ protected String[] fNotInheritedProperties;
+
+ protected int doFlags;
+
+ /**
+ * Method used to do introspection and create the appropriate ModelingBeanInfo
+ *
+ * This will always introspect.
+ */
+ public static ModelingBeanInfo introspect(Class introspectClass, int doFlags) throws IntrospectionException {
+ return introspect(introspectClass, true, doFlags);
+ }
+
+ /**
+ * Method used to do introspection and create the appropriate ModelingBeanInfo
+ *
+ * introspectIfNoBeanInfo: If this is true, then if no explicit beaninfo was found for this class, then introspection will be done anyway. The
+ * Introspector will use reflection for local methods/events/properties of this class and then add in the results of the superclass introspection.
+ * If this parameter is false, then if the explicit beaninfo is not found, then no introspection will be done and null will be returned.
+ */
+ public static ModelingBeanInfo introspect(Class introspectClass, boolean introspectIfNoBeanInfo, int doFlags) throws IntrospectionException {
+ if (!Beans.isDesignTime())
+ Beans.setDesignTime(true); // Since this a jem beaninfo specific vm, we should also be considered design time.
+ if (!introspectIfNoBeanInfo) {
+ // Need to check if the beaninfo is explicitly supplied.
+ // If not, then we return null.
+ // The checks will be the same that Introspector will use.
+
+ boolean found = false;
+ // 1. Is there a BeanInfo class in the same package
+ if (!classExists(introspectClass.getName() + "BeanInfo", introspectClass)) { //$NON-NLS-1$
+ // 2. Is this class a BeanInfo class for itself.
+ if (!(BeanInfo.class).isAssignableFrom(introspectClass)) {
+ // 3. Can this class be found in the Beaninfo searchpath.
+ String[] searchPath = Introspector.getBeanInfoSearchPath();
+ int startClassname = introspectClass.getName().lastIndexOf(".") + 1; //$NON-NLS-1$
+ String biName = "." + introspectClass.getName().substring(startClassname) + "BeanInfo"; //$NON-NLS-1$ //$NON-NLS-2$
+ for (int i = 0; i < searchPath.length; i++) {
+ if (classExists(searchPath[i] + biName, introspectClass)) {
+ found = true;
+ break;
+ }
+ }
+ } else
+ found = true;
+ } else
+ found = true;
+
+ if (!found)
+ return null;
+ }
+
+ BeanInfo bInfo = Introspector.getBeanInfo(introspectClass);
+ Class superClass = introspectClass.getSuperclass();
+
+ if (superClass == null)
+ return PRE15 ? (ModelingBeanInfo) new ModelingBeanInfoPre15(bInfo, doFlags) : new ModelingBeanInfo15(bInfo, doFlags);
+ else
+ return PRE15 ? (ModelingBeanInfo) new ModelingBeanInfoPre15(bInfo, Introspector.getBeanInfo(superClass), doFlags) : new ModelingBeanInfo15(bInfo,
+ Introspector.getBeanInfo(superClass), doFlags);
+ }
+
+ /**
+ * See if this class exists, first in the class loader of the sent class, then in the system loader, then the bootstrap loader, and finally the
+ * current thread context class loader.
+ */
+ protected static boolean classExists(String className, Class fromClass) {
+ if (fromClass.getClassLoader() != null)
+ try {
+ fromClass.getClassLoader().loadClass(className);
+ return true;
+ } catch (ClassNotFoundException e) {
+ }
+ if (ClassLoader.getSystemClassLoader() != null)
+ try {
+ ClassLoader.getSystemClassLoader().loadClass(className);
+ return true;
+ } catch (ClassNotFoundException e) {
+ }
+ try {
+ Class.forName(className);
+ return true;
+ } catch (ClassNotFoundException e) {
+ }
+
+ try {
+ // Use the classloader from the current Thread.
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ cl.loadClass(className);
+ return true;
+ } catch (ClassNotFoundException e) {
+ }
+
+ return false;
+
+ }
+
+ /**
+ * Used only for Object since that is the only bean that doesn't have a superclass. Superclass beaninfo required for all other classes. If this is
+ * constructed then this means no merge and the list is definitive.
+ */
+ protected ModelingBeanInfo(BeanInfo beanInfo, int doFlags) {
+ fTargetBeanInfo = beanInfo;
+ this.doFlags = doFlags;
+ }
+
+ protected ModelingBeanInfo(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
+ this(beanInfo, doFlags);
+
+ // Now go through the beaninfo to determine the merge state.
+ // The default is no merge.
+
+ if ((doFlags & IBeanInfoIntrospectionConstants.DO_EVENTS) != 0) {
+ List full = addAll(beanInfo.getEventSetDescriptors());
+ List inherited = addAll(superBeanInfo.getEventSetDescriptors());
+
+ fMergeInheritedEvents = stripList(full, inherited);
+ if (fMergeInheritedEvents) {
+ if (!full.isEmpty())
+ fEventSets = (EventSetDescriptor[]) full.toArray(new EventSetDescriptor[full.size()]);
+ if (!inherited.isEmpty())
+ createEventArray(inherited); // This is actually a list of those NOT inherited.
+ }
+ }
+
+ if ((doFlags & IBeanInfoIntrospectionConstants.DO_METHODS) != 0) {
+ List full = addAll(beanInfo.getMethodDescriptors());
+ List inherited = addAll(superBeanInfo.getMethodDescriptors());
+
+ fMergeInheritedMethods = stripList(full, inherited);
+ if (fMergeInheritedMethods) {
+ if (!full.isEmpty())
+ fMethods = (MethodDescriptor[]) full.toArray(new MethodDescriptor[full.size()]);
+ if (!inherited.isEmpty())
+ createMethodEntries(inherited); // This is actually a list of those NOT inherited.
+ }
+ }
+
+ if ((doFlags & IBeanInfoIntrospectionConstants.DO_PROPERTIES) != 0) {
+ List full = addAll(beanInfo.getPropertyDescriptors());
+ List inherited = addAll(superBeanInfo.getPropertyDescriptors());
+
+ fMergeInheritedProperties = stripList(full, inherited);
+ if (fMergeInheritedProperties) {
+ if (!full.isEmpty())
+ fProperties = (PropertyDescriptor[]) full.toArray(new PropertyDescriptor[full.size()]);
+ if (!inherited.isEmpty())
+ createPropertyArray(inherited); // This is actually a list of those NOT inherited.
+ }
+ }
+ }
+
+ protected void createEventArray(List features) {
+ fNotInheritedEventSets = createDescriptorNames(features);
+ }
+
+ protected void createMethodEntries(List features) {
+ int s = features.size();
+ fNotInheritedMethods = new String[s];
+ for (int i = 0; i < s; i++) {
+ fNotInheritedMethods[i] = longName((MethodDescriptor) features.get(i));
+ }
+ }
+
+ protected String longName(MethodDescriptor md) {
+ String n = md.getName();
+ StringBuffer sb = new StringBuffer(n.length() + 20);
+ sb.append(n);
+ sb.append(':');
+ Method m = md.getMethod();
+ sb.append(m.getName());
+ sb.append('(');
+ Class[] parms = m.getParameterTypes();
+ for (int j = 0; j < parms.length; j++) {
+ if (j > 0)
+ sb.append(',');
+ if (!parms[j].isArray())
+ sb.append(parms[j].getName().replace('$', '.'));
+ else {
+ Class finalType = parms[j].getComponentType();
+ int insrt = sb.length();
+ while (finalType.isArray()) {
+ sb.append("[]"); //$NON-NLS-1$
+ finalType = finalType.getComponentType();
+ }
+ sb.insert(insrt, finalType.getName().replace('$', '.'));
+ }
+ }
+ return sb.toString();
+ }
+
+ protected void createPropertyArray(List features) {
+ fNotInheritedProperties = createDescriptorNames(features);
+ }
+
+ protected String[] createDescriptorNames(List features) {
+ String[] result = new String[features.size()];
+ for (int i = 0; i < result.length; i++) {
+ result[i] = ((FeatureDescriptor) features.get(i)).getName();
+ }
+ return result;
+ }
+
+ protected List addAll(Object[] set) {
+ if (set != null) {
+ ArrayList l = new ArrayList(set.length);
+ for (int i = 0; i < set.length; i++) {
+ l.add(set[i]);
+ }
+ return l;
+ } else
+ return Collections.EMPTY_LIST;
+ }
+
+ /**
+ * If this returns true, then all of the super class's events should be merged in. If it returns false, then the events returned are it, there are
+ * no others.
+ */
+ public boolean isMergeInheritedEvents() {
+ return fMergeInheritedEvents;
+ }
+
+ /**
+ * If this returns true, then all of the super class's methods should be merged in. If it returns false, then the methods returned are it, there
+ * are no others.
+ */
+ public boolean isMergeInheritedMethods() {
+ return fMergeInheritedMethods;
+ }
+
+ /**
+ * If this returns true, then all of the super class's properties should be merged in. If it returns false, then the properties returned are it,
+ * there are no others.
+ */
+ public boolean isMergeInheritedProperties() {
+ return fMergeInheritedProperties;
+ }
+
+ public BeanInfo[] getAdditionalBeanInfo() {
+ return fTargetBeanInfo.getAdditionalBeanInfo();
+ }
+
+ public BeanDescriptor getBeanDescriptor() {
+ return fTargetBeanInfo.getBeanDescriptor();
+ }
+
+ public EventSetDescriptor[] getEventSetDescriptors() {
+ return fMergeInheritedEvents ? fEventSets : fTargetBeanInfo.getEventSetDescriptors();
+ }
+
+ public java.awt.Image getIcon(int iconKind) {
+ return fTargetBeanInfo.getIcon(iconKind);
+ }
+
+ public MethodDescriptor[] getMethodDescriptors() {
+ return fMergeInheritedMethods ? fMethods : fTargetBeanInfo.getMethodDescriptors();
+ }
+
+ public PropertyDescriptor[] getPropertyDescriptors() {
+ return fMergeInheritedProperties ? fProperties : fTargetBeanInfo.getPropertyDescriptors();
+ }
+
+ public String[] getNotInheritedEventSetDescriptors() {
+ return fNotInheritedEventSets;
+ }
+
+ public String[] getNotInheritedMethodDescriptors() {
+ return fNotInheritedMethods;
+ }
+
+ public String[] getNotInheritedPropertyDescriptors() {
+ return fNotInheritedProperties;
+ }
+
+ protected String computeKey(FeatureDescriptor feature) {
+ return feature instanceof MethodDescriptor ? longName((MethodDescriptor) feature) : feature.getName();
+ }
+
+ /*
+ * Strip the list down using the Equality objects.
+ */
+ protected boolean stripList(List fullList, List inheritedList) {
+ // The process is to create a boolean list mirroring the inheritedList.
+ // This boolean list indicates if the corresponding (by index)
+ // entry from the inheritedList is to be retained in the final computed
+ // list.
+ //
+ // A Hashmap is created where the key is the computedKey from the inheritedList
+ // and the value is the index into the inheritedList. This is so that we can quickly determine if the
+ // entry is matching.
+ //
+ // Then the fullList will be stepped through and see if there is
+ // an entry in the Hashmap for it. If there is an entry, then
+ // the entry is checked to see if it is semantically equal.
+ // If it is, then the boolean list entry is marked so that
+ // the inheritedList entry will be retained, the fullList entry removed and the counter
+ // of the number of entries in the inheritedList copy is incremented.
+ // If they aren't semantically equal, then we know that this is
+ // an override. In that case, the fullList entry is kept, the inheritedList
+ // entry is not retained, but we don't prevent merge later.
+ //
+ // If the fullList entry is not found in the HashMap, then we know it is not
+ // from the inheritedList, so it will be retained in the fullList.
+ //
+ // If we get all of the way through, then we know that what is left
+ // in fullList is just this level.
+ //
+ // When we return we know that
+ // a) fullList has only the features that are found at the local level
+ // b) inheritedList if not empty contains the ones from super that SHOULD NOT be inherited.
+ // If it is empty, then if this method returns true, then ALL should be inherited,
+ // or if this method returns false, then it doesn't matter because we aren't merging any.
+ //
+ // All of this is based upon the assumption that the list can
+ // get quite large (which it does for javax.swing) and that
+ // a simple n-squared order search would be too slow.
+
+ if (fullList.isEmpty()) {
+ return false; // There are none in the full list, so there should be none, and don't merge.
+ } else if (inheritedList.isEmpty())
+ return false; // There are no inheritedList features, so treat as no merge.
+
+ // We have some features and some inheritedList features, so we need to go through the lists.
+
+ // Create a working copy of the FeatureDescriptorEquality for fullList and stripList and just reuse them
+ FeatureDescriptorEquality workingStrip = FeatureDescriptorEquality.createEquality((FeatureDescriptor) inheritedList.get(0));
+ FeatureDescriptorEquality workingFull = FeatureDescriptorEquality.createEquality((FeatureDescriptor) fullList.get(0));
+
+ int inheritedSize = inheritedList.size();
+ boolean[] copy = new boolean[inheritedSize];
+
+ HashMap inheritedMap = new HashMap(inheritedSize);
+ for (int i = 0; i < inheritedSize; i++) {
+ FeatureDescriptor f = (FeatureDescriptor) inheritedList.get(i);
+ String key = computeKey(f);
+ Object value = inheritedMap.get(key);
+ if (value == null)
+ inheritedMap.put(key, new Integer(i));
+ else {
+ // Shouldn't occur.
+ }
+
+ }
+
+ // When we are done with this processing, inheritedList will contain the super that should not be used, and full list will contain only the locals
+ // (those defined at this class level).;
+ int inheritedRetained = 0;
+ Iterator fullItr = fullList.iterator();
+ // Continue while we've retained less than the full super amount. If we've retained all of the inheritedList, there is no
+ // need to continue processing the fullList because there can't possibly be any inheritedList entries left to find.
+ while (inheritedRetained < inheritedSize && fullItr.hasNext()) {
+ FeatureDescriptor f = (FeatureDescriptor) fullItr.next();
+ boolean foundFull = false;
+ Object index = inheritedMap.get(computeKey(f));
+ if (index != null) {
+ workingFull.setFeature(f);
+ int ndx = ((Integer) index).intValue();
+ workingStrip.setFeature((FeatureDescriptor) inheritedList.get(ndx));
+ if (workingFull.equals(workingStrip)) {
+ // They are semantically identical, so retain in the inheritedList.
+ copy[ndx] = true;
+ foundFull = true;
+ inheritedRetained++;
+ }
+ }
+
+ if (foundFull) {
+ // We found the inheritedList entry semantically equal in the full list somewhere, so we need to remove the full entry.
+ fullItr.remove();
+ }
+ }
+
+ if (inheritedRetained == inheritedSize) {
+ inheritedList.clear(); // All were found in inheritedList, so just clear the inheritedList and return just what was left in the found.
+ // Those in full found in super had been removed from full during the processing.
+ return true; // We merge with all inherited.
+ } else if (inheritedRetained != 0) {
+ // Some were retained, take out of the list those that were retained.
+ // When done the list will contain those that should be dropped from the inherited list.
+ // We start from end because the actual number of bytes moved overall will be less than if we started from the front.
+ for (ListIterator itr = inheritedList.listIterator(inheritedList.size()); itr.hasPrevious();) {
+ int i = itr.previousIndex();
+ itr.previous(); // To back up the itr so that remove can remove it. We actually don't care what the value is.
+ if (copy[i])
+ itr.remove();
+ }
+ return true; // We merge, and the list is not empty but it did have some removed, so we leave the list alone. Those are not inherited.
+ } else
+ return false; // All were removed (retained == 0). None were retained. So we just don't do a merge. The list will be ignored.
+ }
+
+ // The modeling beaninfo is also used to send itself back in serialized mode as a callback.
+
+ private IVMCallbackServer vmServer;
+
+ private int callbackID;
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.jem.internal.proxy.common.ICallback#initializeCallback(org.eclipse.jem.internal.proxy.common.IVMServer, int)
+ */
+ public void initializeCallback(IVMCallbackServer vmServer, int callbackID) {
+ this.vmServer = vmServer;
+ this.callbackID = callbackID;
+ }
+
+ public void send() throws IOException, CommandException {
+ if (doFlags != 0) {
+ ObjectOutputStream stream = new ObjectOutputStream(vmServer.requestStream(callbackID, 0));
+ if ((doFlags & IBeanInfoIntrospectionConstants.DO_BEAN_DECOR) != 0)
+ sendBeanDecorator(stream);
+ if ((doFlags & IBeanInfoIntrospectionConstants.DO_PROPERTIES) != 0)
+ sendPropertyDecorators(stream);
+ if ((doFlags & IBeanInfoIntrospectionConstants.DO_METHODS) != 0)
+ sendMethodDecorators(stream);
+ if ((doFlags & IBeanInfoIntrospectionConstants.DO_EVENTS) != 0)
+ sendEventDecorators(stream);
+ stream.writeInt(IBeanInfoIntrospectionConstants.DONE);
+ stream.close();
+ }
+ }
+
+ /**
+ * Called by IDE to send the bean decorator information back through the callback.
+ * @throws CommandException
+ * @throws IOException
+ *
+ * @since 1.1.0
+ */
+ public void sendBeanDecorator(ObjectOutputStream stream) throws IOException, CommandException {
+ BeanRecord br = new BeanRecord();
+ BeanDescriptor bd = getBeanDescriptor();
+
+ if (bd != null) {
+ br.customizerClassName = getClassName(bd.getCustomizerClass());
+ br.mergeInheritedProperties = isMergeInheritedProperties();
+ br.mergeInheritedOperations = isMergeInheritedMethods();
+ br.mergeInheritedEvents = isMergeInheritedEvents();
+ br.notInheritedPropertyNames = getNotInheritedPropertyDescriptors();
+ br.notInheritedOperationNames = getNotInheritedMethodDescriptors();
+ br.notInheritedEventNames = getNotInheritedEventSetDescriptors();
+ fill(bd, br, BEAN_RECORD_TYPE);
+ }
+ stream.writeInt(IBeanInfoIntrospectionConstants.BEAN_DECORATOR_SENT);
+ stream.writeObject(br);
+ }
+
+ /**
+ * Called by IDE to send the property decorators information back through the callback.
+ *
+ * @throws CommandException
+ * @throws IOException
+ * @since 1.1.0
+ */
+ public void sendPropertyDecorators(ObjectOutputStream stream) throws IOException, CommandException {
+ PropertyDescriptor[] properties = getPropertyDescriptors();
+ if (properties != null && properties.length > 0) {
+ // Now start writing the records.
+ stream.writeInt(IBeanInfoIntrospectionConstants.PROPERTY_DECORATORS_SENT);
+ stream.writeInt(properties.length);
+ for (int i = 0; i < properties.length; i++) {
+ PropertyDescriptor pd = properties[i];
+ // Much of the two types are common, so if indexed, fill in the index part and then pass on to property part.
+ PropertyRecord usepr = null;
+ int useType = 0;
+ if (pd.getClass() == IndexedPropertyDescriptor.class) {
+ IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
+ IndexedPropertyRecord ipr = new IndexedPropertyRecord();
+ usepr = ipr;
+ useType = INDEXEDPROPERTY_RECORD_TYPE;
+ ipr.indexedReadMethod = getReflectedMethodRecord(ipd.getIndexedReadMethod());
+ ipr.indexedWriteMethod = getReflectedMethodRecord(ipd.getIndexedWriteMethod());
+ ipr.indexedPropertyTypeName = getClassName(ipd.getIndexedPropertyType());
+ } else {
+ usepr = new PropertyRecord();
+ useType = PROPERTY_RECORD_TYPE;
+ }
+ usepr.propertyEditorClassName = getClassName(pd.getPropertyEditorClass());
+ usepr.propertyTypeName = getClassName(pd.getPropertyType());
+ usepr.readMethod = getReflectedMethodRecord(pd.getReadMethod());
+ usepr.writeMethod = getReflectedMethodRecord((pd.getWriteMethod()));
+ usepr.bound = pd.isBound();
+ usepr.constrained = pd.isConstrained();
+ usepr.designTime = null;
+ usepr.field = null;
+ fill(pd, usepr, useType);
+ stream.writeObject(usepr);
+ }
+ }
+ }
+
+ /**
+ * Called by IDE to send the method decorators information back through the callback.
+ *
+ * @throws CommandException
+ * @throws IOException
+ * @since 1.1.0
+ */
+ public void sendMethodDecorators(ObjectOutputStream stream) throws IOException, CommandException {
+ MethodDescriptor[] methods = getMethodDescriptors();
+ if (methods != null && methods.length > 0) {
+ // Now start writing the records.
+ stream.writeInt(IBeanInfoIntrospectionConstants.METHOD_DECORATORS_SENT);
+ stream.writeInt(methods.length);
+ for (int i = 0; i < methods.length; i++) {
+ MethodRecord mr = new MethodRecord();
+ fill(mr, methods[i]);
+ stream.writeObject(mr);
+ }
+ }
+ }
+
+ /**
+ * Fill in a MethodRecord from the MethodDescriptor.
+ * @param mr
+ * @param md
+ *
+ * @since 1.1.0
+ */
+ protected void fill(MethodRecord mr, MethodDescriptor md) {
+ mr.methodForDescriptor = getReflectedMethodRecord(md.getMethod());
+ ParameterDescriptor[] parms = md.getParameterDescriptors();
+ if (parms == null)
+ mr.parameters = null;
+ else {
+ mr.parameters = new ParameterRecord[parms.length];
+ for (int j = 0; j < parms.length; j++) {
+ ParameterRecord pr = new ParameterRecord();
+ fill(parms[j], pr, PARAMETER_RECORD_TYPE);
+ mr.parameters[j] = pr;
+ }
+ }
+ fill(md, mr, METHOD_RECORD_TYPE);
+ }
+
+ /**
+ * Called by IDE to send the event set decorators information back through the callback.
+ *
+ * @throws CommandException
+ * @throws IOException
+ * @since 1.1.0
+ */
+ public void sendEventDecorators(ObjectOutputStream stream ) throws IOException, CommandException {
+ EventSetDescriptor[] events = getEventSetDescriptors();
+ if (events != null && events.length > 0) {
+ // Now start writing the records.
+ stream.writeInt(IBeanInfoIntrospectionConstants.EVENT_DECORATORS_SENT);
+ stream.writeInt(events.length);
+ for (int i = 0; i < events.length; i++) {
+ EventSetDescriptor ed = events[i];
+ EventSetRecord er = new EventSetRecord();
+ er.addListenerMethod = getReflectedMethodRecord(ed.getAddListenerMethod());
+ MethodDescriptor[] mds = ed.getListenerMethodDescriptors();
+ if (mds == null)
+ er.listenerMethodDescriptors = null;
+ else {
+ er.listenerMethodDescriptors = new MethodRecord[mds.length];
+ for (int j = 0; j < mds.length; j++) {
+ fill(er.listenerMethodDescriptors[j] = new MethodRecord(), mds[j]);
+ }
+ }
+ er.listenerTypeName = getClassName(ed.getListenerType());
+ er.removeListenerMethod = getReflectedMethodRecord(ed.getRemoveListenerMethod());
+ er.inDefaultEventSet = ed.isInDefaultEventSet();
+ er.unicast = ed.isUnicast();
+ er.eventAdapterClassName = null;
+ fill(ed, er, EVENTSET_RECORD_TYPE);
+ stream.writeObject(er);
+ }
+ }
+ }
+
+ protected static final int BEAN_RECORD_TYPE = 0;
+
+ protected static final int PROPERTY_RECORD_TYPE = 1;
+
+ protected static final int INDEXEDPROPERTY_RECORD_TYPE = 2;
+
+ protected static final int METHOD_RECORD_TYPE = 3;
+
+ protected static final int PARAMETER_RECORD_TYPE = 4;
+
+ protected static final int EVENTSET_RECORD_TYPE = 5;
+
+ /**
+ * Fill in the special attr/values for the given record type. The default handles the standard ones.
+ *
+ * @param record
+ * @param descr
+ * @param attributeName
+ * @param recordType
+ * type of record ultimately being processed.
+ * @return <code>true</code> if this attribute is a special one and processed, <code>false</code> if not special and should be added to
+ * attributes list transferred to IDE.
+ *
+ * @see ModelingBeanInfo#PROPERTY_RECORD_TYPE
+ * @since 1.1.0
+ */
+ protected boolean fillFromAttributes(FeatureRecord record, FeatureDescriptor descr, String attributeName, int recordType) {
+ switch (recordType) {
+ case INDEXEDPROPERTY_RECORD_TYPE:
+ case PROPERTY_RECORD_TYPE:
+ if (BaseBeanInfo.DESIGNTIMEPROPERTY.equals(attributeName)) {
+ ((PropertyRecord) record).designTime = (Boolean) descr.getValue(attributeName);
+ return true;
+ } else if (BaseBeanInfo.FIELDPROPERTY.equals(attributeName)) {
+ Field f = (Field) descr.getValue(attributeName);
+ // We have a field, set the property type to this since we couldn't correctly create this otherwise.
+ PropertyRecord pr = (PropertyRecord) record;
+ pr.propertyTypeName = getClassName(f.getType());
+ pr.field = getReflectedFieldRecord(f);
+ pr.readMethod = null; // Need to wipe out our dummy.
+ pr.writeMethod = null; // Or if it set, not valid for a field.
+ return true;
+ }
+ break;
+ case EVENTSET_RECORD_TYPE:
+ if (BaseBeanInfo.EVENTADAPTERCLASS.equals(attributeName)) {
+ ((EventSetRecord) record).eventAdapterClassName = (String) descr.getValue(attributeName);
+ return true;
+ }
+ break;
+ default:
+ break; // Didn't handle it.
+ }
+ return false;
+ }
+
+ /**
+ * Fill in the feature portion of the Descriptor into the record. We can be reusing some records (so we don't keep allocating when not needed), so
+ * we will null out unset fields.
+ *
+ * @param descr
+ * @param record
+ * @param recordType
+ * type of record ultimately being processed. Used for fillFromAttributes.
+ *
+ * @see ModelingBeanInfo#PROPERTY_RECORD_TYPE
+ * @since 1.1.0
+ */
+ protected void fill(FeatureDescriptor descr, FeatureRecord record, int recordType) {
+ record.name = descr.getName();
+ String dn = descr.getDisplayName();
+ if (!record.name.equals(dn))
+ record.displayName = dn; // display name returns name if display name not set. We don't want to send it if identical. (Note some Beaninfos are setting displayname the same text but not same string).
+ else
+ record.displayName = null;
+ String shd = descr.getShortDescription();
+ if (!dn.equals(shd))
+ record.shortDescription = shd; // short description returns displayname if short description not set. We don't want to send it if
+ // identical.
+ else
+ record.shortDescription = null;
+ record.expert = descr.isExpert();
+ record.hidden = descr.isHidden();
+ record.preferred = descr.isPreferred();
+ record.category = null; // Clear out in case not set.
+ Enumeration attrs = descr.attributeNames();
+ if (attrs.hasMoreElements()) {
+ // We don't have a way of knowing how many there are ahead of time, so we will build into lists and then turn into arrays at the end.
+ List names = new ArrayList();
+ List values = new ArrayList();
+ while (attrs.hasMoreElements()) {
+ String attrName = (String) attrs.nextElement();
+ if (attrName.equals(IBaseBeanInfoConstants.CATEGORY))
+ record.category = (String) descr.getValue(IBaseBeanInfoConstants.CATEGORY);
+ else if (attrName.equals(BaseBeanInfo.PREFERRED)) {
+ // A bug in Java 1.3, doing setPreferred was lost. So for those also stored it in attributes. So if set here, then use it.
+ record.preferred = ((Boolean) descr.getValue(BaseBeanInfo.PREFERRED)).booleanValue();
+ } else if (!fillFromAttributes(record, descr, attrName, recordType)) {
+ // Just copy accross. FillfromAttributes didn't handle it.
+ FeatureAttributeValue fv = new FeatureAttributeValue();
+ fv.setValue(descr.getValue(attrName));
+ names.add(attrName);
+ values.add(fv);
+ }
+ }
+ if (!names.isEmpty()) {
+ record.attributeNames = (String[]) names.toArray(new String[names.size()]);
+ record.attributeValues = (FeatureAttributeValue[]) values.toArray(new FeatureAttributeValue[values.size()]);
+ } else {
+ record.attributeNames = null;
+ record.attributeValues = null;
+ }
+ } else {
+ record.attributeNames = null;
+ record.attributeValues = null;
+ }
+
+ }
+
+ /*
+ * Get the classname from the class. If classs is null, then this return null.
+ */
+ private String getClassName(Class classs) {
+ return classs != null ? classs.getName() : null;
+ }
+
+ private ReflectMethodRecord getReflectedMethodRecord(Method method) {
+ if (method != null) {
+ ReflectMethodRecord rmr = new ReflectMethodRecord();
+ rmr.className = getClassName(method.getDeclaringClass());
+ rmr.methodName = method.getName();
+ Class[] parmTypes = method.getParameterTypes();
+ if (parmTypes.length > 0) {
+ rmr.parameterTypeNames = new String[parmTypes.length];
+ for (int i = 0; i < parmTypes.length; i++) {
+ rmr.parameterTypeNames[i] = getClassName(parmTypes[i]);
+ }
+ }
+ return rmr;
+ } else
+ return null;
+ }
+
+ private ReflectFieldRecord getReflectedFieldRecord(Field field) {
+ if (field != null) {
+ ReflectFieldRecord rf = new ReflectFieldRecord();
+ rf.className = getClassName(field.getDeclaringClass());
+ rf.fieldName = field.getName();
+ rf.readOnly = Modifier.isFinal(field.getModifiers());
+ return rf;
+ } else
+ return null;
+ }
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
new file mode 100644
index 0000000..04d2cb6
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jem.internal.beaninfo.vm;
+/*
+
+
+ */
+
+import java.beans.BeanInfo;
+
+/**
+ * This was supposed to for 1.4 or above where it can use identity
+ * to test for inherited features, but it still is not correct
+ * in 1.4. See the header comments in ModelingBeanInfo.
+ * @see org.eclipse.jem.internal.beaninfo.vm.ModelingBeanInfo
+ */
+public class ModelingBeanInfo15 extends ModelingBeanInfo {
+
+ /**
+ * Constructor for ModelingBeanInfo15.
+ * @param beanInfo
+ */
+ public ModelingBeanInfo15(BeanInfo beanInfo, int doFlags) {
+ super(beanInfo, doFlags);
+ }
+
+ /**
+ * Constructor for ModelingBeanInfo15.
+ * @param beanInfo
+ * @param superBeanInfo
+ */
+ public ModelingBeanInfo15(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
+ super(beanInfo, superBeanInfo, doFlags);
+ }
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
new file mode 100644
index 0000000..bd2d85c
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jem.internal.beaninfo.vm;
+/*
+
+
+ */
+
+import java.beans.BeanInfo;
+
+/**
+ * This is the modeling BeanInfo for Pre-JDK 1.4.
+ */
+public class ModelingBeanInfoPre15 extends ModelingBeanInfo {
+
+ public ModelingBeanInfoPre15(BeanInfo beanInfo, int doFlags) {
+ super(beanInfo, doFlags);
+ }
+
+ public ModelingBeanInfoPre15(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
+ super(beanInfo, superBeanInfo, doFlags);
+ }
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
new file mode 100644
index 0000000..8e09fcd
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.vm;
+/*
+
+
+ */
+
+import java.beans.*;
+/**
+ * ParameterDescriptor equality tester
+ */
+public class ParameterDescriptorEquality extends FeatureDescriptorEquality {
+
+ static void INIT() {
+ try {
+ MAP_EQUALITY.put(ParameterDescriptor.class, (ParameterDescriptorEquality.class).getConstructor(new Class[] {ParameterDescriptor.class}));
+ } catch (NoSuchMethodException e) {
+ }
+ }
+
+ public ParameterDescriptorEquality() {
+ }
+
+ public ParameterDescriptorEquality(ParameterDescriptor descr) {
+ super(descr);
+ }
+
+}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
new file mode 100644
index 0000000..75d5eee
--- /dev/null
+++ b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * 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.jem.internal.beaninfo.vm;
+/*
+
+
+ */
+
+import java.beans.*;
+/**
+ * PropertyDescriptor equality tester
+ */
+public abstract class PropertyDescriptorEquality extends FeatureDescriptorEquality {
+
+ public PropertyDescriptorEquality() {
+ }
+
+ public PropertyDescriptorEquality(PropertyDescriptor descr) {
+ super(descr);
+ }
+ /**
+ * Calculate the hashcode for the current feature, add this
+ * to the hashcode received from super.calculateHashCode
+ * and return the new value.
+ *
+ * NOTE: for subclasses, it is MANDITORY that the first line be:
+ * int hashcode = super.calculateHashCode();
+ * and the last line be:
+ * return hashcode*31 + (your calculated hashcode for just this subclass);
+ */
+ protected int calculateHashCode() {
+ int hashcode = super.calculateHashCode();
+ PropertyDescriptor pd = (PropertyDescriptor) fFeature;
+ int hc = 0;
+ if (pd.getPropertyEditorClass() != null)
+ hc += pd.getPropertyEditorClass().hashCode();
+ if (pd.getPropertyType() != null)
+ hc += pd.getPropertyType().hashCode();
+ if (pd.getReadMethod() != null)
+ hc += pd.getReadMethod().hashCode();
+ if (pd.getWriteMethod() != null)
+ hc += pd.getWriteMethod().hashCode();
+
+ hc += (pd.isBound() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+ hc += (pd.isConstrained() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+
+ return hashcode*31 + hc;
+ }
+
+ public boolean equals(Object obj) {
+ if (identityTest(obj))
+ return true;
+
+ if (!super.equals(obj))
+ return false;
+
+ PropertyDescriptor op = (PropertyDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
+ PropertyDescriptor fp = (PropertyDescriptor) fFeature;
+
+ if (op.getPropertyEditorClass() != fp.getPropertyEditorClass())
+ return false;
+ if (op.getReadMethod() != fp.getReadMethod())
+ return false;
+ if (op.getWriteMethod() != fp.getWriteMethod())
+ return false;
+ if (op.isBound() != fp.isBound())
+ return false;
+ if (op.isConstrained() != fp.isConstrained())
+ return false;
+
+ return true;
+ }
+
+
+}
diff --git a/plugins/org.eclipse.jem.ui/.cvsignore b/plugins/org.eclipse.jem.ui/.cvsignore
deleted file mode 100644
index 95a714b..0000000
--- a/plugins/org.eclipse.jem.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-javaCompiler...args
-@dot
-org.eclipse.jem.ui_2.0.100.200806031304.jar
diff --git a/plugins/org.eclipse.jem.ui/.options b/plugins/org.eclipse.jem.ui/.options
deleted file mode 100644
index a7e0740..0000000
--- a/plugins/org.eclipse.jem.ui/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jem.ui/debug/logtrace=default
-org.eclipse.jem.ui/debug/logtracefile=default
-org.eclipse.jem.ui/debug/loglevel=default
diff --git a/plugins/org.eclipse.jem.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jem.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6560548..0000000
--- a/plugins/org.eclipse.jem.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 15 21:15:36 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jem.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 20ce2fe..0000000
--- a/plugins/org.eclipse.jem.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem.ui; singleton:=true
-Bundle-Version: 2.0.100.qualifier
-Bundle-Activator: org.eclipse.jem.internal.ui.core.JEMUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.internal.beaninfo.ui,
- org.eclipse.jem.internal.ui.core,
- org.eclipse.jem.internal.ui.proxy,
- org.eclipse.jem.internal.ui.proxy.remote
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.beaninfo;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BIListElementSorter.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BIListElementSorter.java
deleted file mode 100644
index 4d54547..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BIListElementSorter.java
+++ /dev/null
@@ -1,78 +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.jem.internal.beaninfo.ui;
-/*
-
-
- */
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoEntry;
-
-/**
- * Sorter for sorting BPBeaninfoListElements within the main list.
- *
- * @version 1.0
- * @author
- */
-public class BIListElementSorter extends ViewerSorter {
-
- /*
- * @see ViewerSorter#category(Object)
- */
- public int category(Object obj) {
- if (obj instanceof BPBeaninfoListElement) {
- BPBeaninfoListElement element = (BPBeaninfoListElement) obj;
-
- switch (((BeaninfoEntry) element.getEntry()).getKind()) {
- case IClasspathEntry.CPE_LIBRARY:
- return 4;
- case IClasspathEntry.CPE_PROJECT:
- return 1;
- case IClasspathEntry.CPE_SOURCE:
- return 0;
- case IClasspathEntry.CPE_VARIABLE:
- return 3;
- case BeaninfoEntry.BIE_PLUGIN:
- return 5;
- case IClasspathEntry.CPE_CONTAINER:
- return 2;
- }
- }
- return super.category(obj);
- }
-
- /*
- * @see ViewerSorter#compare()
- */
- public int compare(Viewer viewer, Object e1, Object e2) {
- int cat1 = category(e1);
- int cat2 = category(e2);
-
- if (cat1 != cat2)
- return cat1 - cat2;
-
- if ((e1 instanceof BPBeaninfoListElement) && (e2 instanceof BPBeaninfoListElement)) {
- BeaninfoEntry p1 = (BeaninfoEntry) ((BPBeaninfoListElement) e1).getEntry();
- BeaninfoEntry p2 = (BeaninfoEntry) ((BPBeaninfoListElement) e2).getEntry();
-
- // Compare paths
- return p1.getPath().toString().compareTo(p2.getPath().toString());
- }
- return super.compare(viewer, e1, e2);
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPBeaninfoListElement.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPBeaninfoListElement.java
deleted file mode 100644
index 72d1259..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPBeaninfoListElement.java
+++ /dev/null
@@ -1,80 +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.jem.internal.beaninfo.ui;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoEntry;
-import org.eclipse.jem.internal.beaninfo.core.SearchpathEntry;
-
-/**
- * @version 1.0
- * @author
- */
-public class BPBeaninfoListElement extends BPListElement {
-
- BPSearchListElement[] searchpaths;
-
- /**
- * Constructor for BPBeaninfoListElement.
- * The searchPaths is the initial list, it is assumed that
- * the beaninfoEntry has these searchpaths in them too.
- */
- public BPBeaninfoListElement(BeaninfoEntry entry, BPSearchListElement[] searchpaths, boolean missing) {
- super(entry, missing);
- this.searchpaths = searchpaths != null ? searchpaths : new BPSearchListElement[0];
- }
-
- /**
- * Mark the entry as exported.
- */
- public void setExported(boolean exported) {
- ((BeaninfoEntry) entry).setIsExported(exported);
- }
-
- /*
- * @see BPListElement#canExportBeChanged()
- */
- public boolean canExportBeChanged() {
- return true;
- }
-
- /*
- * @see BPListElement#isExported()
- */
- public boolean isExported() {
- return ((BeaninfoEntry) entry).isExported();
- }
-
- /**
- * Return the current list of Searchpaths for this Beaninfo Element.
- */
- public BPSearchListElement[] getSearchpaths() {
- return searchpaths;
- }
-
- /**
- * Set the new list. This will update the beaninfo entry too.
- */
- public void setSearchpaths(BPSearchListElement[] searchpaths) {
- this.searchpaths = searchpaths;
-
- SearchpathEntry[] spEntries = new SearchpathEntry[searchpaths.length];
- for (int i = 0; i < searchpaths.length; i++) {
- BPSearchListElement bps = searchpaths[i];
- spEntries[i] = (SearchpathEntry) bps.getEntry();
- }
-
- ((BeaninfoEntry) entry).setSearchPaths(spEntries);
- }
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPListElement.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPListElement.java
deleted file mode 100644
index 5f5ee16..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPListElement.java
+++ /dev/null
@@ -1,56 +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.jem.internal.beaninfo.ui;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.beaninfo.core.IBeaninfosDocEntry;
-/**
- * A Base ListElement (i.e. element in a list viewer) for
- * a BeanInfo Search Path Entry.
- */
-
-public abstract class BPListElement extends Object {
- protected IBeaninfosDocEntry entry;
- protected boolean missing; // Library/folder/classpath entry for this entry could not be found.
-
- public BPListElement(IBeaninfosDocEntry entry, boolean missing) {
- this.entry = entry;
- this.missing = missing;
- }
-
- public IBeaninfosDocEntry getEntry() {
- return entry;
- }
-
- public boolean isMissing() {
- return missing;
- }
-
- /**
- * Certain entries cannot have their export status changed.
- */
- public abstract boolean canExportBeChanged();
-
- /**
- * Return whether this entry is exported.
- */
- public abstract boolean isExported();
-
- /**
- * If export can be changed, change it.
- */
- public abstract void setExported(boolean exported);
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPSearchListElement.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPSearchListElement.java
deleted file mode 100644
index 83ae363..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPSearchListElement.java
+++ /dev/null
@@ -1,71 +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.jem.internal.beaninfo.ui;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.beaninfo.core.SearchpathEntry;
-
-/**
- * @version 1.0
- * @author
- */
-public class BPSearchListElement extends BPListElement {
-
- protected boolean exported;
- protected boolean packageMissing;
- /**
- * Constructor for BPSearchListElement.
- * @param entry
- * @param project
- * @param inMissing
- */
- public BPSearchListElement(
- SearchpathEntry entry,
- boolean missing,
- boolean packageMissing,
- boolean exported) {
- super(entry, missing);
-
- this.packageMissing = packageMissing;
- this.exported = exported;
- }
-
- /*
- * @see BPListElement#canExportBeChanged()
- */
- public boolean canExportBeChanged() {
- return false;
- }
-
- /*
- * @see BPListElement#isExported()
- */
- public boolean isExported() {
- return exported;
- }
-
- /**
- * Is the package missing.
- */
- public boolean isPackageMissing() {
- return packageMissing;
- }
-
- /*
- * @see BPListElement#setExported(boolean)
- */
- public void setExported(boolean exported) {
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeanInfoUIMessages.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeanInfoUIMessages.java
deleted file mode 100644
index 5f999da..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeanInfoUIMessages.java
+++ /dev/null
@@ -1,94 +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.jem.internal.beaninfo.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class BeanInfoUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.internal.beaninfo.ui.messages";//$NON-NLS-1$
-
- private BeanInfoUIMessages() {
- // Do not instantiate
- }
-
- public static String SearchPathDialog_ChoosePackages;
- public static String SearchPathDialog_Remove;
- public static String SearchPathDialog_Desc_Label;
- public static String SearchPathDialog_ModifySearchPaths;
- public static String SearchPathDialog_NotEditable_INFO_;
- public static String SearchPathDialog_PackagePresent_INFO_;
- public static String SearchPathDialog_InputDialog_Title;
- public static String SearchPathDialog_InputDialog_Message;
- public static String BeanInfoPathsBlock_ExportAll;
- public static String BeanInfoPathsBlock_UnexportAll;
- public static String BeanInfoPathsBlock_Page_Tab_Packages;
- public static String BeanInfoPathsBlock_Page_Tab_Classes;
- public static String BeanInfosWorkbookPage_AddFolders;
- public static String BeanInfosWorkbookPage_AddJARs;
- public static String BeanInfosWorkbookPage_AddExternalJAR;
- public static String BeanInfosWorkbookPage_AddVariable;
- public static String BeanInfosWorkbookPage_AddProjects;
- public static String BeanInfosWorkbookPage_ModifyPaths;
- public static String BeanInfosWorkbookPage_Remove;
- public static String BeanInfosWorkbookPage_List_Text;
- public static String BeanInfosWorkbookPage_SelectionDialog_Classes_Title;
- public static String BeanInfosWorkbookPage_SelectionDialog_JARs_Title;
- public static String BeanInfosWorkbookPage_SelectionDialog_JARs_Message;
- public static String BeanInfosWorkbookPage_SelectionDialog_ExtJARs_Text;
- public static String BeanInfosWorkbookPage_SelectionDialog_Projects_Title;
- public static String BeanInfosWorkbookPage_SelectionDialog_Classes_Prompt;
- public static String BeanInfosWorkbookPage_SelectionDialog_Projects_Prompt;
- public static String PackagesWorkbook_ChoosePackages;
- public static String PackagesWorkbook_ChooseDefinedPaths;
- public static String PackagesWorkbook_Remove;
- public static String PackagesWorkbook_LabelText;
- public static String PackagesWorkbook_SelectionDialog_DefinedPaths_Title;
- public static String PackagesWorkbook_SelectionDialog_DefinedPaths_Message;
- public static String LabelProvider_Library_Folder;
- public static String LabelProvider_Library__PathLastSegment_PathRelative_;
- public static String LabelProvider_Library__PathLastSegment_PathExceptLast_;
- public static String LabelProvider_Variable__name_PathOSString_;
- public static String LabelProvider__packageName_Path_;
- public static String VariableSelectionBlock_variable_label;
- public static String VariableSelectionBlock_variable_button;
- public static String VariableSelectionBlock_extension_label;
- public static String VariableSelectionBlock_extension_button;
- public static String VariableSelectionBlock_fullpath_label;
- public static String VariableSelectionBlock_error_entername_ERROR_;
- public static String VariableSelectionBlock_error_namenotexists_ERROR_;
- public static String VariableSelectionBlock_error_pathexists_ERROR_;
- public static String VariableSelectionBlock_error_invalidextension_ERROR_;
- public static String VariableSelectionBlock_warning_pathnotexists_WARN_;
- public static String VariableSelectionBlock_ExtJarDialog_title;
- public static String Beaninfo_UI__errortitle;
- public static String Beaninfo_UI__error;
- public static String BeaninfoPropertiesPage_INFO__nojavaproject;
- public static String BeaninfoPropertiesPage_INFO__closedproject;
- public static String BeaninfoPathsBlock_UI__enablebeaninfo;
- public static String BeaninfoPathsBlock_UI__searchpath_label;
- public static String BeaninfoPathsBlock_UI__searchpath_up_button;
- public static String BeaninfoPathsBlock_UI__searchpath_down_button;
- public static String BeaninfoPathsBlock_UI__searchpath_remove_button;
- public static String BeaninfoPathsBlock_UI__serachpath_tab_order;
- public static String BeaninfoPathsBlock_WARN__searchpath_missing_path_format;
- public static String BeaninfoPathsBlock_UI__searchpath_operationdescription;
- public static String BeaninfoPathsBlock_UI__addsearchpath_title;
- public static String BeaninfoPathsBlock_UI__addsearchpath_description;
- public static String BeaninfoPathsBlock_UI__warning_EntryMissing;
- public static String BeaninfoPathsBlock_UI__searchpath_add_button;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, BeanInfoUIMessages.class);
- }
-
- public static String ExceptionHandler_errordialog_msg_seelog;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoEntrySearchpathDialog.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoEntrySearchpathDialog.java
deleted file mode 100644
index bcbc143..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoEntrySearchpathDialog.java
+++ /dev/null
@@ -1,448 +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.jem.internal.beaninfo.ui;
-/*
-
-
- */
-
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoEntry;
-import org.eclipse.jem.internal.beaninfo.core.SearchpathEntry;
-
-/**
- * This dialog is used to display and modify the search path
- * within a BeaninfoEntry.
- * @version 1.0
- * @author
- */
-public class BeaninfoEntrySearchpathDialog extends Dialog {
- protected BPBeaninfoListElement infoElement;
- protected IJavaProject jProject;
- //protected ListDialogField listField;
-
- private Composite top;
- private Table table;
- private TableViewer tableViewer;
- private Label label;
- private Composite buttonsBar;
- private Button upbutton;
- private Button downButton;
- private Button choosePackagesButton;
- private Button removeButton;
- private List tableElements;
- private boolean enabled = true;
-
- public BeaninfoEntrySearchpathDialog(
- Shell parentShell,
- BPBeaninfoListElement infoElement,
- IJavaProject jProject) {
- super(parentShell);
-
- this.infoElement = infoElement;
- this.jProject = jProject;
- this.tableElements = new ArrayList();
- }
-
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(
- MessageFormat.format(
- BeanInfoUIMessages.SearchPathDialog_ModifySearchPaths,
- new Object[] { infoElement.getEntry().getPath().toString()}));
- }
-
- protected Control createDialogArea(Composite parent) {
- top = new Composite(parent, SWT.NONE);
- top.setLayoutData(new GridData(GridData.FILL_BOTH));
- top.setLayout(new GridLayout(2, false));
-
- label = new Label(top, SWT.NONE);
- label.setText(BeanInfoUIMessages.SearchPathDialog_Desc_Label);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- label.setLayoutData(gd);
-
- createTable();
- createButtonsBar();
-
- updatePackagesList();
-
- updateButtons();
-
- return top;
- }
-
- /**
- * This method initializes table
- *
- */
- private void createTable() {
- GridData gridData1 = new org.eclipse.swt.layout.GridData();
- gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- gridData1.grabExcessHorizontalSpace = true;
- gridData1.grabExcessVerticalSpace = true;
- gridData1.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
- table = new Table(top, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
- table.setLayoutData(gridData1);
- table.addSelectionListener(new SelectionListener(){
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- });
- tableViewer = new TableViewer(table);
- //tableViewer.setSorter(new BIListElementSorter());
- tableViewer.setContentProvider(new ArrayContentProvider());
- tableViewer.setLabelProvider(new SearchPathListLabelProvider(jProject));
- tableViewer.setInput(tableElements);
- }
-
- /**
- * This method initializes buttonsBar
- *
- */
- private void createButtonsBar() {
- RowLayout rowLayout = new RowLayout();
- rowLayout.type = org.eclipse.swt.SWT.VERTICAL;
- rowLayout.marginLeft = 3;
- rowLayout.fill = true;
- GridData gridData2 = new org.eclipse.swt.layout.GridData();
- gridData2.grabExcessVerticalSpace = true;
- gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
- gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.BEGINNING;
- buttonsBar = new Composite(top, SWT.NONE);
- buttonsBar.setLayoutData(gridData2);
- buttonsBar.setLayout(rowLayout);
- upbutton = new Button(buttonsBar, SWT.NONE);
- upbutton.setText(BeanInfoUIMessages.BeaninfoPathsBlock_UI__searchpath_up_button);
- upbutton.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- List selected = BeaninfoPathsBlock.getSelectedList(tableViewer.getSelection());
- Iterator selItr = selected.iterator();
- while (selItr.hasNext()) {
- Object element = selItr.next();
- int oldIndex = tableElements.indexOf(element);
- if(oldIndex>0){
- tableElements.remove(element);
- tableElements.add(--oldIndex, element);
- }
- }
- tableViewer.refresh();
- pageChanged();
- }
- });
- downButton = new Button(buttonsBar, SWT.NONE);
- downButton.setText(BeanInfoUIMessages.BeaninfoPathsBlock_UI__searchpath_down_button);
- downButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- List selected = BeaninfoPathsBlock.getSelectedList(tableViewer.getSelection());
- Iterator selItr = selected.iterator();
- while (selItr.hasNext()) {
- Object element = selItr.next();
- int oldIndex = tableElements.indexOf(element);
- if(oldIndex<(tableElements.size()-1)){
- tableElements.remove(element);
- tableElements.add(++oldIndex, element);
- }
- }
- tableViewer.refresh();
- pageChanged();
- }
- });
- new Label(buttonsBar, SWT.NONE);
- choosePackagesButton = new Button(buttonsBar, SWT.NONE);
- choosePackagesButton.setText(BeanInfoUIMessages.SearchPathDialog_ChoosePackages);
- choosePackagesButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- final List elementsToAdd = choosePackages();
- if (elementsToAdd != null && !elementsToAdd.isEmpty()) {
- tableElements.addAll(elementsToAdd);
- tableViewer.refresh();
- table.getDisplay().asyncExec(new Runnable(){
- public void run() {
- tableViewer.setSelection(new StructuredSelection(elementsToAdd));
- };
- });
- }
- }
- });
- new Label(buttonsBar, SWT.NONE);
- removeButton = new Button(buttonsBar, SWT.NONE);
- removeButton.setText(BeanInfoUIMessages.SearchPathDialog_Remove);
- removeButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- List selected = BeaninfoPathsBlock.getSelectedList(tableViewer.getSelection());
- tableElements.removeAll(selected);
- tableViewer.refresh();
- pageChanged();
- }
- });
- }
-
-
- protected void pageChanged() {
- // TODO Auto-generated method stub
-
- }
-
- protected void updateButtons() {
- if(top!=null && !top.isDisposed()){
- upbutton.setEnabled(enabled && canMoveUp());
- downButton.setEnabled(enabled && canMoveDown());
- removeButton.setEnabled(enabled && !tableViewer.getSelection().isEmpty());
- choosePackagesButton.setEnabled(enabled);
- }
- }
-
- private boolean canMoveDown() {
- int[] indc= table.getSelectionIndices();
- int k= tableElements.size() - 1;
- for (int i= indc.length - 1; i >= 0 ; i--, k--) {
- if (indc[i] != k) {
- return true;
- }
- }
- return false;
- }
-
- private boolean canMoveUp() {
- int[] indc= table.getSelectionIndices();
- for (int i= 0; i < indc.length; i++) {
- if (indc[i] != i) {
- return true;
- }
- }
- return false;
- }
-
- private void updatePackagesList() {
- if (infoElement.getEntry().getKind() == BeaninfoEntry.BIE_PLUGIN) {
- // We don't allow these to be updated. They should only be used through
- // registered mechanisms and we won't be showing them here normally.
- label.setText(BeanInfoUIMessages.SearchPathDialog_NotEditable_INFO_);
- updateEnabledState(false);
- return;
- }
- tableElements.clear();
- tableElements.addAll(Arrays.asList(infoElement.getSearchpaths()));
- tableViewer.refresh();
- }
-
- private void updateEnabledState(boolean b) {
- enabled = b;
- if(top!=null && !top.isDisposed()){
- label.setEnabled(enabled);
- table.setEnabled(enabled);
- updateButtons();
- }
- }
-
- protected void okPressed() {
- if (table.isEnabled()) {
- // If the field is not enabled, then there is no update to perform. We don't
- // want to accidentially wipe out the search paths in this case.
-
- // Override to put the list of elements back into the BPBeaninfoListElement
- // Until then they aren't actually updated.
- infoElement.setSearchpaths(
- (BPSearchListElement[]) tableElements.toArray(new BPSearchListElement[tableElements.size()]));
- }
- super.okPressed();
- }
-
- /**
- * Choose the packages that should be in the search path.
- */
- private List choosePackages() {
-
- IPackageFragmentRoot[] roots = getBeaninfoRoots();
- List newPackageNames = new ArrayList();
- if (roots != null) {
- // It's within the workspace, so we can get the roots and packages.
- ISelectionStatusValidator validator = new PackagesWorkbookPage.ChoosePackagesSelectionValidator();
-
- // Show up to the package fragment, don't show any contents of it.
- Class[] acceptedClasses = new Class[] { IPackageFragmentRoot.class, IPackageFragment.class };
- Object[] rejectedFragments = getFilteredExistingEntries(roots);
-
- // Only show package fragments that have children (i.e. there classes in it, not interested
- // in intermediate ones that have no classes defined in them. Those are filtered out.
- TypedViewerFilter filter = new TypedViewerFilter(acceptedClasses, rejectedFragments) {
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (super.select(viewer, parentElement, element)) {
- if (element instanceof IPackageFragment) {
- IPackageFragment pkg = (IPackageFragment) element;
- try {
- return pkg.hasChildren();
- } catch (JavaModelException e) {
- }
- return false;
- } else
- return true;
- }
- return false;
- }
- };
-
- ITreeContentProvider provider = new PackageOnlyContentProvider();
-
- ILabelProvider labelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
- ElementTreeSelectionDialog dialog =
- new ElementTreeSelectionDialog(getShell(), labelProvider, provider);
- dialog.setTitle(BeanInfoUIMessages.BeaninfoPathsBlock_UI__addsearchpath_title);
-
- dialog.setValidator(validator);
- dialog.setMessage(BeanInfoUIMessages.BeaninfoPathsBlock_UI__addsearchpath_description);
- dialog.addFilter(filter);
- dialog.setInput(Arrays.asList(getBeaninfoRoots()));
-
- if (dialog.open() == Window.OK) {
- Object[] elements = dialog.getResult();
- for (int i = 0; i < elements.length; i++) {
- newPackageNames.add(((IPackageFragment) elements[i]).getElementName());
- }
- }
- } else {
- // It's not within the workspace
- final List existingPackagenames = getFilteredExistingEntries();
- IInputValidator validator = new IInputValidator() {
- public String isValid(String newText) {
- if (existingPackagenames.contains(newText))
- return BeanInfoUIMessages.SearchPathDialog_PackagePresent_INFO_;
-
- IStatus status = JavaConventions.validatePackageName(newText);
- return status.getSeverity() == IStatus.OK ? null : status.getMessage();
- }
- };
- InputDialog dialog = new InputDialog(getShell(), BeanInfoUIMessages.SearchPathDialog_InputDialog_Title, BeanInfoUIMessages.SearchPathDialog_InputDialog_Message, null, validator);
- if (dialog.open() == Window.OK)
- newPackageNames.add(dialog.getValue());
- }
-
- if (newPackageNames.size() == 0)
- return Collections.EMPTY_LIST;
-
- List newElements = new ArrayList(newPackageNames.size());
- for (int i = 0; i < newPackageNames.size(); i++)
- newElements.add(
- new BPSearchListElement(new SearchpathEntry((String) newPackageNames.get(i)), false, false, false));
- return newElements;
- }
- /**
- * Return the packagefragment roots for the given beaninfo entry.
- * Return null if it can be handled (i.e. not in a project some where).
- */
- protected IPackageFragmentRoot[] getBeaninfoRoots() {
- IPackageFragmentRoot[] roots = null;
- if (infoElement.getEntry().getKind() != BeaninfoEntry.BIE_PLUGIN) {
- IClasspathEntry resolved = JavaCore.getResolvedClasspathEntry(((BeaninfoEntry) infoElement.getEntry()).getClasspathEntry());
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(resolved.getPath());
- if (res != null && res.exists()) {
- if (res instanceof IProject) {
- // It is a project itself.
- IJavaProject jp = (IJavaProject) JavaCore.create(res);
- try {
- if (jp != null)
- roots = jp.getPackageFragmentRoots(); // All of the roots in the project are applicable.
- } catch (JavaModelException e) {
- }
- } else {
- // It is within another project
- IProject containingProject = res.getProject();
- IJavaProject jp = JavaCore.create(containingProject);
- if (jp != null) {
- // The roots if this is in the classpath of this project
- try {
- IPackageFragmentRoot root = jp.findPackageFragmentRoot(resolved.getPath());
- if (root != null)
- roots = new IPackageFragmentRoot[] { root };
- } catch (JavaModelException e) {
- }
- }
- }
- }
- }
- return roots;
- }
-
- /**
- * Return the list of entries that already are in the search path
- * so that they don't show up in the list.
- */
- protected Object[] getFilteredExistingEntries(IPackageFragmentRoot[] roots) {
- List entries = tableElements;
- List fragments = new ArrayList(entries.size());
- Iterator itr = entries.iterator();
- while (itr.hasNext()) {
- BPSearchListElement elem = (BPSearchListElement) itr.next();
- fragments.addAll(getPackages(elem, roots));
- }
- return fragments.toArray();
- }
-
- /**
- * Return the list of entries that already are in the search path
- * so that they don't show up in the list. This one is just the package names.
- */
- protected List getFilteredExistingEntries() {
- List entries = tableElements;
- List names = new ArrayList(entries.size());
- Iterator itr = entries.iterator();
- while (itr.hasNext()) {
- BPSearchListElement elem = (BPSearchListElement) itr.next();
- names.add(((SearchpathEntry) elem.getEntry()).getPackage());
- }
- return names;
- }
-
- protected List getPackages(BPSearchListElement element, IPackageFragmentRoot[] roots) {
- String packageName = ((SearchpathEntry) element.getEntry()).getPackage();
- if (packageName == null)
- return Collections.EMPTY_LIST;
-
- try {
- List packages = new ArrayList(10);
- for (int i = 0; i < roots.length; i++) {
- IJavaElement[] pfs = roots[i].getChildren();
- for (int j = 0; j < pfs.length; j++)
- if (pfs[j].getElementType() == IJavaElement.PACKAGE_FRAGMENT
- && pfs[j].getElementName().equals(packageName)) {
- packages.add(pfs[j]);
- break;
- }
- }
- return packages;
- } catch (JavaModelException e) {
- }
- return Collections.EMPTY_LIST;
- }
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java
deleted file mode 100644
index 43e9278..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.ui;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.*;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-public class BeaninfoPathsBlock {
-
- //private Shell sShell1 = null; // @jve:decl-index=0:visual-constraint="40,19"
- private Composite top = null;
- private TabFolder tabFolder = null;
- private Button enableBeaninfoCheckbox = null;
- private PackagesWorkbookPage packagesWorkbookPage2 = null;
- private SearchpathOrderingWorkbookPage searchpathOrderingWorkbookPage2 = null;
- private BeaninfosWorkbookPage beaninfosPropertyPage2 = null;
- private Control packagesPageControl = null;
- private Control searchpathPageControl = null;
- private Control beaninfosPageControl = null;
- private Image packagesTabImage;
- private Image beaninfosTabImage;
- private Image searchPathTabImage;
- // ...ui
-
- private IWorkspaceRoot workspaceRoot;
- private IStatusChangeListener statusChangeListener;
- private IBuildSearchPage currentPage;
- private IJavaProject javaProject;
- private boolean enableBeaninfo = true;
-
- public BeaninfoPathsBlock(IWorkspaceRoot workspaceRoot, IStatusChangeListener statusChangeListener){
- this.workspaceRoot = workspaceRoot;
- this.statusChangeListener = statusChangeListener;
- }
-
- private void setEnableBeaninfo(boolean enable){
- enableBeaninfo = enable;
- if(enableBeaninfoCheckbox!=null && !enableBeaninfoCheckbox.isDisposed())
- enableBeaninfoCheckbox.setSelection(enable);
- }
-
-// /**
-// * This method initializes sShell1
-// *
-// */
-// private void createSShell1() {
-// sShell1 = new Shell();
-// sShell1.setLayout(new FillLayout());
-// createTop();
-// sShell1.setSize(new org.eclipse.swt.graphics.Point(403,289));
-// }
-
- /**
- * This method initializes top
- *
- */
- public Control createControl(Composite parent) {
- top = new Composite(parent, SWT.NONE);
- top.setLayout(new GridLayout());
- createTabFolder();
- enableBeaninfoCheckbox = new Button(top, SWT.CHECK);
- enableBeaninfoCheckbox.setText(BeanInfoUIMessages.BeaninfoPathsBlock_UI__enablebeaninfo);
- enableBeaninfoCheckbox.addSelectionListener(new org.eclipse.swt.events.SelectionListener() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- enableBeaninfo = enableBeaninfoCheckbox.getSelection();
- packagesWorkbookPage2.setBeaninfoEnabled(enableBeaninfo);
- beaninfosPropertyPage2.setBeaninfoEnabled(enableBeaninfo);
- searchpathOrderingWorkbookPage2.setBeaninfoEnabled(enableBeaninfo);
- }
- public void widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent e) {
- widgetSelected(e);
- }
- });
- enableBeaninfoCheckbox.setSelection(enableBeaninfo);
- if(javaProject!=null){
- getPackagesPage().init(javaProject);
- getBeaninfosPage().init(javaProject);
- getSearchpathOrderingPage().init(javaProject);
- }
- return top;
- }
-
- /**
- * This method initializes tabFolder
- *
- */
- private void createTabFolder() {
- GridData gridData = new org.eclipse.swt.layout.GridData();
- gridData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- gridData.grabExcessHorizontalSpace = true;
- gridData.grabExcessVerticalSpace = true;
- gridData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
- tabFolder = new TabFolder(top, SWT.NONE);
- tabFolder.setLayoutData(gridData);
- createPackagesWorkbookPage2();
- createBeaninfosPropertyPage2();
- createSearchpathOrderingWorkbookPage2();
- tabFolder.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- tabChanged(e.item);
- }
- });
-
- TabItem tabItem = new TabItem(tabFolder, SWT.NONE);
- tabItem.setText(BeanInfoUIMessages.BeanInfoPathsBlock_Page_Tab_Packages);
- tabItem.setImage(getPackagesTabImage());
- tabItem.setControl(packagesPageControl);
- TabItem tabItem1 = new TabItem(tabFolder, SWT.NONE);
- tabItem1.setText(BeanInfoUIMessages.BeanInfoPathsBlock_Page_Tab_Classes);
- tabItem1.setImage(getBeaninfosTabImage());
- tabItem1.setControl(beaninfosPageControl);
- TabItem tabItem2 = new TabItem(tabFolder, SWT.NONE);
- tabItem2.setImage(getSearchPathTabImage());
- tabItem2.setText(BeanInfoUIMessages.BeaninfoPathsBlock_UI__serachpath_tab_order);
- tabItem2.setControl(searchpathPageControl);
- tabFolder.setSelection(2);
- }
-
- private Image getSearchPathTabImage() {
- if(searchPathTabImage==null)
- searchPathTabImage = JEMUIPlugin.imageDescriptorFromPlugin(JEMUIPlugin.getPlugin().getBundle().getSymbolicName(), "icons/cp_order_obj.gif").createImage(); //$NON-NLS-1$
- return searchPathTabImage;
- }
-
- private Image getPackagesTabImage() {
- if(packagesTabImage==null)
- packagesTabImage = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
- return packagesTabImage;
- }
-
- private Image getBeaninfosTabImage(){
- if(beaninfosTabImage==null){
- URL imageURL = FileLocator.find(JEMUIPlugin.getPlugin().getBundle(), new Path("icons/javabean.gif"), null); //$NON-NLS-1$
- if (imageURL != null)
- beaninfosTabImage = ImageDescriptor.createFromURL(imageURL).createImage();
- else
- beaninfosTabImage = ImageDescriptor.getMissingImageDescriptor().createImage();
- }
- return beaninfosTabImage;
- }
-
- /**
- * This method initializes packagesWorkbookPage2
- *
- */
- private void createPackagesWorkbookPage2() {
- packagesPageControl = getPackagesPage().createControl(tabFolder);
- }
-
- /**
- * This method initializes searchpathOrderingWorkbookPage2
- *
- */
- private void createSearchpathOrderingWorkbookPage2() {
- searchpathPageControl = getSearchpathOrderingPage().createControl(tabFolder);
- searchpathPageControl.addDisposeListener(new org.eclipse.swt.events.DisposeListener() {
- public void widgetDisposed(org.eclipse.swt.events.DisposeEvent e) {
- if(searchPathTabImage!=null){
- if(!searchPathTabImage.isDisposed())
- searchPathTabImage.dispose();
- searchPathTabImage=null;
- }
- }
- });
- }
-
- /**
- * This method initializes beaninfosPropertyPage2
- *
- */
- private void createBeaninfosPropertyPage2() {
- beaninfosPageControl = getBeaninfosPage().createControl(tabFolder);
- beaninfosPageControl.addDisposeListener(new org.eclipse.swt.events.DisposeListener() {
- public void widgetDisposed(org.eclipse.swt.events.DisposeEvent e) {
- if(beaninfosTabImage!=null){
- if(!beaninfosTabImage.isDisposed())
- beaninfosTabImage.dispose();
- beaninfosTabImage=null;
- }
- }
- });
- }
-
- PackagesWorkbookPage getPackagesPage(){
- if(packagesWorkbookPage2==null)
- packagesWorkbookPage2 = new PackagesWorkbookPage(workspaceRoot, this);
- return packagesWorkbookPage2;
- }
-
- BeaninfosWorkbookPage getBeaninfosPage(){
- if(beaninfosPropertyPage2==null)
- beaninfosPropertyPage2 = new BeaninfosWorkbookPage(workspaceRoot, this);
- return beaninfosPropertyPage2;
- }
-
- SearchpathOrderingWorkbookPage getSearchpathOrderingPage(){
- if(searchpathOrderingWorkbookPage2==null)
- searchpathOrderingWorkbookPage2 = new SearchpathOrderingWorkbookPage(this);
- return searchpathOrderingWorkbookPage2;
- }
-
- private void tabChanged(Widget widget) {
- if (widget instanceof TabItem) {
- IBuildSearchPage newPage = (IBuildSearchPage) ((TabItem) widget).getData();
- if (currentPage != null) {
- List selection = currentPage.getSelection();
- if (!selection.isEmpty()) {
- newPage.setSelection(selection);
- }
- }
- currentPage = newPage;
- }
- }
-
- /**
- * Creates a runnable that sets the configured build paths.
- */
- public IRunnableWithProgress getRunnable() {
- final boolean wantNature = enableBeaninfo;
- final List searchPathEntries = wantNature ? getSearchpathOrderingPage().getElements() : null;
-
- return new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask(
- BeanInfoUIMessages.BeaninfoPathsBlock_UI__searchpath_operationdescription,
- 10);
- try {
- setBeaninfoSearchpath(wantNature, searchPathEntries, monitor);
- } catch (CoreException e) {
- throw new InvocationTargetException(e);
- } finally {
- monitor.done();
- }
- }
- };
- }
-
- private void setBeaninfoSearchpath(
- boolean wantNature,
- List searchPathEntries,
- IProgressMonitor monitor)
- throws CoreException {
-
- if (wantNature) {
- // create beaninfo nature
- if (!javaProject.getProject().hasNature(BeaninfoNature.NATURE_ID)) {
- addNatureIDToProject(javaProject.getProject(), BeaninfoNature.NATURE_ID, monitor);
- }
-
- BeaninfoNature nature = BeaninfoNature.getRuntime(javaProject.getProject());
- // Now build/set the search path.
- if (searchPathEntries.size() > 0) {
- IBeaninfosDocEntry[] sparray = new IBeaninfosDocEntry[searchPathEntries.size()];
- Iterator itr = searchPathEntries.iterator();
- int i = 0;
- while (itr.hasNext()) {
- BPListElement elem = (BPListElement) itr.next();
- sparray[i++] = elem.getEntry();
- }
- nature.setSearchPath(new BeaninfosDoc(sparray), monitor);
- } else
- nature.setSearchPath(null, monitor);
- } else {
- // Remove the nature, no longer wanted.
- removeNatureIDFromProject(javaProject.getProject(), BeaninfoNature.NATURE_ID, monitor);
- }
- }
-
- /**
- * Initializes the classpath for the given project. Multiple calls to init are allowed,
- * but all existing settings will be cleared and replace by the given or default paths.
- * @param project The java project to configure.
- */
- public void init(IJavaProject jproject) {
- this.javaProject = jproject;
- //TODO: labelProvider.setJavaProject(jproject);
-
- try {
- // If we have a config file, we will assume we have a nature. It will add it automatically
- // when we ask for the information. Even if we didn't have the nature, as soon as someone
- // asks for it, we would create it anyhow, and it would use the existing config file.
- // If we don't have a config file, we could have the nature, so we will check for that too.
- boolean haveConfigFile = jproject.getProject().getFile(BeaninfoNature.P_BEANINFO_SEARCH_PATH).exists();
- boolean haveNature = javaProject.getProject().hasNature(BeaninfoNature.NATURE_ID);
- enableBeaninfo = haveConfigFile || haveNature;
- if (haveNature || haveConfigFile) {
- BeaninfosDoc doc = BeaninfoNature.getRuntime(javaProject.getProject()).getSearchPath();
- IClasspathEntry[] raw = javaProject.getRawClasspath();
-
- List newSearchpath = new ArrayList();
- if (doc != null) {
- IBeaninfosDocEntry[] sp = doc.getSearchpath();
- for (int i = 0; i < sp.length; i++) {
- IBeaninfosDocEntry curr = sp[i];
- boolean isMissing = false;
- BPListElement elem = null;
- if (curr instanceof BeaninfoEntry) {
- BeaninfoEntry be = (BeaninfoEntry) curr;
-
- // get the resource, this tells if the beaninfos exist or not.
- Object[] paths = be.getClasspath(javaProject);
- if (paths != null && paths.length > 0) {
- for (int j = 0; !isMissing && j < paths.length; j++) {
- Object path = paths[j];
- if (path instanceof IProject)
- isMissing = !((IProject) path).exists();
- else if (path instanceof String) {
- File f = new File((String) path);
- isMissing = !f.exists();
- } else if (path instanceof IPath) {
- isMissing = true; // Plugins are invalid in BeaninfoConfig. They only apply within contributions.
- } else
- isMissing = true; // Invalid, so isMissing.
- }
- } else
- isMissing = true;
-
- elem = new BPBeaninfoListElement(be, getInitialSearchpaths(be), isMissing);
- } else {
- // Searchpath entry, see if we can find the raw classpath entry that it is for.
- boolean isExported = false;
- boolean isPackageMissing = true;
- isMissing = true; // Initially missing until we find it.
- SearchpathEntry ce = (SearchpathEntry) curr;
- int kind = ce.getKind();
- IPath path = ce.getPath();
- for (int j = 0; j < raw.length; j++) {
- if (raw[j].getEntryKind() == kind && raw[j].getPath().equals(path)) {
- isMissing = false;
- isExported = raw[j].isExported() || raw[j].getEntryKind() == IClasspathEntry.CPE_SOURCE;
- String packageName = ce.getPackage();
- if (packageName != null) {
- IPackageFragmentRoot[] roots = javaProject.findPackageFragmentRoots(raw[j]);
- for (int k = 0; k < roots.length; k++) {
- IPackageFragmentRoot iroot = roots[k];
- if (iroot.getPackageFragment(packageName).exists()) {
- isPackageMissing = false;
- break;
- }
- }
- } else
- isPackageMissing = false;
- break;
- }
- }
- elem = new BPSearchListElement(ce, isMissing, isPackageMissing, isExported);
- }
-
- newSearchpath.add(elem);
- }
- }
-
- // inits the dialog field
- setSearchOrderElements(newSearchpath);
-
- if (getPackagesPage() != null) {
- getPackagesPage().init(javaProject);
- getBeaninfosPage().init(javaProject);
- getSearchpathOrderingPage().init(javaProject);
- }
- } else {
- // No nature, disable,
- setEnableBeaninfo(false);
- }
- } catch (JavaModelException e) {
- setEnableBeaninfo(false);
- } catch (CoreException e) {
- setEnableBeaninfo(false);
- }
-
-// listenForClasspathChange();
- doStatusLineUpdate();
- }
-
- /**
- * Adds a nature to a project
- */
- private void addNatureIDToProject(IProject proj, String natureId, IProgressMonitor monitor)
- throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
- newNatures[prevNatures.length] = natureId;
- description.setNatureIds(newNatures);
- proj.setDescription(description, monitor);
- }
-
- private void removeNatureIDFromProject(IProject proj, String natureId, IProgressMonitor monitor)
- throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
- int indx = -1;
- for (int i = 0; i < prevNatures.length; i++) {
- if (prevNatures[i].equals(natureId)) {
- indx = i;
- break;
- }
- }
- if (indx == -1)
- return;
-
- String[] newNatures = new String[prevNatures.length - 1];
- if (newNatures.length != 0) {
- System.arraycopy(prevNatures, 0, newNatures, 0, indx);
- if (indx < newNatures.length)
- System.arraycopy(prevNatures, indx + 1, newNatures, indx, newNatures.length - indx);
- }
- description.setNatureIds(newNatures);
- proj.setDescription(description, monitor);
- }
-
- void doStatusLineUpdate() {
- statusChangeListener.statusChanged(getSearchpathOrderingPage().getStatus());
- }
-
- /*
- * searchOrder dialog must never have all of elements set
- * directly. Must come through here first so that we can
- * make sure updates occur in correct sequence, else
- * we will wind up with entries being marked as unexported
- * when they really are exported.
- */
- public void setSearchOrderElements(List newElements) {
- ArrayList exportedEntries = new ArrayList(newElements.size());
- for (Iterator iter = newElements.iterator(); iter.hasNext();) {
- BPListElement element = (BPListElement) iter.next();
- if (element.isExported())
- exportedEntries.add(element);
- }
-
- getSearchpathOrderingPage().setElements(newElements);
- getSearchpathOrderingPage().setCheckedElements(exportedEntries);
- }
-
- /*
- * Create the Searchpath elements for a BeaninfoElement.
- * Return null if not to update.
- */
- private BPSearchListElement[] getInitialSearchpaths(BeaninfoEntry infoEntry) {
-
- // We can only verify the existence of packages within beaninfos that are
- // located within a project on the desktop. Otherwise we can't find out what
- // packages are in them.
- IPackageFragmentRoot[] roots = null;
-
- if (infoEntry.getKind() != BeaninfoEntry.BIE_PLUGIN) {
- IClasspathEntry resolved = JavaCore.getResolvedClasspathEntry(infoEntry.getClasspathEntry());
- IResource res = workspaceRoot.findMember(resolved.getPath());
- if (res != null && res.exists()) {
- if (res instanceof IProject) {
- // It is a project itself.
- IJavaProject jp = (IJavaProject) JavaCore.create(res);
- try {
- if (jp != null)
- roots = jp.getPackageFragmentRoots(); // All of the roots in the project are applicable.
- } catch (JavaModelException e) {
- }
- } else {
- // It is within another project
- IProject containingProject = res.getProject();
- IJavaProject jp = JavaCore.create(containingProject);
- if (jp != null) {
- // The roots if this is in the classpath of this project
- try {
- IPackageFragmentRoot root = jp.findPackageFragmentRoot(resolved.getPath());
- if (root != null)
- roots = new IPackageFragmentRoot[] { root };
- } catch (JavaModelException e) {
- }
- }
- }
- }
- }
-
- SearchpathEntry[] entries = infoEntry.getSearchPaths();
- BPSearchListElement[] packageElements = new BPSearchListElement[entries.length];
- for (int i = 0;
- i < entries.length;
- i++) { // Searchpath entry, see if we can find the raw classpath entry that it is for.
- boolean isPackageMissing = roots != null;
- // If roots is null, then the package isn't missing because we can't test for it.
- SearchpathEntry ce = entries[i];
- if (roots != null) {
- String packageName = ce.getPackage();
- for (int k = 0; k < roots.length; k++) {
- IPackageFragmentRoot iroot = roots[k];
- if (iroot.getPackageFragment(packageName).exists()) {
- isPackageMissing = false;
- break;
- }
- }
- }
- packageElements[i] = new BPSearchListElement(ce, false, isPackageMissing, false);
- }
-
- return packageElements;
- }
-
-
- public static List getSelectedList(ISelection selection){
- List selectedList = null;
- if(selection!=null && !selection.isEmpty() && selection instanceof IStructuredSelection){
- IStructuredSelection structuredSelection = (IStructuredSelection) selection;
- selectedList = new ArrayList(Arrays.asList(structuredSelection.toArray()));
- }
- return selectedList;
- }
-
- public boolean isBeaninfoEnabled(){
- return enableBeaninfo;
- }
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosPropertyPage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosPropertyPage.java
deleted file mode 100644
index 1950ca8..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosPropertyPage.java
+++ /dev/null
@@ -1,209 +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.jem.internal.beaninfo.ui;
-/*
-
-
- */
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
-import org.eclipse.ui.dialogs.PropertyPage;
-
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-/**
- * Property page for configuring Beaninfo path
- */
-public class BeaninfosPropertyPage extends PropertyPage implements IStatusChangeListener {
-
- /**
- * Applies the status to the status line of a dialog page.
- *
- * @param page the dialog page
- * @param status the status
- */
- public static void applyToStatusLine(DialogPage page, IStatus status) {
- String message= status.getMessage();
- switch (status.getSeverity()) {
- case IStatus.OK:
- page.setMessage(message, IMessageProvider.NONE);
- page.setErrorMessage(null);
- break;
- case IStatus.WARNING:
- page.setMessage(message, IMessageProvider.WARNING);
- page.setErrorMessage(null);
- break;
- case IStatus.INFO:
- page.setMessage(message, IMessageProvider.INFORMATION);
- page.setErrorMessage(null);
- break;
- default:
- if (message.length() == 0) {
- message= null;
- }
- page.setMessage(null);
- page.setErrorMessage(message);
- break;
- }
- }
-
- private BeaninfoPathsBlock fBuildPathsBlock;
- private IResourceChangeListener listener;
- private IProject project;
-
- /*
- * @see PreferencePage#createControl(Composite)
- */
- protected Control createContents(Composite parent) {
-// when we get help working.
-// WorkbenchHelp.setHelp(parent, new DialogPageContextComputer(this, IJavaHelpContextIds.BUILD_PATH_PROPERTY_PAGE));
-
- // ensure the page has no special buttons
- noDefaultAndApplyButton();
-
- project= getProject();
- if (project == null || !isJavaProject(project)) {
- return createWithoutJava(parent);
- } else if (!project.isOpen()) {
- return createForClosedProject(parent);
- } else {
- return createWithJava(parent);
- }
- }
-
- /**
- * Content for valid projects.
- */
- private Control createWithJava(Composite parent) {
- IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
- fBuildPathsBlock= new BeaninfoPathsBlock(root, this);
- final IJavaProject jproject = JavaCore.create(project);
- fBuildPathsBlock.init(jproject);
- final IPath classpathfile = project.getFile(".classpath").getFullPath(); //$NON-NLS-1$
- listener = new IResourceChangeListener() {
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- if (fBuildPathsBlock != null) {
- if (event.getDelta().findMember(classpathfile) != null)
- getControl().getDisplay().asyncExec(new Runnable() { // Can be called outside of display loop
- public void run() {
- fBuildPathsBlock.init(jproject);
- }
- });
- }
- }
- };
- project.getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE);
-
- return fBuildPathsBlock.createControl(parent);
- }
-
- /**
- * Content for non-Java projects.
- */
- private Control createWithoutJava(Composite parent) {
- Label label= new Label(parent, SWT.LEFT);
- label.setText(BeanInfoUIMessages.BeaninfoPropertiesPage_INFO__nojavaproject);
-
- fBuildPathsBlock= null;
- setValid(true);
- return label;
- }
-
- /**
- * Content for closed projects.
- */
- private Control createForClosedProject(Composite parent) {
- Label label= new Label(parent, SWT.LEFT);
- label.setText(BeanInfoUIMessages.BeaninfoPropertiesPage_INFO__closedproject);
-
- fBuildPathsBlock= null;
- setValid(true);
- return label;
- }
-
- private IProject getProject() {
- IAdaptable adaptable= getElement();
- if (adaptable != null) {
- IJavaElement elem= (IJavaElement) adaptable.getAdapter(IJavaElement.class);
- if (elem instanceof IJavaProject) {
- return ((IJavaProject) elem).getProject();
- }
- }
- return null;
- }
-
- private boolean isJavaProject(IProject proj) {
- try {
- return proj.hasNature(JavaCore.NATURE_ID);
- } catch (CoreException e) {
- JEMUIPlugin.getPlugin().getLogger().log(e.getStatus());
- }
- return false;
- }
-
- /*
- * @see IPreferencePage#performOk
- */
- public boolean performOk() {
- if (fBuildPathsBlock != null) {
- IRunnableWithProgress runnable= fBuildPathsBlock.getRunnable();
-
- IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(runnable);
- Shell shell= getControl().getShell();
- try {
- PlatformUI.getWorkbench().getProgressService().run(false, false, op);
- } catch (InvocationTargetException e) {
- String title= BeanInfoUIMessages.Beaninfo_UI__errortitle;
- String message= BeanInfoUIMessages.Beaninfo_UI__error;
- ExceptionHandler.handle(e, shell, title, message);
- return false;
- } catch (InterruptedException e) {
- // cancelled
- return false;
- }
- }
- return true;
- }
-
- /**
- * @see IStatusChangeListener#statusChanged
- */
- public void statusChanged(IStatus status) {
- setValid(!status.matches(IStatus.ERROR));
- applyToStatusLine(this, status);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
- */
- public void dispose() {
- if (listener != null)
- project.getWorkspace().removeResourceChangeListener(listener);
- listener = null;
- super.dispose();
- }
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosWorkbookPage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosWorkbookPage.java
deleted file mode 100644
index 32aa884..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosWorkbookPage.java
+++ /dev/null
@@ -1,640 +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.jem.internal.beaninfo.ui;
-
-import java.util.*;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.StatusDialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoEntry;
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-public class BeaninfosWorkbookPage implements IBuildSearchPage{
-
- private static final String DIALOGSTORE_LASTVARIABLE = JEMUIPlugin.PI_BEANINFO_UI + ".lastvar"; //$NON-NLS-1$
-
- // a dialog to choose a variable
- private class VariableSelectionDialog extends StatusDialog implements IStatusChangeListener {
- private VariableSelectionBlock fVariableSelectionBlock;
- IDialogSettings dialogSettings= JEMUIPlugin.getPlugin().getDialogSettings();
-
- public VariableSelectionDialog(Shell parent, List existingPaths) {
- super(parent);
- setTitle("New Variable Classpath Entry"); //$NON-NLS-1$
- String initVar= dialogSettings.get(DIALOGSTORE_LASTVARIABLE);
- fVariableSelectionBlock= new VariableSelectionBlock(this, existingPaths, null, initVar, false);
- }
-
- /*
- * @see Windows#configureShell
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
-// WorkbenchHelp.setHelp(newShell, IJavaHelpContextIds.VARIABLE_SELECTION_DIALOG);
- }
-
- /*
- * @see StatusDialog#createDialogArea()
- */
- protected Control createDialogArea(Composite parent) {
- Composite composite= (Composite)super.createDialogArea(parent);
-
- Label message= new Label(composite, SWT.WRAP);
- message.setText("New Variable Classpath Entry"); //$NON-NLS-1$
- message.setLayoutData(new GridData());
-
- Control inner= fVariableSelectionBlock.createControl(composite);
- inner.setLayoutData(new GridData(GridData.FILL_BOTH));
- return composite;
- }
-
- /*
- * @see Dialog#okPressed()
- */
- protected void okPressed() {
- dialogSettings.put(DIALOGSTORE_LASTVARIABLE, getVariable().segment(0));
- super.okPressed();
- }
-
- /*
- * @see IStatusChangeListener#statusChanged()
- */
- public void statusChanged(IStatus status) {
- updateStatus(status);
- }
-
- public IPath getVariable() {
- return fVariableSelectionBlock.getVariablePath();
- }
- }
-
-
- //controls
- private Composite javaProjectsComposite = null;
- private Label label = null;
- private Table table = null;
- private Composite buttonsBar = null;
- private Button addFoldersbutton = null;
- private Button addJarsButton = null;
- private Button addExtJarsButton = null;
- private Button addVariableButton = null;
- private Button addProjectButton = null;
- private Button modifyPathsButton = null;
- private Button removeButton = null;
- private Label spacer2 = null;
- private Label spacer1 = null;
- // .. controls
- private TableViewer tableViewer;
-
- private BeaninfoPathsBlock beaninfoPathsBlock;
- private IJavaProject javaProject;
- private List beaninfosList;
- private IWorkspaceRoot workspaceRoot;
- private IClasspathEntry[] resolvedList;
- private IClasspathEntry[] rawList;
- private SearchPathListLabelProvider labelProvider;
-
- public BeaninfosWorkbookPage(IWorkspaceRoot workspaceRoot, BeaninfoPathsBlock beaninfoPathsBlock) {
- this.workspaceRoot = workspaceRoot;
- this.beaninfoPathsBlock = beaninfoPathsBlock;
- this.labelProvider = new SearchPathListLabelProvider();
- this.beaninfosList = new ArrayList();
- if(spacer1==null || spacer2==null){
- // just have SOME read access
- }
- }
-
- /**
- * This method initializes javaProjectsComposite
- *
- */
- public Control createControl(Composite parent) {
- GridData gridData = new org.eclipse.swt.layout.GridData();
- gridData.horizontalSpan = 2;
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- javaProjectsComposite = new Composite(parent, SWT.NONE);
- javaProjectsComposite.setLayout(gridLayout);
- label = new Label(javaProjectsComposite, SWT.NONE);
- label.setText(BeanInfoUIMessages.BeanInfosWorkbookPage_List_Text);
- label.setLayoutData(gridData);
- createTable();
- createButtonsBar();
- updateEnabledStates();
- return javaProjectsComposite;
- }
-
- /**
- * This method initializes table
- *
- */
- private void createTable() {
- GridData gridData1 = new org.eclipse.swt.layout.GridData();
- gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- gridData1.grabExcessHorizontalSpace = true;
- gridData1.grabExcessVerticalSpace = true;
- gridData1.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
- table = new Table(javaProjectsComposite, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
- table.setLayoutData(gridData1);
- table.addSelectionListener(new SelectionListener(){
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- });
- tableViewer = new TableViewer(table);
- tableViewer.setSorter(new BIListElementSorter());
- tableViewer.setContentProvider(new ArrayContentProvider());
- tableViewer.setLabelProvider(labelProvider);
- tableViewer.setInput(beaninfosList);
- }
-
- /**
- * This method initializes buttonsBar
- *
- */
- private void createButtonsBar() {
- RowLayout rowLayout = new RowLayout();
- rowLayout.type = org.eclipse.swt.SWT.VERTICAL;
- rowLayout.marginLeft = 3;
- rowLayout.fill = true;
- GridData gridData2 = new org.eclipse.swt.layout.GridData();
- gridData2.grabExcessVerticalSpace = true;
- gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
- gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.BEGINNING;
- buttonsBar = new Composite(javaProjectsComposite, SWT.NONE);
- buttonsBar.setLayoutData(gridData2);
- buttonsBar.setLayout(rowLayout);
- addFoldersbutton = new Button(buttonsBar, SWT.NONE);
- addFoldersbutton.setText(BeanInfoUIMessages.BeanInfosWorkbookPage_AddFolders);
- addFoldersbutton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- List beaninfoEntries = chooseClassContainers();
- addToBeaninfosList(beaninfoEntries);
- }
- });
- addJarsButton = new Button(buttonsBar, SWT.NONE);
- addJarsButton.setText(BeanInfoUIMessages.BeanInfosWorkbookPage_AddJARs);
- addJarsButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- List beaninfoEntries = chooseJarFiles();
- addToBeaninfosList(beaninfoEntries);
- }
- });
- addExtJarsButton = new Button(buttonsBar, SWT.NONE);
- addExtJarsButton.setText(BeanInfoUIMessages.BeanInfosWorkbookPage_AddExternalJAR);
- addExtJarsButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- List beaninfoEntries = chooseExtJarFiles();
- addToBeaninfosList(beaninfoEntries);
- }
- });
- addVariableButton = new Button(buttonsBar, SWT.NONE);
- addVariableButton.setText(BeanInfoUIMessages.BeanInfosWorkbookPage_AddVariable);
- addVariableButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- List beaninfoEntries = chooseVariableEntries();
- addToBeaninfosList(beaninfoEntries);
- }
- });
- addProjectButton = new Button(buttonsBar, SWT.NONE);
- addProjectButton.setText(BeanInfoUIMessages.BeanInfosWorkbookPage_AddProjects);
- addProjectButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- List beaninfoEntries = chooseProjects();
- addToBeaninfosList(beaninfoEntries);
- }
- });
- spacer1 = new Label(buttonsBar, SWT.NONE);
- modifyPathsButton = new Button(buttonsBar, SWT.NONE);
- modifyPathsButton.setText(BeanInfoUIMessages.BeanInfosWorkbookPage_ModifyPaths);
- modifyPathsButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- modifySearchPaths();
- }
- });
- spacer2 = new Label(buttonsBar, SWT.NONE);
- removeButton = new Button(buttonsBar, SWT.NONE);
- removeButton.setText(BeanInfoUIMessages.BeanInfosWorkbookPage_Remove);
- removeButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- List selected = BeaninfoPathsBlock.getSelectedList(tableViewer.getSelection());
- beaninfosList.removeAll(selected);
- tableViewer.refresh();
- pageChanged();
- }
- });
- }
-
- private List chooseVariableEntries() {
- // Remove existing variable entries in both the classpath and the beaninfopaths.
- // Don't want classpath ones because they should be of been selected in the search paths page.
- ArrayList existingPaths= new ArrayList();
- for (int i= 0; i < rawList.length; i++) {
- if (rawList[i].getEntryKind() == IClasspathEntry.CPE_VARIABLE) {
- existingPaths.add(rawList[i].getPath());
- }
- }
-
- List ours = beaninfosList;
- for (int i = 0; i < ours.size(); i++) {
- BPBeaninfoListElement bpb = (BPBeaninfoListElement) ours.get(i);
- if (bpb.getEntry().getKind() == IClasspathEntry.CPE_VARIABLE)
- existingPaths.add(bpb.getEntry().getPath());
- }
-
- VariableSelectionDialog dialog= new VariableSelectionDialog(addVariableButton.getShell(), existingPaths);
- if (dialog.open() == Window.OK) {
- IPath path= dialog.getVariable();
- IClasspathEntry cpe = JavaCore.newVariableEntry(path, null, null);
- IPath resolvedPath= JavaCore.getResolvedVariablePath(path);
- boolean isMissing = resolvedPath == null || !resolvedPath.toFile().isFile();
- return Collections.singletonList(new BPBeaninfoListElement(new BeaninfoEntry(cpe, null, true), null, isMissing));
- }
- return null;
- }
-
- private List chooseJarFiles() {
- IPath[] jarPaths = BuildPathDialogAccess.chooseJAREntries(addJarsButton.getShell(), javaProject.getPath(), getUsedJARFiles());
- if (jarPaths!=null) {
- List res= new ArrayList(jarPaths.length);
- for (int i= 0; i < jarPaths.length; i++) {
- BPBeaninfoListElement newGuy = newBPBeaninfoListElementFromFullpath(jarPaths[i]);
- if (newGuy != null)
- res.add(newGuy);
- }
- return res;
- }
- return null;
- }
-
- private List chooseExtJarFiles() {
- IPath[] extJARPaths = BuildPathDialogAccess.chooseExternalJAREntries(addExtJarsButton.getShell());
- List elems = null;
- if(extJARPaths!=null){
- elems = new ArrayList(extJARPaths.length);
- for (int i= 0; i < extJARPaths.length; i++) {
- BPBeaninfoListElement newGuy = newBPBeaninfoListElement(extJARPaths[i]);
- if (newGuy != null)
- elems.add(newGuy);
- }
- }
- return elems;
- }
-
- private BPBeaninfoListElement newBPBeaninfoListElement(IPath path) {
- // Create for an external, if not already used in either classpath or beaninfo path.
- // These can't be pre-selected out like for the other choose dialogs.
- for (int i = 0; i < resolvedList.length; i++) {
- IClasspathEntry cpe = resolvedList[i];
- if (cpe != null && cpe.getEntryKind() == IClasspathEntry.CPE_LIBRARY && cpe.getPath().equals(path))
- return null; // Already exists.
- }
-
- // Now see if one of ours.
- List ours = beaninfosList;
- for (int i = 0; i < ours.size(); i++) {
- BPBeaninfoListElement bpb = (BPBeaninfoListElement) ours.get(i);
- if (bpb.getEntry().getKind() == IClasspathEntry.CPE_LIBRARY && bpb.getEntry().getPath().equals(path))
- return null; // Already exists
- }
-
- IClasspathEntry cpe = JavaCore.newLibraryEntry(path, null, null);
- BeaninfoEntry bie = new BeaninfoEntry(cpe, null, true);
- return new BPBeaninfoListElement(bie, null, false);
- }
-
-
- private IPath[] getUsedJARFiles() {
- // Jars used by both the classpath and the beaninfo search path.
- // Don't want jars used by classpath because those would then be
- // in the buildpath and user would select paths through the search path page.
- ArrayList res= new ArrayList();
- for (int i= 0; i < resolvedList.length; i++) {
- if (resolvedList[i] != null && resolvedList[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- IPath path = resolvedList[i].getPath();
- IResource resource= workspaceRoot.findMember(path);
- if (resource instanceof IFile)
- res.add(path);
- }
- }
-
- List bilist= beaninfosList;
- for (int i= 0; i < bilist.size(); i++) {
- BPListElement elem= (BPListElement)bilist.get(i);
- if (elem.getEntry().getKind() == IClasspathEntry.CPE_LIBRARY) {
- IPath path = elem.getEntry().getPath();
- IResource resource= workspaceRoot.findMember(path);
- if (resource instanceof IFile)
- res.add(path);
- }
- }
- return (IPath[]) res.toArray(new IPath[res.size()]);
- }
-
- /**
- * Create a new BPListElement for the given object.
- */
- private BPBeaninfoListElement newBPBeaninfoListElement(IResource element) {
- if (element instanceof IContainer || element instanceof IFile) {
- return newBPBeaninfoListElementFromFullpath(element.getFullPath());
- }
- return null;
- }
-
- /**
- * Create a new BPListElement for the given object.
- * @since 1.2.0
- */
- private BPBeaninfoListElement newBPBeaninfoListElementFromFullpath(IPath fullPath) {
- if(fullPath!=null){
- IClasspathEntry cpe = JavaCore.newLibraryEntry(fullPath, null, null);
- BeaninfoEntry bie = new BeaninfoEntry(cpe, null, true);
- return new BPBeaninfoListElement(bie, null, false);
- }
- return null;
- }
-
- private List chooseClassContainers() {
- Class[] acceptedClasses= new Class[] { IFolder.class };
- ISelectionStatusValidator validator= new TypedElementSelectionValidator(acceptedClasses, true);
-
- acceptedClasses= new Class[] { IProject.class, IFolder.class };
-
- ViewerFilter filter= new TypedViewerFilter(acceptedClasses, getUsedContainers());
-
- ILabelProvider lp= new WorkbenchLabelProvider();
- ITreeContentProvider cp= new WorkbenchContentProvider();
-
- ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(addFoldersbutton.getShell(), lp, cp);
- dialog.setValidator(validator);
- dialog.setTitle(BeanInfoUIMessages.BeanInfosWorkbookPage_SelectionDialog_Classes_Title);
- dialog.setMessage(BeanInfoUIMessages.BeanInfosWorkbookPage_SelectionDialog_Classes_Prompt);
- dialog.addFilter(filter);
- dialog.setInput(workspaceRoot);
- dialog.setInitialSelection(javaProject.getProject());
-
- if (dialog.open() == Window.OK) {
- Object[] elements= dialog.getResult();
- List res= new ArrayList(elements.length);
- for (int i= 0; i < elements.length; i++) {
- BPBeaninfoListElement newGuy = newBPBeaninfoListElement((IResource) elements[i]);
- if (newGuy != null)
- res.add(newGuy);
- }
- return res;
- }
- return null;
- }
-
- private IContainer[] getUsedContainers() {
- // Containers used by both the classpath and the beaninfo search path.
- // Don't want containers used by classpath because those would then be
- // in the buildpath and user would select paths through the search path page.
- ArrayList res= new ArrayList();
- try {
- IPath outputLocation= javaProject.getOutputLocation();
- if (outputLocation != null) {
- IResource resource= workspaceRoot.findMember(outputLocation);
- if (resource instanceof IContainer) {
- res.add(resource);
- }
- }
- } catch (JavaModelException e) {
- // ignore it here, just log
- JEMUIPlugin.getPlugin().getLogger().log(e.getStatus());
- }
-
- for (int i= 0; i < resolvedList.length; i++) {
- if (resolvedList[i] != null && resolvedList[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- IResource resource= workspaceRoot.findMember(resolvedList[i].getPath());
- if (resource instanceof IContainer) {
- res.add(resource);
- }
- }
- }
-
- List bilist= beaninfosList;
- for (int i= 0; i < bilist.size(); i++) {
- BPListElement elem= (BPListElement)bilist.get(i);
- if (elem.getEntry().getKind() == IClasspathEntry.CPE_SOURCE) {
- IResource resource= workspaceRoot.findMember(elem.getEntry().getPath());
- res.add(resource);
- }
- }
- return (IContainer[]) res.toArray(new IContainer[res.size()]);
- }
-
-
- protected void addToBeaninfosList(final List toAdd){
- if (beaninfosList != null && toAdd!=null) {
- beaninfosList.addAll(toAdd);
- tableViewer.refresh();
- table.getDisplay().asyncExec(new Runnable(){
- public void run() {
- tableViewer.setSelection(new StructuredSelection(toAdd));
- }
- });
- pageChanged();
- }
- }
-
- private void pageChanged() {
- if (javaProject != null) {
- // already initialized
- updateSearchpathList();
- }
- }
-
- private void updateSearchpathList() {
- List searchelements = beaninfoPathsBlock.getSearchpathOrderingPage().getElements();
-
- List beaninfoelements = new ArrayList(beaninfosList);
-
- boolean changeDone = false;
- // First go through the search path and remove any Beaninfo list elements that
- // are not in this pages beaninfos list.
- for (ListIterator spitr = searchelements.listIterator(searchelements.size());
- spitr.hasPrevious();
- ) {
- BPListElement element = (BPListElement) spitr.previous();
- if (element instanceof BPBeaninfoListElement && !beaninfoelements.remove(element)) {
- // Search element and not found in packages list so remove it from searchpath list.
- spitr.remove();
- changeDone = true;
- }
- }
- // Any left over in beaninfos list are new and need to be added.
- searchelements.addAll(beaninfoelements);
- changeDone = changeDone || !beaninfoelements.isEmpty();
-
- if (changeDone)
- beaninfoPathsBlock.setSearchOrderElements(searchelements);
- }
-
- public void init(IJavaProject javaProject){
- this.javaProject = javaProject;
- labelProvider.setJavaProject(this.javaProject);
- try {
- rawList = this.javaProject.getRawClasspath();
- resolvedList = new IClasspathEntry[rawList.length];
- for (int i = 0; i < rawList.length; i++) {
- resolvedList[i] = JavaCore.getResolvedClasspathEntry(rawList[i]);
- }
- } catch (JavaModelException e) {
- rawList = resolvedList = new IClasspathEntry[0];
- }
- updateBeaninfosList();
- }
-
- private void updateBeaninfosList() {
- List spelements = beaninfoPathsBlock.getSearchpathOrderingPage().getElements();
-
- List biElements = new ArrayList(spelements.size());
- for (int i = 0; i < spelements.size(); i++) {
- BPListElement spe = (BPListElement) spelements.get(i);
- if (spe instanceof BPBeaninfoListElement) {
- biElements.add(spe);
- }
- }
- beaninfosList.clear();
- beaninfosList.addAll(biElements);
- if(tableViewer!=null && !table.isDisposed())
- tableViewer.refresh();
- }
-
- public List getSelection() {
- if(tableViewer!=null)
- return BeaninfoPathsBlock.getSelectedList(tableViewer.getSelection());
- return null;
- }
-
- public void setSelection(List selection) {
- if(tableViewer!=null)
- tableViewer.setSelection(new StructuredSelection(selection));
- }
-
-
- protected void updateButtons(){
- List selected = BeaninfoPathsBlock.getSelectedList(tableViewer.getSelection());
- addExtJarsButton.setEnabled(beaninfoPathsBlock.isBeaninfoEnabled());
- addFoldersbutton.setEnabled(beaninfoPathsBlock.isBeaninfoEnabled());
- addJarsButton.setEnabled(beaninfoPathsBlock.isBeaninfoEnabled());
- addProjectButton.setEnabled(beaninfoPathsBlock.isBeaninfoEnabled());
- addVariableButton.setEnabled(beaninfoPathsBlock.isBeaninfoEnabled());
-
- removeButton.setEnabled(selected!=null && selected.size()>0 && beaninfoPathsBlock.isBeaninfoEnabled());
- modifyPathsButton.setEnabled(selected!=null && selected.size()==1 && beaninfoPathsBlock.isBeaninfoEnabled());
- }
-
- private List chooseProjects() {
- Class[] acceptedClasses= new Class[] { IJavaProject.class };
- ISelectionStatusValidator validator= new TypedElementSelectionValidator(acceptedClasses, true);
-
- List allProjects = null;
- try {
- allProjects = new ArrayList(Arrays.asList(javaProject.getJavaModel().getChildren()));
- } catch(JavaModelException e) {
- allProjects = Collections.EMPTY_LIST;
- }
- allProjects.removeAll(getUsedProjects());
-
- ILabelProvider lp= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-
- ElementListSelectionDialog dialog= new ElementListSelectionDialog(addProjectButton.getShell(), lp);
- dialog.setValidator(validator);
- dialog.setTitle(BeanInfoUIMessages.BeanInfosWorkbookPage_SelectionDialog_Projects_Title);
- dialog.setMessage(BeanInfoUIMessages.BeanInfosWorkbookPage_SelectionDialog_Projects_Prompt);
- dialog.setElements(allProjects.toArray());
-
- if (dialog.open() == Window.OK) {
- Object[] elements= dialog.getResult();
- List res= new ArrayList(elements.length);
- for (int i= 0; i < elements.length; i++) {
- try {
- IClasspathEntry cpe = JavaCore.newProjectEntry(((IJavaProject) elements[i]).getCorrespondingResource().getFullPath());
- BeaninfoEntry bie = new BeaninfoEntry(cpe, null, true);
- res.add(new BPBeaninfoListElement(bie, null, false));
- } catch(JavaModelException e) {
- }
- }
- return res;
- }
- return null;
- }
-
- private List getUsedProjects() {
- // Projects used by both the classpath and the beaninfo search path.
- // Don't want projects used by classpath because those would then be
- // in the buildpath and user would select paths through the search path page.
- ArrayList res= new ArrayList();
- res.add(javaProject); // Plus our own project is used.
- IJavaModel jmodel = javaProject.getJavaModel();
- for (int i= 0; i < resolvedList.length; i++) {
- if (resolvedList[i] != null && resolvedList[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- res.add(jmodel.getJavaProject(resolvedList[i].getPath().segment(0)));
- }
- }
-
- List bilist= beaninfosList;
- for (int i= 0; i < bilist.size(); i++) {
- BPListElement elem= (BPListElement)bilist.get(i);
- if (elem.getEntry().getKind() == IClasspathEntry.CPE_PROJECT)
- res.add(jmodel.getJavaProject(elem.getEntry().getPath().segment(0)));
- }
- return res;
- }
-
- private void modifySearchPaths() {
- // Bring up the dialog for modifying search paths of a particular beaninfo entry.
- BPBeaninfoListElement elem = (BPBeaninfoListElement) ((IStructuredSelection)tableViewer.getSelection()).getFirstElement(); // There should only be one, button not enabled if none or more than one selected.
- BeaninfoEntrySearchpathDialog dialog = new BeaninfoEntrySearchpathDialog(modifyPathsButton.getShell(), elem, javaProject);
- dialog.open();
- }
-
- protected void updateEnabledStates(){
- updateButtons();
- table.setEnabled(beaninfoPathsBlock.isBeaninfoEnabled());
- label.setEnabled(beaninfoPathsBlock.isBeaninfoEnabled());
- }
-
- public void setBeaninfoEnabled(boolean enable) {
- if(javaProjectsComposite!=null && !javaProjectsComposite.isDisposed()){
- // ui populated
- updateEnabledStates();
- }
- }
-
-} // @jve:decl-index=0:visual-constraint="10,10"
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/ExceptionHandler.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/ExceptionHandler.java
deleted file mode 100644
index 96935d2..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/ExceptionHandler.java
+++ /dev/null
@@ -1,81 +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.jem.internal.beaninfo.ui;
-
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-/**
- *
- *
- * @since 1.2.0
- */
-public class ExceptionHandler {
-
- /**
- *
- * @param e
- * @param shell
- * @param title
- * @param message
- *
- * @since 1.2.0
- */
- public static void handle(InvocationTargetException e, Shell shell, String title, String message) {
- Throwable target= e.getTargetException();
- if (target instanceof CoreException) {
- handle((CoreException)target, shell, title, message);
- } else {
- JEMUIPlugin.getPlugin().getLogger().log(e);
- if (e.getMessage() != null && e.getMessage().length() > 0) {
- displayMessageDialog(e, e.getMessage(), shell, title, message);
- } else {
- displayMessageDialog(e, target.getMessage(), shell, title, message);
- }
- }
- }
-
- public static void handle(CoreException e, Shell shell, String title, String message) {
- JEMUIPlugin.getPlugin().getLogger().log(e);
- IStatus status= e.getStatus();
- if (status != null) {
- ErrorDialog.openError(shell, title, message, status);
- } else {
- displayMessageDialog(e, e.getMessage(), shell, title, message);
- }
- }
-
- private static void displayMessageDialog(Throwable t, String exceptionMessage, Shell shell, String title, String message) {
- StringWriter msg= new StringWriter();
- if (message != null) {
- msg.write(message);
- msg.write("\n\n"); //$NON-NLS-1$
- }
- if (exceptionMessage == null || exceptionMessage.length() == 0)
- msg.write(BeanInfoUIMessages.ExceptionHandler_errordialog_msg_seelog);
- else
- msg.write(exceptionMessage);
- MessageDialog.openError(shell, title, msg.toString());
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/IBuildSearchPage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/IBuildSearchPage.java
deleted file mode 100644
index ff6670b..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/IBuildSearchPage.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.jem.internal.beaninfo.ui;
-
-import java.util.List;
-
-public interface IBuildSearchPage {
-
- public List getSelection();
- public void setSelection(List selection);
- public void setBeaninfoEnabled(boolean enable);
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/IStatusChangeListener.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/IStatusChangeListener.java
deleted file mode 100644
index ae3fce5..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/IStatusChangeListener.java
+++ /dev/null
@@ -1,32 +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.jem.internal.beaninfo.ui;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Status change listener
- *
- * @since 1.2.0
- */
-public interface IStatusChangeListener {
-
- /**
- * Notifies this listener that the given status has changed.
- *
- * @param status the new status
- */
- void statusChanged(IStatus status);
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/ImageDisposer.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/ImageDisposer.java
deleted file mode 100644
index 6891ff7..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/ImageDisposer.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.jem.internal.beaninfo.ui;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Image;
-
-/**
- *
- *
- * @since 1.2.0
- */
-public class ImageDisposer implements DisposeListener {
-
- private Image[] fImages;
-
- public ImageDisposer(Image image) {
- this(new Image[] { image });
- }
-
- public ImageDisposer(Image[] images) {
- Assert.isNotNull(images);
- fImages= images;
- }
-
- /*
- * @see WidgetListener#widgetDisposed
- */
- public void widgetDisposed(DisposeEvent e) {
- if (fImages != null) {
- for (int i= 0; i < fImages.length; i++) {
- fImages[i].dispose();
- }
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/OverlayComposite.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/OverlayComposite.java
deleted file mode 100644
index be40bf4..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/OverlayComposite.java
+++ /dev/null
@@ -1,200 +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 Apr 27, 2005 by Gili Mendel
- *
-
-
- */
-package org.eclipse.jem.internal.beaninfo.ui;
-
-import java.util.*;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-//TODO: This class was dropped in 3.1 M7 from org.eclipse.ui.internal.misc
-// We made local copy for the time being. Need to investigate if this is file
-// for us given that the OverlayIcon (replacement) is internal
-public class OverlayComposite extends CompositeImageDescriptor {
-
- private ImageData backgroundImage;
-
- private ImageData leftImage;
-
- private ImageData rightImage;
-
- private ImageData topImage;
-
- private ImageData bottomImage;
-
- private List foregroundImages = new ArrayList();
-
- /**
- * Create an instance of this class.
- */
- public OverlayComposite(ImageData background) {
- backgroundImage = background;
- }
-
- /**
- * Add the passed image to this descriptor's collection of images to
- * be composed together to create an image.
- */
- public void addForegroundImage(ImageData image) {
- foregroundImages.add(image);
- }
-
- /**
- *Superimpose self's images within the given bounds by means of #drawImage
- *
- *@see CompositeImage#drawImage(ImageData src,int ox,int oy)
- */
- protected void drawCompositeImage(int width, int height) {
- //draw background
- drawImage(backgroundImage, getLeftBound(), getTopBound());
-
- //draw foreground images
- Iterator e = foregroundImages.iterator();
- while (e.hasNext())
- drawImage(((ImageData) e.next()), getLeftBound(), getTopBound());
-
- //draw extensions
- if (topImage != null)
- drawImage(topImage, getLeftBound(), 0);
- if (bottomImage != null)
- drawImage(bottomImage, getLeftBound(), height - bottomImage.height);
- if (leftImage != null)
- drawImage(leftImage, 0, getTopBound());
- if (rightImage != null)
- drawImage(rightImage, width - rightImage.width, getTopBound());
-
- }
-
- /**
- * @see Object#equals
- */
- public boolean equals(Object o) {
- if (!(o instanceof OverlayComposite)) {
- return false;
- }
- OverlayComposite other = (OverlayComposite) o;
-
- return equals(backgroundImage, other.backgroundImage)
- && equals(leftImage, other.leftImage)
- && equals(rightImage, other.rightImage)
- && equals(topImage, other.topImage)
- && equals(bottomImage, other.bottomImage)
- && equals(foregroundImages, other.foregroundImages);
- }
-
- /**
- * Private utility for comparing two possibly-null objects.
- */
- private boolean equals(Object o1, Object o2) {
- return o1 == null ? o2 == null : o1.equals(o2);
- }
-
- /**
- * Answer the left-most coordinate that the main image can draw to
- *
- * @return int
- */
- protected int getLeftBound() {
- if (leftImage == null)
- return 0;
-
- return leftImage.width;
- }
-
- /**
- * Answer self's size, as determined by the size of the initially-
- * provided base-level image
- */
- protected Point getSize() {
- //start with basic size
- Point size = new Point(backgroundImage.width, backgroundImage.height);
-
- //overlays may increase size.
- if (topImage != null)
- size.y += topImage.height;
-
- if (bottomImage != null)
- size.y += bottomImage.height;
-
- if (leftImage != null)
- size.x += leftImage.width;
-
- if (rightImage != null)
- size.x += rightImage.width;
-
- return size;
- }
-
- /**
- * Answer the top-most coordinate that the main image can draw to
- *
- * @return int
- */
- protected int getTopBound() {
- if (topImage == null)
- return 0;
-
- return topImage.height;
- }
-
- /**
- * @see Object#hashCode
- */
- public int hashCode() {
- return hashCode(backgroundImage) + hashCode(leftImage)
- + hashCode(rightImage) + hashCode(topImage)
- + hashCode(bottomImage) + hashCode(foregroundImages);
- }
-
- /**
- * Private utility for getting the hashCode for an
- * object that may be null.
- */
- private int hashCode(Object o) {
- return o == null ? 0 : o.hashCode();
- }
-
- /**
- * Set the image to be drawn below the primary overlay region.
- */
- public void setBottomExtension(ImageData value) {
- bottomImage = value;
- }
-
- /**
- * Set the image to be drawn to the left of the primary overlay region.
- */
- public void setLeftExtension(ImageData value) {
- leftImage = value;
- }
-
- /**
- * Set the image to be drawn to the right of the primary overlay region.
- */
- public void setRightExtension(ImageData value) {
- rightImage = value;
- }
-
- /**
- * Set the image to be drawn above the primary overlay region.
- */
- public void setTopExtension(ImageData value) {
- topImage = value;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackageOnlyContentProvider.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackageOnlyContentProvider.java
deleted file mode 100644
index 9b8690f..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackageOnlyContentProvider.java
+++ /dev/null
@@ -1,57 +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.jem.internal.beaninfo.ui;
-/*
-
-
- */
-
-
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-
-import org.eclipse.jdt.core.IPackageFragment;
-import java.util.*;
-/**
- * A content provider which will only go down to the package level,
- * it won't explore further. The advantage of this is so that plus signs ('+')
- * won't show up on packages. The Filter technique could be used to not
- * show the children, but this still shows the plus sign.
- *
- * Also, if the element is a java.util.List, then that list will be returned
- * as the children. This allows for a root to be composed instead of being
- * one of the standard Java Elements.
- */
-
-public class PackageOnlyContentProvider extends StandardJavaElementContentProvider {
-
- /**
- * If the element is a list, return the iterator on it.
- * Else send it up the chain.
- */
- public Object[] getChildren(Object element) {
- if (element instanceof List)
- return ((List) element).toArray();
- return super.getChildren(element);
- }
-
- /**
- * If the element is a list and it is not empty, it has children,
- * if it is a IPackageFragment it does not,
- * else send it up the chain.
- */
- public boolean hasChildren(Object element) {
- if (element instanceof List)
- return !((List) element).isEmpty();
- if (element instanceof IPackageFragment)
- return false;
- return super.hasChildren(element);
- }
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackagesWorkbookPage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackagesWorkbookPage.java
deleted file mode 100644
index 2cbddb2..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackagesWorkbookPage.java
+++ /dev/null
@@ -1,464 +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.jem.internal.beaninfo.ui;
-
-import java.util.*;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.*;
-
-import org.eclipse.jem.internal.beaninfo.core.SearchpathEntry;
-
-public class PackagesWorkbookPage implements IBuildSearchPage {
-
- /**
- * Validator for this workbook page to verify the selections on Choose page.
- * @version 1.0
- * @author
- */
- public static class ChoosePackagesSelectionValidator implements ISelectionStatusValidator {
-
- private IStatus fgErrorStatus = StatusHelper.ERROR_STATUS; //$NON-NLS-1$
- private IStatus fgOKStatus = StatusHelper.OK_STATUS;
-
- public ChoosePackagesSelectionValidator() {
- }
-
- /*
- * @see ISelectionValidator#validate(Object)
- */
- public IStatus validate(Object[] selection) {
- if (isValid(selection)) {
- return fgOKStatus;
- }
- return fgErrorStatus;
- }
-
- private boolean isValid(Object[] selection) {
- if (selection.length == 0)
- return false;
-
- for (int i = 0; i < selection.length; i++) {
- if (selection[i] instanceof IPackageFragment)
- continue; // Fragments are always valid
- return false;
- }
-
- return true;
- }
-
- }
-
-
- private Label label = null;
- private Table table = null;
- private Composite buttonBar = null;
- private Button choosePackagesButton = null;
- private Button chooseDefPathsButton = null;
- private Label spacer1 = null;
- private Button removeButton = null;
- // ... ui
-
- private IJavaProject javaProject = null;
- private SearchPathListLabelProvider labelProvider = null;
- private BeaninfoPathsBlock beaninfosPathsBlock = null;
- private IPackageFragmentRoot[][] rootsPerRawEntry;
- private IClasspathEntry[] rawList;
- private TableViewer tableViewer;
- private List packagesList = null;
- private Composite top;
-
- public PackagesWorkbookPage(IWorkspaceRoot workspaceRoot, BeaninfoPathsBlock beaninfosPathsBlock) {
- this.beaninfosPathsBlock = beaninfosPathsBlock;
- this.packagesList = new ArrayList();
- this.labelProvider = new SearchPathListLabelProvider();
- }
-
- public Control createControl(Composite parent){
- top = new Composite(parent, SWT.NONE);
- GridData gridData = new org.eclipse.swt.layout.GridData();
- gridData.horizontalSpan = 2;
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- top.setLayout(gridLayout);
- label = new Label(top, SWT.NONE);
- label.setText(BeanInfoUIMessages.PackagesWorkbook_LabelText);
- label.setLayoutData(gridData);
- createTable();
- createButtonBar();
- top.setSize(new Point(300, 200));
- updateEnabledStates();
- if(spacer1==null){
- //TODO:
- }
- return top;
- }
-
- /**
- * This method initializes table
- *
- */
- private void createTable() {
- GridData gridData1 = new org.eclipse.swt.layout.GridData();
- gridData1.grabExcessVerticalSpace = true;
- gridData1.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
- gridData1.grabExcessHorizontalSpace = true;
- gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- table = new Table(top, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
- table.setLayoutData(gridData1);
- table.addSelectionListener(new org.eclipse.swt.events.SelectionListener() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- updateButtons();
- }
- public void widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent e) {
- widgetSelected(e);
- }
- });
- tableViewer = new TableViewer(table);
- tableViewer.setLabelProvider(labelProvider);
- tableViewer.setSorter(new SPListElementSorter());
- tableViewer.setContentProvider(new ArrayContentProvider());
- tableViewer.setInput(packagesList);
- }
-
- /**
- * This method initializes buttonBar
- *
- */
- private void createButtonBar() {
- RowLayout rowLayout = new RowLayout();
- rowLayout.type = org.eclipse.swt.SWT.VERTICAL;
- rowLayout.fill = true;
- GridData gridData2 = new org.eclipse.swt.layout.GridData();
- gridData2.grabExcessVerticalSpace = true;
- gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
- gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.BEGINNING;
- buttonBar = new Composite(top, SWT.NONE);
- buttonBar.setLayoutData(gridData2);
- buttonBar.setLayout(rowLayout);
- choosePackagesButton = new Button(buttonBar, SWT.NONE);
- choosePackagesButton.setText(BeanInfoUIMessages.PackagesWorkbook_ChoosePackages);
- choosePackagesButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- final List elementsToAdd = choosePackages();
- addToPackagesList(elementsToAdd);
- }
- });
- chooseDefPathsButton = new Button(buttonBar, SWT.NONE);
- chooseDefPathsButton.setText(BeanInfoUIMessages.PackagesWorkbook_ChooseDefinedPaths);
- chooseDefPathsButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- List elementsToAdd = chooseDefined();
- addToPackagesList(elementsToAdd);
- }
- });
- spacer1 = new Label(buttonBar, SWT.NONE);
- removeButton = new Button(buttonBar, SWT.NONE);
- removeButton.setText(BeanInfoUIMessages.PackagesWorkbook_Remove);
- removeButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- List selected = BeaninfoPathsBlock.getSelectedList(tableViewer.getSelection());
- packagesList.removeAll(selected);
- tableViewer.refresh();
- pageChanged();
- }
- });
- }
-
- private void addToPackagesList(final List toAdd){
- if (toAdd != null && !toAdd.isEmpty()) {
- packagesList.addAll(toAdd);
- tableViewer.refresh();
- table.getDisplay().asyncExec(new Runnable(){
- public void run() {
- tableViewer.setSelection(new StructuredSelection(toAdd));
- }
- });
- pageChanged();
- }
- }
-
- public void init(IJavaProject jproject) {
- javaProject = jproject;
- labelProvider.setJavaProject(jproject);
- try {
- rawList = javaProject.getRawClasspath();
- rootsPerRawEntry = new IPackageFragmentRoot[rawList.length][];
- for (int i = 0; i < rawList.length; i++) {
- rootsPerRawEntry[i] = javaProject.findPackageFragmentRoots(rawList[i]);
- }
- } catch (JavaModelException e) {
- rawList = new IClasspathEntry[0];
- rootsPerRawEntry = new IPackageFragmentRoot[0][];
- }
- updatePackagesList();
- }
-
- public List getSelection() {
- return BeaninfoPathsBlock.getSelectedList(tableViewer.getSelection());
- }
-
- public void setSelection(List selection) {
- tableViewer.setSelection(new StructuredSelection(selection));
- }
-
- private void updatePackagesList() {
- List spelements = beaninfosPathsBlock.getSearchpathOrderingPage().getElements();
-
- List packageElements = new ArrayList(spelements.size());
- for (int i = 0; i < spelements.size(); i++) {
- BPListElement spe = (BPListElement) spelements.get(i);
- if (spe instanceof BPSearchListElement) {
- packageElements.add(spe);
- }
- }
- packagesList.clear();
- packagesList.addAll(packageElements);
- if(tableViewer!=null && !table.isDisposed())
- tableViewer.refresh();
- }
-
- /**
- * Choose the packages that should be in the search path.
- */
- private List choosePackages() {
-
- ISelectionStatusValidator validator = new ChoosePackagesSelectionValidator();
-
- // Show up to the package fragment, don't show any contents of it.
- Class[] acceptedClasses =
- new Class[] { IJavaProject.class, IPackageFragmentRoot.class, IPackageFragment.class };
- Object[] rejectedFragments = getFilteredExistingEntries();
-
- // Only show package fragments that have children (i.e. there classes in it, not interested
- // in intermediate ones that have no classes defined in them. Those are filtered out.
- TypedViewerFilter filter = new TypedViewerFilter(acceptedClasses, rejectedFragments) {
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (super.select(viewer, parentElement, element)) {
- if (element instanceof IPackageFragment) {
- IPackageFragment pkg = (IPackageFragment) element;
- try {
- return pkg.hasChildren();
- } catch (JavaModelException e) {
- }
- return false;
- } else
- return true;
- }
- return false;
- }
- };
-
- ITreeContentProvider provider = new PackageOnlyContentProvider();
-
- ILabelProvider labelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
- ElementTreeSelectionDialog dialog =
- new ElementTreeSelectionDialog(top.getShell(), labelProvider, provider);
- dialog.setTitle(BeanInfoUIMessages.BeaninfoPathsBlock_UI__addsearchpath_title);
-
- dialog.setValidator(validator);
- dialog.setMessage(BeanInfoUIMessages.BeaninfoPathsBlock_UI__addsearchpath_description);
- dialog.addFilter(filter);
- dialog.setInput(javaProject);
-
- if (dialog.open() == Window.OK) {
- Object[] elements = dialog.getResult();
- List newElements = new ArrayList(elements.length);
- for (int i = 0; i < elements.length; i++) {
- BPListElement newGuy = newBPListElement(elements[i]);
- if (newGuy != null)
- newElements.add(newGuy);
- }
- return newElements;
- }
- return Collections.EMPTY_LIST;
- }
-
- /**
- * Create a new BPListElement for the given object.
- */
- protected BPListElement newBPListElement(Object element) {
- SearchpathEntry se = null;
- boolean isExported = false;
- IPackageFragment frag = (IPackageFragment) element;
- // Need to find corresponding raw class path entry.
- IPackageFragmentRoot root = (IPackageFragmentRoot) frag.getParent(); // Get frag root.
- for (int i = 0; i < rootsPerRawEntry.length; i++) {
- for (int j = 0; j < rootsPerRawEntry[i].length; j++) {
- if (rootsPerRawEntry[i][j].equals(root)) {
- isExported = rawList[i].isExported() || rawList[i].getEntryKind() == IClasspathEntry.CPE_SOURCE;
- se = new SearchpathEntry(rawList[i].getEntryKind(), rawList[i].getPath(), frag.getElementName());
- break;
- }
- }
- }
-
- return new BPSearchListElement(se, false, false, isExported);
- }
-
- /**
- * Return the list of entries that already are in the search path
- * so that they don't show up in the list.
- */
- protected Object[] getFilteredExistingEntries() {
- try {
- IPackageFragmentRoot[] roots = javaProject.getPackageFragmentRoots();
- List entries = packagesList;
- List fragments = new ArrayList(entries.size());
- Iterator itr = entries.iterator();
- while (itr.hasNext()) {
- BPListElement elem = (BPListElement) itr.next();
- if (elem instanceof BPSearchListElement) {
- BPSearchListElement bse = (BPSearchListElement) elem;
- fragments.addAll(getPackages(bse, roots));
- }
- }
- return fragments.toArray();
- } catch (JavaModelException e) {
- }
- return new Object[0];
- }
-
- /**
- * Find the package fragments for this package entry.
- */
- protected List getPackages(BPSearchListElement element, IPackageFragmentRoot[] roots) {
- String packageName = ((SearchpathEntry) element.getEntry()).getPackage();
- if (packageName == null)
- return Collections.EMPTY_LIST;
-
- try {
- List packages = new ArrayList(10);
- for (int i = 0; i < roots.length; i++) {
- IJavaElement[] pfs = roots[i].getChildren();
- for (int j = 0; j < pfs.length; j++)
- if (pfs[j].getElementType() == IJavaElement.PACKAGE_FRAGMENT
- && pfs[j].getElementName().equals(packageName)) {
- packages.add(pfs[j]);
- break;
- }
- }
- return packages;
- } catch (JavaModelException e) {
- }
- return Collections.EMPTY_LIST;
- }
- /**
- * Choose the pre-defined search paths that should be in the search path.
- */
- private List chooseDefined() {
-
- // Current pre-defined ones are only pre-reqed projects.
- // The list of inputs will not contain any already in the path.
- // We will create them here and if not selected they will thrown away.
- // The assumption is that there are not very many and our SearchPathListLabelProvider does
- // a good job of showing them. Otherwise we would need to come up with one that can show
- // IJavaProjects when we get them.
- List inputs = new ArrayList();
- List currentList = packagesList;
- for (int i = 0; i < rawList.length; i++) {
- if (rawList[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- boolean exists = false;
- for (int j = 0; j < currentList.size(); j++) {
- BPSearchListElement bse = (BPSearchListElement) currentList.get(j);
- if (bse.getEntry().getKind() == IClasspathEntry.CPE_PROJECT && rawList[i].getPath().equals(bse.getEntry().getPath())) {
- exists = true;
- break;
- }
- }
-
- if (!exists)
- inputs.add(new BPSearchListElement(new SearchpathEntry(IClasspathEntry.CPE_PROJECT, rawList[i].getPath(), null), false, false, rawList[i].isExported()));
- }
- }
-
- ILabelProvider labelProvider1 = new SearchPathListLabelProvider(javaProject);
- ElementListSelectionDialog dialog =
- new ElementListSelectionDialog(top.getShell(), labelProvider1);
- dialog.setTitle(BeanInfoUIMessages.PackagesWorkbook_SelectionDialog_DefinedPaths_Title);
-
- dialog.setMessage(BeanInfoUIMessages.PackagesWorkbook_SelectionDialog_DefinedPaths_Message);
- dialog.setElements(inputs.toArray());
-
- if (dialog.open() == Window.OK)
- return Arrays.asList(dialog.getResult());
- else
- return Collections.EMPTY_LIST;
- }
-
- protected void updateButtons(){
- chooseDefPathsButton.setEnabled(beaninfosPathsBlock.isBeaninfoEnabled());
- choosePackagesButton.setEnabled(beaninfosPathsBlock.isBeaninfoEnabled());
-
- List selected = BeaninfoPathsBlock.getSelectedList(tableViewer.getSelection());
- removeButton.setEnabled(selected!=null && selected.size()>0 && beaninfosPathsBlock.isBeaninfoEnabled());
- }
-
- /**
- * Something important about the page changed - perform update.
- *
- * @since 1.2.0
- */
- protected void pageChanged(){
- updateSearchpathList();
- }
-
- private void updateSearchpathList() {
- List searchelements = beaninfosPathsBlock.getSearchpathOrderingPage().getElements();
-
- List packageelements = packagesList;
-
- boolean changeDone = false;
- // First go through the search path and remove any SearchListElements that are
- // not in the search packages list from this page.
- for (ListIterator spitr = searchelements.listIterator(searchelements.size());
- spitr.hasPrevious();
- ) {
- BPListElement element = (BPListElement) spitr.previous();
- if (element instanceof BPSearchListElement && !packageelements.remove(element)) {
- // Search element and not found in packages list so remove it from searchpath list.
- spitr.remove();
- changeDone = true;
- }
- }
- // Any left over in packages list are new and need to be added.
- searchelements.addAll(packageelements);
- changeDone = changeDone || !packageelements.isEmpty();
-
- if (changeDone)
- beaninfosPathsBlock.setSearchOrderElements(searchelements);
- }
-
- protected void updateEnabledStates(){
- updateButtons();
- table.setEnabled(beaninfosPathsBlock.isBeaninfoEnabled());
- label.setEnabled(beaninfosPathsBlock.isBeaninfoEnabled());
- }
-
- public void setBeaninfoEnabled(boolean enable) {
- if(top!=null && !top.isDisposed())
- updateEnabledStates();
- }
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SPListElementSorter.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SPListElementSorter.java
deleted file mode 100644
index 5614705..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SPListElementSorter.java
+++ /dev/null
@@ -1,88 +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.jem.internal.beaninfo.ui;
-/*
-
-
- */
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-import org.eclipse.jem.internal.beaninfo.core.SearchpathEntry;
-
-/**
- * Sorter for sorting BPSearchListElements within the main list.
- * It is not to be used on elements within a specific beaninfo entry.
- *
- * @version 1.0
- * @author
- */
-public class SPListElementSorter extends ViewerSorter {
-
- /*
- * @see ViewerSorter#category(Object)
- */
- public int category(Object obj) {
- if (obj instanceof BPSearchListElement) {
- BPSearchListElement element = (BPSearchListElement) obj;
-
- switch (((SearchpathEntry) element.getEntry()).getKind()) {
- case IClasspathEntry.CPE_LIBRARY:
- return 4;
- case IClasspathEntry.CPE_PROJECT:
- return 1;
- case IClasspathEntry.CPE_SOURCE:
- return 0;
- case IClasspathEntry.CPE_VARIABLE:
- return 3;
- case IClasspathEntry.CPE_CONTAINER:
- return 2;
- }
- }
- return super.category(obj);
- }
-
- /*
- * @see ViewerSorter#compare()
- */
- public int compare(Viewer viewer, Object e1, Object e2) {
- int cat1 = category(e1);
- int cat2 = category(e2);
-
- if (cat1 != cat2)
- return cat1 - cat2;
-
- if ((e1 instanceof BPSearchListElement) && (e2 instanceof BPSearchListElement)) {
- SearchpathEntry p1 = (SearchpathEntry) ((BPSearchListElement) e1).getEntry();
- SearchpathEntry p2 = (SearchpathEntry) ((BPSearchListElement) e2).getEntry();
-
- // Compare first within path, then packages within each path.
- int c = p1.getPath().toString().compareTo(p2.getPath().toString());
- if (c == 0) {
- // Within same path, so now sort by package, if there are any.
- String pkg1 = p1.getPackage();
- String pkg2 = p2.getPackage();
- if (pkg1 == null)
- pkg1 = ""; // For null, use an empty string //$NON-NLS-1$
- if (pkg2 == null)
- pkg2 = ""; //$NON-NLS-1$
- return pkg1.compareTo(pkg2);
- } else
- return c; // Paths are not equal, so sort via path.
- }
- return super.compare(viewer, e1, e2);
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchPathListLabelProvider.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchPathListLabelProvider.java
deleted file mode 100644
index 1315368..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchPathListLabelProvider.java
+++ /dev/null
@@ -1,375 +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
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.ui;
-/*
-
-
- */
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-public class SearchPathListLabelProvider extends LabelProvider {
-
- IWorkspaceRoot fRoot;
- IJavaProject javaProject;
-
- // Shared images
- private Image fJarIcon, fExtJarIcon;
- private Image fFolderImage, fProjectImage, fVariableImage, fLibraryImage;
- private Image fMissingJarImage, fMissingVariableImage;
- private Image fMissingFolderImage, fMissingProjectImage;
- private Image fPackageImage;
-
- // Local images, will be disposed.
- private Image fPluginImage;
- private Image fBeanImage;
- private Image fMissingPackageImage;
- private Image fBlankImage;
- private Image fMissingLibraryImage;
- private HashMap fBeanedImages = new HashMap(); // Key of image to a composite with a bean attached
- private HashMap fPackagedImages = new HashMap();
- private HashMap fMissingPackagedImages = new HashMap();
- private HashMap fNormalImages = new HashMap(); // Need to composite normal images w/blank so that they are the same size as the composited ones.
- // Key of image to a composite with a package attached
-
- public SearchPathListLabelProvider() {
- this(null);
- }
-
- protected Image getWarningOverlayImage(Image image){
- ImageDescriptor decoratedImageDescriptor =
- new JavaElementImageDescriptor(
- ImageDescriptor.createFromImage(image),
- JavaElementImageDescriptor.WARNING,
- new Point(16,16));
- return decoratedImageDescriptor.createImage();
- }
-
- public SearchPathListLabelProvider(IJavaProject javaProject) {
- this.javaProject = javaProject;
-
- fRoot = ResourcesPlugin.getWorkspace().getRoot();
- ISharedImages jdtSharedImages = JavaUI.getSharedImages();
-
- fJarIcon = jdtSharedImages.getImage(ISharedImages.IMG_OBJS_JAR);
- fExtJarIcon = jdtSharedImages.getImage(ISharedImages.IMG_OBJS_EXTERNAL_ARCHIVE);
- fFolderImage = jdtSharedImages.getImage(ISharedImages.IMG_OBJS_PACKFRAG_ROOT);
-
- fVariableImage = jdtSharedImages.getImage(ISharedImages.IMG_OBJS_CLASSPATH_VAR_ENTRY);
-
- fLibraryImage = jdtSharedImages.getImage(ISharedImages.IMG_OBJS_LIBRARY);
-
- IWorkbench workbench = PlatformUI.getWorkbench();
- fProjectImage = workbench.getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT);
-
- fMissingJarImage = getWarningOverlayImage(jdtSharedImages.getImage(ISharedImages.IMG_OBJS_JAR));
- fMissingVariableImage = getWarningOverlayImage(jdtSharedImages.getImage(ISharedImages.IMG_OBJS_CLASSPATH_VAR_ENTRY));
- fMissingFolderImage = getWarningOverlayImage(jdtSharedImages.getImage(ISharedImages.IMG_OBJS_PACKFRAG_ROOT));
- fMissingProjectImage = workbench.getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT_CLOSED);
-
- fPackageImage = jdtSharedImages.getImage(ISharedImages.IMG_OBJS_PACKAGE);
-
- Rectangle r = fLibraryImage.getBounds();
- Point s = new Point(r.width, r.height);
- JavaElementImageDescriptor jed = new JavaElementImageDescriptor(jdtSharedImages.getImageDescriptor(ISharedImages.IMG_OBJS_LIBRARY), JavaElementImageDescriptor.WARNING, s);
- fMissingLibraryImage = jed.createImage();
- Bundle bundle = JEMUIPlugin.getPlugin().getBundle();
- URL url = FileLocator.find(bundle, new Path("icons/plugin_obj.gif"), null); //$NON-NLS-1$
- if (url != null)
- fPluginImage = ImageDescriptor.createFromURL(url).createImage();
- else
- fPluginImage = ImageDescriptor.getMissingImageDescriptor().createImage();
-
- url = FileLocator.find(bundle, new Path("icons/javabean.gif"), null); //$NON-NLS-1$
- if (url != null)
- fBeanImage = ImageDescriptor.createFromURL(url).createImage();
- else
- fBeanImage = ImageDescriptor.getMissingImageDescriptor().createImage();
-
- url = FileLocator.find(bundle, new Path("icons/package_obj_missing.gif"), null); //$NON-NLS-1$
- if (url != null)
- fMissingPackageImage = ImageDescriptor.createFromURL(url).createImage();
- else
- fMissingPackageImage = ImageDescriptor.getMissingImageDescriptor().createImage();
-
- url = FileLocator.find(bundle, new Path("icons/blank.gif"), null); //$NON-NLS-1$
- if (url != null)
- fBlankImage = ImageDescriptor.createFromURL(url).createImage();
- else
- fBlankImage = ImageDescriptor.getMissingImageDescriptor().createImage();
- }
-
- public void setJavaProject(IJavaProject javaProject) {
- this.javaProject = javaProject;
- }
-
- public String getText(Object element) {
- if (element instanceof BPListElement) {
- BPListElement bpentry = (BPListElement) element;
- IBeaninfosDocEntry docEntry = bpentry.getEntry();
- IPath path = docEntry.getPath();
- String pathString = null;
- switch (docEntry.getKind()) {
- case IClasspathEntry.CPE_LIBRARY :
- IResource resource = fRoot.findMember(path);
- if (resource instanceof IFolder) {
- pathString =
- MessageFormat.format(BeanInfoUIMessages.LabelProvider_Library_Folder, new Object[] { path.makeRelative().toString()});
- } else if (resource instanceof IFile) {
- if (VariableSelectionBlock.isArchivePath(path)) {
- // Internal library
- String[] args =
- new String[] { path.lastSegment(), path.removeLastSegments(1).makeRelative().toString()};
- pathString = MessageFormat.format(BeanInfoUIMessages.LabelProvider_Library__PathLastSegment_PathRelative_, args);
- }
- } else {
- if (VariableSelectionBlock.isArchivePath(path)) {
- // External library
- String[] args =
- new String[] { path.lastSegment(), path.removeLastSegments(1).toString()};
- pathString = MessageFormat.format(BeanInfoUIMessages.LabelProvider_Library__PathLastSegment_PathExceptLast_, args);
- } else {
- // should not come here
- pathString = path.makeRelative().toString();
- }
- }
- break;
-
- case IClasspathEntry.CPE_VARIABLE :
- String name = path.makeRelative().toString();
- IPath entryPath = JavaCore.getClasspathVariable(path.segment(0));
- if (entryPath != null)
- pathString =
- MessageFormat.format(
- BeanInfoUIMessages.LabelProvider_Variable__name_PathOSString_,
- new Object[] { name, entryPath.append(path.removeFirstSegments(1)).toOSString()});
- else
- pathString = name;
- break;
-
- case IClasspathEntry.CPE_CONTAINER:
- try {
- IClasspathContainer c = JavaCore.getClasspathContainer(path, javaProject);
- if (c != null) {
- pathString = c.getDescription();
- break;
- }
- } catch (JavaModelException e) {
- }
- pathString = path.toString();
- break;
-
- case IClasspathEntry.CPE_PROJECT :
- pathString = path.toString();
- break;
-
- case IClasspathEntry.CPE_SOURCE :
- pathString = path.makeRelative().toString();
- break;
-
- case BeaninfoEntry.BIE_PLUGIN :
- pathString = path.toString();
- break;
- default :
- // no path, so probably a search entry within a beaninfo entry.
- }
-
- if (docEntry instanceof SearchpathEntry) {
- // There could be a package involved too if this is not a project or registered var entry
- String packageName = ((SearchpathEntry) docEntry).getPackage();
- if (packageName != null && packageName.length() > 0)
- if (pathString != null)
- return MessageFormat.format(BeanInfoUIMessages.LabelProvider__packageName_Path_, new Object[] { packageName, pathString });
- else
- return packageName;
- }
-
- if (pathString != null)
- return pathString;
- else
- return "?"; //$NON-NLS-1$
- }
- return super.getText(element);
- }
-
- public Image getImage(Object element) {
- Image returnedImage = null;
- boolean imageIsNormal = true; // Whether this is a normal sized image (which will need compositing with blank)
- if (element instanceof BPListElement) {
- BPListElement bpentry = (BPListElement) element;
- IBeaninfosDocEntry docEntry = bpentry.getEntry();
- IPath path = docEntry.getPath();
- Image pathImage = null;
- switch (docEntry.getKind()) {
- case IClasspathEntry.CPE_SOURCE :
- if (!bpentry.isMissing())
- pathImage = fFolderImage;
- else
- pathImage = fMissingFolderImage;
- break;
-
- case IClasspathEntry.CPE_LIBRARY :
- if (!bpentry.isMissing()) {
- IResource resource = fRoot.findMember(path);
- if (resource instanceof IFolder)
- pathImage = fFolderImage;
- else if (resource instanceof IFile)
- pathImage = fJarIcon;
- else
- pathImage = fExtJarIcon;
- } else
- pathImage = fMissingJarImage;
- break;
-
- case IClasspathEntry.CPE_PROJECT :
- if (!bpentry.isMissing())
- pathImage = fProjectImage;
- else
- pathImage = fMissingProjectImage;
- break;
-
- case IClasspathEntry.CPE_VARIABLE :
- if (!bpentry.isMissing())
- pathImage = fVariableImage;
- else
- pathImage = fMissingVariableImage;
- break;
-
- case IClasspathEntry.CPE_CONTAINER:
- if (!bpentry.isMissing())
- pathImage = fLibraryImage;
- else
- pathImage = fMissingLibraryImage;
- break;
-
- case BeaninfoEntry.BIE_PLUGIN:
- pathImage = fPluginImage;
- break;
-
- default :
- // probably a searchentry under beaninfo entry, no path icon to decorate.
- break;
- }
-
- if (bpentry instanceof BPSearchListElement) {
- SearchpathEntry se = (SearchpathEntry) docEntry;
- BPSearchListElement bpse = (BPSearchListElement) bpentry;
- if (se.getPackage() != null) {
- if (pathImage != null) {
- if (!bpse.isPackageMissing()) {
- // Need to decorate with a package symbol.
- imageIsNormal = false;
- returnedImage = (Image) fPackagedImages.get(pathImage); // See if we've already created the image
- if (returnedImage == null) {
- OverlayComposite oc = new OverlayComposite(pathImage.getImageData());
- oc.setRightExtension(fPackageImage.getImageData());
- returnedImage = oc.createImage();
- fPackagedImages.put(pathImage, returnedImage);
- }
- } else {
- // Need to decorate with a missing package symbol.
- imageIsNormal = false;
- returnedImage = (Image) fMissingPackagedImages.get(pathImage); // See if we've already created the image
- if (returnedImage == null) {
- OverlayComposite oc = new OverlayComposite(pathImage.getImageData());
- oc.setRightExtension(fMissingPackageImage.getImageData());
- returnedImage = oc.createImage();
- fMissingPackagedImages.put(pathImage, returnedImage);
- }
- }
- }
- }
-
- if (pathImage == null && returnedImage == null)
- if (!bpse.isPackageMissing())
- returnedImage = fPackageImage; // Just a package image
- else
- returnedImage = fMissingPackageImage; // Just the missing package image.
- else if (returnedImage == null)
- returnedImage = pathImage;
- } else {
- if (pathImage != null) {
- // It is a beaninfo entry, need to decorate with the bean.
- imageIsNormal = false;
- returnedImage = (Image) fBeanedImages.get(pathImage); // See if we've already created the image
- if (returnedImage == null) {
- OverlayComposite oc = new OverlayComposite(pathImage.getImageData());
- oc.setRightExtension(fBeanImage.getImageData());
- returnedImage = oc.createImage();
- fBeanedImages.put(pathImage, returnedImage);
- }
- }
- if (returnedImage == null)
- returnedImage = fBeanImage; // Shouldn't occur.
- }
- }
-
- if (imageIsNormal && returnedImage != null) {
- // We need to composite it with blank so that the result will be the same size
- // as composited images. If this isn't done, the viewer will stretch the image
- // to match the same size as the composited images and things will look aweful.
- Image newReturned = (Image) fNormalImages.get(returnedImage);
- if (newReturned == null) {
- OverlayComposite oc = new OverlayComposite(returnedImage.getImageData());
- oc.setRightExtension(fBlankImage.getImageData());
- newReturned = oc.createImage();
- fNormalImages.put(returnedImage, newReturned);
- }
- returnedImage = newReturned;
- }
- return returnedImage;
- }
-
- /*
- * @see IBaseLabelProvider#dispose()
- */
- public void dispose() {
- super.dispose();
-
- fPluginImage.dispose();
- fBeanImage.dispose();
- fMissingPackageImage.dispose();
- fBlankImage.dispose();
- fMissingLibraryImage.dispose();
- for (Iterator itr = fBeanedImages.values().iterator(); itr.hasNext();) {
- ((Image) itr.next()).dispose();
- }
- for (Iterator itr = fPackagedImages.values().iterator(); itr.hasNext();) {
- ((Image) itr.next()).dispose();
- }
- for (Iterator itr = fMissingPackagedImages.values().iterator(); itr.hasNext();) {
- ((Image) itr.next()).dispose();
- }
- for (Iterator itr = fNormalImages.values().iterator(); itr.hasNext();) {
- ((Image) itr.next()).dispose();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchpathOrderingWorkbookPage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchpathOrderingWorkbookPage.java
deleted file mode 100644
index b80146a..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchpathOrderingWorkbookPage.java
+++ /dev/null
@@ -1,326 +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.jem.internal.beaninfo.ui;
-
-import java.util.*;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-public class SearchpathOrderingWorkbookPage implements IBuildSearchPage{
-
- private Label label = null;
- private Table table = null;
- private Composite buttonBar = null;
- private Button upButton = null;
- private Button downButton = null;
- private Label spacer1 = null;
- private Button exportAllButton = null;
- private Button unExportAllButton = null;
- private IStatus status;
- private boolean inUpdate;
- private BeaninfoPathsBlock beaninfoPathsBlock;
- private Composite top;
- private CheckboxTableViewer tableViewer=null;
- private SearchPathListLabelProvider labelProvider;
-
- private List elements;
- private List selected;
- private List checked;
-
- public SearchpathOrderingWorkbookPage(BeaninfoPathsBlock beaninfoPathsBlock) {
- this.beaninfoPathsBlock = beaninfoPathsBlock;
- this.status = StatusHelper.OK_STATUS;
- this.labelProvider = new SearchPathListLabelProvider();
- this.elements = new ArrayList();
- }
-
- public Control createControl(Composite parent){
- top = new Composite(parent, SWT.NONE);
- GridData gridData = new org.eclipse.swt.layout.GridData();
- gridData.horizontalSpan = 2;
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- label = new Label(top, SWT.NONE);
- label.setText(BeanInfoUIMessages.BeaninfoPathsBlock_UI__searchpath_label);
- label.setLayoutData(gridData);
- createTable();
- top.setLayout(gridLayout);
- createButtonBar();
- top.setSize(new Point(300, 200));
- updateEnabledStates();
- if(spacer1==null){
- //TODO
- }
- return top;
- }
-
- /**
- * This method initializes table
- *
- */
- private void createTable() {
- GridData gridData1 = new org.eclipse.swt.layout.GridData();
- gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- gridData1.grabExcessHorizontalSpace = true;
- gridData1.grabExcessVerticalSpace = true;
- gridData1.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
- table = new Table(top, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CHECK | SWT.FULL_SELECTION);
- table.setLayoutData(gridData1);
- table.addSelectionListener(new SelectionListener(){
- public void widgetSelected(SelectionEvent e) {
- setSelection(BeaninfoPathsBlock.getSelectedList(tableViewer.getSelection()));
- updateButtons();
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- });
- tableViewer = new CheckboxTableViewer(table);
- tableViewer.setContentProvider(new ArrayContentProvider());
- tableViewer.setLabelProvider(labelProvider);
- tableViewer.setInput(elements);
- if(getSelection()!=null)
- tableViewer.setSelection(new StructuredSelection(getSelection()));
- if(checked!=null)
- tableViewer.setCheckedElements(checked.toArray());
- tableViewer.addCheckStateListener(new ICheckStateListener(){
- public void checkStateChanged(CheckStateChangedEvent event) {
- pageChanged();
- }
- });
- }
-
- /**
- * This method initializes composite
- *
- */
- private void createButtonBar() {
- RowLayout rowLayout = new RowLayout();
- rowLayout.type = org.eclipse.swt.SWT.VERTICAL;
- rowLayout.fill = true;
- GridData gridData2 = new org.eclipse.swt.layout.GridData();
- gridData2.grabExcessVerticalSpace = true;
- gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
- gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.BEGINNING;
- buttonBar = new Composite(top, SWT.NONE);
- buttonBar.setLayoutData(gridData2);
- buttonBar.setLayout(rowLayout);
- upButton = new Button(buttonBar, SWT.NONE);
- upButton.setText(BeanInfoUIMessages.BeaninfoPathsBlock_UI__searchpath_up_button);
- upButton.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- Iterator selItr = getSelection().iterator();
- while (selItr.hasNext()) {
- Object element = selItr.next();
- int oldIndex = elements.indexOf(element);
- if(oldIndex>0){
- elements.remove(element);
- elements.add(--oldIndex, element);
- }
- }
- tableViewer.refresh();
- pageChanged();
- }
- });
- downButton = new Button(buttonBar, SWT.NONE);
- downButton.setText(BeanInfoUIMessages.BeaninfoPathsBlock_UI__searchpath_down_button);
- downButton.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- Iterator selItr = getSelection().iterator();
- while (selItr.hasNext()) {
- Object element = selItr.next();
- int oldIndex = elements.indexOf(element);
- if(oldIndex<(elements.size()-1)){
- elements.remove(element);
- elements.add(++oldIndex, element);
- }
- }
- tableViewer.refresh();
- pageChanged();
- }
- });
- spacer1 = new Label(buttonBar, SWT.NONE);
- exportAllButton = new Button(buttonBar, SWT.NONE);
- exportAllButton.setText(BeanInfoUIMessages.BeanInfoPathsBlock_ExportAll);
- exportAllButton.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- setCheckedElements(getElements());
- }
- });
- unExportAllButton = new Button(buttonBar, SWT.NONE);
- unExportAllButton.setText(BeanInfoUIMessages.BeanInfoPathsBlock_UnexportAll);
- unExportAllButton.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- setCheckedElements(null);
- }
- });
- }
-
- public List getElements() {
- return new ArrayList(elements);
- }
-
- public void setElements(List elements){
- this.elements.clear();
- this.elements.addAll(elements);
- if(tableViewer!=null){
- tableViewer.refresh();
- updateButtons();
- }
- }
-
- public void init(IJavaProject javaProject) {
- labelProvider.setJavaProject(javaProject);
- }
-
- public void setCheckedElements(List exportedEntries) {
- this.checked = exportedEntries;
- if(tableViewer!=null && !table.isDisposed()){
- tableViewer.setCheckedElements(checked!=null ? checked.toArray() : new Object[0]);
- updateButtons();
- }
- pageChanged();
- }
-
- public boolean isChecked(BPListElement currElement) {
- if(tableViewer!=null){
- return tableViewer.getChecked(currElement);
- }
- return checked!=null && checked.contains(currElement);
- }
-
- public List getSelection() {
- return selected;
- }
-
- public void setSelection(List selection) {
- this.selected = selection;
- if(tableViewer!=null && !table.isDisposed()){
- tableViewer.setSelection(new StructuredSelection(selection!=null?selection : new ArrayList()));
- updateButtons();
- }
- }
-
- public void pageChanged(){
- updateSearchPathStatus();
- beaninfoPathsBlock.doStatusLineUpdate();
- }
-
- protected void updateButtons(){
- upButton.setEnabled(canMoveUp() && beaninfoPathsBlock.isBeaninfoEnabled());
- downButton.setEnabled(canMoveDown() && beaninfoPathsBlock.isBeaninfoEnabled());
- exportAllButton.setEnabled(elements!=null && beaninfoPathsBlock.isBeaninfoEnabled());
- unExportAllButton.setEnabled(elements!=null && beaninfoPathsBlock.isBeaninfoEnabled());
- }
-
- private boolean canMoveDown() {
- int[] indc= table.getSelectionIndices();
- int k= elements.size() - 1;
- for (int i= indc.length - 1; i >= 0 ; i--, k--) {
- if (indc[i] != k) {
- return true;
- }
- }
- return false;
- }
-
- private boolean canMoveUp() {
- int[] indc= table.getSelectionIndices();
- for (int i= 0; i < indc.length; i++) {
- if (indc[i] != i) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Validates the search path.
- */
- private void updateSearchPathStatus() {
- if (inUpdate)
- return;
- try {
- inUpdate = true;
-
- status = StatusHelper.OK_STATUS;
-
- List elements = getElements();
-
- boolean entryMissing = false;
-
- // Because of bug in setcheckedWithoutUpdate, which sets to true no matter what the state is, we need
- // to accumulate the checked elements and re-set them again after this so that they will be correct.
- ArrayList exported = new ArrayList();
-
- for (Iterator entries = elements.iterator(); entries.hasNext();) {
- BPListElement currElement = (BPListElement) entries.next();
-
- boolean isChecked = isChecked(currElement);
- if (currElement.canExportBeChanged()) {
- if (isChecked)
- exported.add(currElement);
- currElement.setExported(isChecked);
- } else {
- // fSearchOrder.setCheckedWithoutUpdate(currElement, currElement.isExported());
- if (currElement.isExported())
- exported.add(currElement);
- }
-
- entryMissing = entryMissing || currElement.isMissing();
- }
-
- // Now reset the checked states, due to bug
- setCheckedElements(exported);
-
- if (entryMissing) {
- status = new Status(IStatus.WARNING,
- JEMUIPlugin.getPlugin().getBundle().getSymbolicName(),
- IStatus.WARNING,
- BeanInfoUIMessages.BeaninfoPathsBlock_UI__warning_EntryMissing,
- null);
- }
- } finally {
- inUpdate = false;
- }
- }
-
- public IStatus getStatus() {
- return status;
- }
-
- public void setBeaninfoEnabled(boolean enable) {
- if(top!=null && !top.isDisposed())
- updateEnabledStates();
- }
-
- private void updateEnabledStates() {
- updateButtons();
- table.setEnabled(beaninfoPathsBlock.isBeaninfoEnabled());
- label.setEnabled(beaninfoPathsBlock.isBeaninfoEnabled());
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/StatusHelper.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/StatusHelper.java
deleted file mode 100644
index 7223442..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/StatusHelper.java
+++ /dev/null
@@ -1,67 +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.jem.internal.beaninfo.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-
-public class StatusHelper {
-
- public static final IStatus OK_STATUS = createStatus(IStatus.OK, ""); //$NON-NLS-1$
- public static final IStatus ERROR_STATUS = createStatus(IStatus.ERROR, ""); //$NON-NLS-1$
-
- /**
- * Creates a status with the provided severity and message
- *
- * @param severity
- * @param message
- * @return
- *
- * @since 1.2.0
- */
- public static IStatus createStatus(int severity, String message){
- return new Status(severity,
- JEMUIPlugin.getPlugin().getBundle().getSymbolicName(),
- severity, message, null);
- }
-
- /**
- * Finds the most severe status from a array of stati.
- * An error is more severe than a warning, and a warning is more severe
- * than ok.
- *
- * @param status
- * @return
- *
- * @since 1.2.0
- */
- public static IStatus getMostSevere(IStatus[] status) {
- IStatus max= null;
- for (int i= 0; i < status.length; i++) {
- IStatus curr= status[i];
- if (curr.matches(IStatus.ERROR)) {
- return curr;
- }
- if (max == null || curr.getSeverity() > max.getSeverity()) {
- max= curr;
- }
- }
- return max;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/TypedElementSelectionValidator.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/TypedElementSelectionValidator.java
deleted file mode 100644
index 64f317c..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/TypedElementSelectionValidator.java
+++ /dev/null
@@ -1,99 +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.jem.internal.beaninfo.ui;
-
-import java.util.Collection;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-
-public class TypedElementSelectionValidator implements ISelectionStatusValidator {
-
- private IStatus fgErrorStatus= StatusHelper.ERROR_STATUS;
- private IStatus fgOKStatus= StatusHelper.OK_STATUS;
-
- private Class[] fAcceptedTypes;
- private boolean fAllowMultipleSelection;
- private Collection fRejectedElements;
-
- /**
- * @param acceptedTypes The types accepted by the validator
- * @param allowMultipleSelection If set to <code>true</code>, the validator
- * allows multiple selection.
- */
- public TypedElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection) {
- this(acceptedTypes, allowMultipleSelection, null);
- }
-
- /**
- * @param acceptedTypes The types accepted by the validator
- * @param allowMultipleSelection If set to <code>true</code>, the validator
- * allows multiple selection.
- * @param rejectedElements A list of elements that are not accepted
- */
- public TypedElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection, Collection rejectedElements) {
- Assert.isNotNull(acceptedTypes);
- fAcceptedTypes= acceptedTypes;
- fAllowMultipleSelection= allowMultipleSelection;
- fRejectedElements= rejectedElements;
- }
-
- /*
- * @see org.eclipse.ui.dialogs.ISelectionValidator#isValid(java.lang.Object)
- */
- public IStatus validate(Object[] elements) {
- if (isValid(elements)) {
- return fgOKStatus;
- }
- return fgErrorStatus;
- }
-
- private boolean isOfAcceptedType(Object o) {
- for (int i= 0; i < fAcceptedTypes.length; i++) {
- if (fAcceptedTypes[i].isInstance(o)) {
- return true;
- }
- }
- return false;
- }
-
- private boolean isRejectedElement(Object elem) {
- return (fRejectedElements != null) && fRejectedElements.contains(elem);
- }
-
- protected boolean isSelectedValid(Object elem) {
- return true;
- }
-
- private boolean isValid(Object[] selection) {
- if (selection.length == 0) {
- return false;
- }
-
- if (!fAllowMultipleSelection && selection.length != 1) {
- return false;
- }
-
- for (int i= 0; i < selection.length; i++) {
- Object o= selection[i];
- if (!isOfAcceptedType(o) || isRejectedElement(o) || !isSelectedValid(o)) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/TypedViewerFilter.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/TypedViewerFilter.java
deleted file mode 100644
index d3b1406..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/TypedViewerFilter.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.jem.internal.beaninfo.ui;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-
-public class TypedViewerFilter extends ViewerFilter {
- private Class[] acceptedClasses;
- private Object[] rejectedFragments;
-
- public TypedViewerFilter(Class[] acceptedClasses, Object[] rejectedFragments) {
- this.acceptedClasses = acceptedClasses;
- this.rejectedFragments = rejectedFragments;
- }
-
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (rejectedFragments != null) {
- for (int i= 0; i < rejectedFragments.length; i++) {
- if (element.equals(rejectedFragments[i])) {
- return false;
- }
- }
- }
- for (int i= 0; i < acceptedClasses.length; i++) {
- if (acceptedClasses[i].isInstance(element)) {
- return true;
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/VariableSelectionBlock.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/VariableSelectionBlock.java
deleted file mode 100644
index 7147b94..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/VariableSelectionBlock.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.ui;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-/*
-
-
- */
-
-public class VariableSelectionBlock {
-
-
- private List fExistingPaths;
-
- private Label variableFieldLabel;
- private Text variableFieldText;
- private Button variableFieldButton;
- private String variableFieldTextContent;
-
- private Label extensionFieldLabel;
- private Text extensionFieldText;
- private Button extensionFieldButton;
- private String extensionFieldTextContent;
-
- private CLabel fFullPath;
-
- private IStatus fVariableStatus;
- private IStatus fExistsStatus;
- private IStatus fExtensionStatus;
-
- private String fVariable;
- private IStatusChangeListener fContext;
-
- private boolean fIsEmptyAllowed;
-
- /**
- * Constructor for VariableSelectionBlock
- */
- public VariableSelectionBlock(IStatusChangeListener context, List existingPaths, IPath varPath, String lastVarSelection, boolean emptyAllowed) {
- fContext= context;
- fExistingPaths= existingPaths;
- fIsEmptyAllowed= emptyAllowed;
- fExistsStatus= StatusHelper.OK_STATUS;
-
- //VariableSelectionAdapter adapter= new VariableSelectionAdapter();
-
- if (varPath != null) {
- variableFieldTextContent = varPath.segment(0);
- extensionFieldTextContent = varPath.removeFirstSegments(1).toString();
- } else {
- variableFieldTextContent = ""; //$NON-NLS-1$
- extensionFieldTextContent = ""; //$NON-NLS-1$
- }
- updateFullTextField();
- fVariableStatus= variableUpdated();
- fExtensionStatus=extensionUpdated();
- }
-
- public IPath getVariablePath() {
- if (fVariable != null) {
- return new Path(fVariable).append(extensionFieldTextContent);
- }
- return null;
- }
-
- public IPath getResolvedPath() {
- if (fVariable != null) {
- IPath entryPath= JavaCore.getClasspathVariable(fVariable);
- if (entryPath != null) {
- return entryPath.append(extensionFieldTextContent);
- }
- }
- return null;
- }
-
- public void setFocus(Display display) {
- display.asyncExec(new Runnable(){
- public void run() {
- variableFieldText.setFocus();
- }
- });
- }
-
-
- public Control createControl(Composite parent) {
- Composite inner= new Composite(parent, SWT.NONE);
- inner.setLayout(new GridLayout(3, false));
- GridData gd = new GridData(GridData.FILL_BOTH);
- inner.setLayoutData(gd);
-
- variableFieldLabel = new Label(inner, SWT.NONE);
- variableFieldLabel.setText(BeanInfoUIMessages.VariableSelectionBlock_variable_label);
- variableFieldLabel.setLayoutData(new GridData());
- variableFieldText = new Text(inner, SWT.BORDER|SWT.SINGLE);
- variableFieldText.setText(variableFieldTextContent);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.widthHint = 200;
- variableFieldText.setLayoutData(gd);
- variableFieldText.addModifyListener(new ModifyListener(){
- public void modifyText(ModifyEvent e) {
- variableFieldTextContent = variableFieldText.getText();
- fVariableStatus = variableUpdated();
- fExistsStatus= getExistsStatus();
- updateFullTextField();
- fContext.statusChanged(StatusHelper.getMostSevere(new IStatus[] { fVariableStatus, fExtensionStatus, fExistsStatus }));
- }
- });
- variableFieldButton = new Button(inner, SWT.PUSH);
- variableFieldButton.setText(BeanInfoUIMessages.VariableSelectionBlock_variable_button);
- variableFieldButton.setLayoutData(new GridData());
- variableFieldButton.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- String variable= chooseVariable();
- if (variable != null) {
- variableFieldText.setText(variable);
- }
- }
- });
-
- extensionFieldLabel = new Label(inner, SWT.NONE);
- extensionFieldLabel.setText(BeanInfoUIMessages.VariableSelectionBlock_extension_label);
- extensionFieldLabel.setLayoutData(new GridData());
- extensionFieldText = new Text(inner, SWT.BORDER|SWT.SINGLE);
- extensionFieldText.setText(variableFieldTextContent);
- extensionFieldText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- extensionFieldText.addModifyListener(new ModifyListener(){
- public void modifyText(ModifyEvent e) {
- extensionFieldTextContent = extensionFieldText.getText();
- fExtensionStatus= extensionUpdated();
- fExistsStatus= getExistsStatus();
- updateFullTextField();
- fContext.statusChanged(StatusHelper.getMostSevere(new IStatus[] { fVariableStatus, fExtensionStatus, fExistsStatus }));
- }
- });
- extensionFieldButton = new Button(inner, SWT.PUSH);
- extensionFieldButton.setText(BeanInfoUIMessages.VariableSelectionBlock_extension_button);
- extensionFieldButton.setLayoutData(new GridData());
- extensionFieldButton.setEnabled(fVariable!=null);
- extensionFieldButton.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- IPath filePath= chooseExtJar();
- if (filePath != null) {
- extensionFieldText.setText(filePath.toString());
- }
- }
- });
-
- Label label= new Label(inner, SWT.LEFT);
- label.setLayoutData(new GridData());
- label.setText(BeanInfoUIMessages.VariableSelectionBlock_fullpath_label);
-
- fFullPath= new CLabel(inner, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan=2;
- fFullPath.setLayoutData(gd);
-
- updateFullTextField();
-
- setFocus(parent.getDisplay());
-
- return inner;
- }
-
- private IStatus variableUpdated() {
- fVariable= null;
-
- IStatus status= StatusHelper.OK_STATUS;
-
- String name = variableFieldTextContent;
- if (name.length() == 0) {
- if (!fIsEmptyAllowed) {
- status = StatusHelper.createStatus(IStatus.ERROR, BeanInfoUIMessages.VariableSelectionBlock_error_entername_ERROR_);
- } else {
- fVariable= ""; //$NON-NLS-1$
- }
- } else if (JavaCore.getClasspathVariable(name) == null) {
- status = StatusHelper.createStatus(IStatus.ERROR, BeanInfoUIMessages.VariableSelectionBlock_error_namenotexists_ERROR_);
- } else {
- fVariable= name;
- }
- if(extensionFieldButton!=null)
- extensionFieldButton.setEnabled(fVariable != null);
- return status;
- }
-
- private IStatus extensionUpdated() {
- IStatus status= StatusHelper.OK_STATUS;
- String extension = extensionFieldTextContent;
- if (extension.length() > 0 && !Path.ROOT.isValidPath(extension)) {
- status = StatusHelper.createStatus(IStatus.ERROR, BeanInfoUIMessages.VariableSelectionBlock_error_invalidextension_ERROR_);
- }
- return status;
- }
-
- private IStatus getExistsStatus() {
- IStatus status = StatusHelper.OK_STATUS;
- IPath path= getResolvedPath();
- if (path != null) {
- if (findPath(path)) {
- status = StatusHelper.createStatus(IStatus.ERROR, BeanInfoUIMessages.VariableSelectionBlock_error_pathexists_ERROR_);
- } else if (!path.toFile().isFile()) {
- status = StatusHelper.createStatus(IStatus.WARNING, BeanInfoUIMessages.VariableSelectionBlock_warning_pathnotexists_WARN_);
- }
- } else {
- status = StatusHelper.createStatus(IStatus.WARNING, BeanInfoUIMessages.VariableSelectionBlock_warning_pathnotexists_WARN_);
- }
- return status;
- }
-
- private boolean findPath(IPath path) {
- for (int i= fExistingPaths.size() -1; i >=0; i--) {
- IPath curr= (IPath) fExistingPaths.get(i);
- if (curr.equals(path)) {
- return true;
- }
- }
- return false;
- }
-
- private void updateFullTextField() {
- if (fFullPath != null && !fFullPath.isDisposed()) {
- IPath resolvedPath= getResolvedPath();
- if (resolvedPath != null) {
- fFullPath.setText(resolvedPath.toOSString());
- } else {
- fFullPath.setText(""); //$NON-NLS-1$
- }
- }
- }
-
- private Shell getShell() {
- if (fFullPath != null) {
- return fFullPath.getShell();
- }
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
-
- public static boolean isArchivePath(IPath path){
- final String[] archiveExtensions = {"jar", "zip"}; //$NON-NLS-1$ //$NON-NLS-2$
- String ext= path.getFileExtension();
- if (ext != null && ext.length() != 0) {
- for (int i= 0; i < archiveExtensions.length; i++) {
- if (ext.equalsIgnoreCase(archiveExtensions[i])) {
- return true;
- }
- }
- }
- return false;
- }
-
- private IPath chooseExtJar() {
- String lastUsedPath= ""; //$NON-NLS-1$
- IPath entryPath= getResolvedPath();
- if (entryPath != null) {
- if (isArchivePath(entryPath)) {
- lastUsedPath= entryPath.removeLastSegments(1).toOSString();
- } else {
- lastUsedPath= entryPath.toOSString();
- }
- }
-
- FileDialog dialog= new FileDialog(getShell(), SWT.SINGLE);
- dialog.setFilterExtensions(new String[] {"*.jar;*.zip"}); //$NON-NLS-1$
- dialog.setFilterPath(lastUsedPath);
- dialog.setText(BeanInfoUIMessages.VariableSelectionBlock_ExtJarDialog_title);
- String res= dialog.open();
- if (res == null) {
- return null;
- }
- IPath resPath= new Path(res).makeAbsolute();
- IPath varPath= JavaCore.getClasspathVariable(fVariable);
-
- if (!varPath.isPrefixOf(resPath)) {
- return new Path(resPath.lastSegment());
- } else {
- return resPath.removeFirstSegments(varPath.segmentCount()).setDevice(null);
- }
- }
-
- private String chooseVariable() {
- IPath[] varPaths = BuildPathDialogAccess.chooseVariableEntries(variableFieldButton.getShell(), new IPath[0]);
- String variable = null;
- if(varPaths!=null && varPaths.length>0){
- variable = varPaths[0].toString();
- }
- return variable;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/messages.properties b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/messages.properties
deleted file mode 100644
index b5ae17d..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/messages.properties
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/Attic/messages.properties,v $
-# $Revision: 1.6 $ $Date: 2005/12/14 19:06:13 $
-#
-
-
-SearchPathDialog_ChoosePackages = &Choose Packages
-SearchPathDialog_Remove = &Remove
-SearchPathDialog_Desc_Label = &Modify search path of packages within this BeanInfo classes JAR/folder
-SearchPathDialog_ModifySearchPaths = Modify Search Paths - {0}
-SearchPathDialog_NotEditable_INFO_ = IWAV0075I Plugin type BeanInfo classes locations are not editable
-SearchPathDialog_PackagePresent_INFO_ = IWAV0076I Package already in the search path
-SearchPathDialog_InputDialog_Title = Package
-SearchPathDialog_InputDialog_Message = &Enter a package:
-BeanInfoPathsBlock_ExportAll = E&xport all
-BeanInfoPathsBlock_UnexportAll = U&nexport all
-BeanInfoPathsBlock_Page_Tab_Packages = &Packages
-BeanInfoPathsBlock_Page_Tab_Classes = &BeanInfo classes
-BeanInfosWorkbookPage_AddFolders = &Add Folders
-BeanInfosWorkbookPage_AddJARs = Add &JARs
-BeanInfosWorkbookPage_AddExternalJAR = Add E&xternal JARs
-BeanInfosWorkbookPage_AddVariable = Add &Variable
-BeanInfosWorkbookPage_AddProjects = Add Projec&ts
-BeanInfosWorkbookPage_ModifyPaths = &Modify Paths
-BeanInfosWorkbookPage_Remove = &Remove
-BeanInfosWorkbookPage_List_Text = &Choose locations of BeanInfo classes (BeanInfo classes locations not in current project)
-BeanInfosWorkbookPage_SelectionDialog_Classes_Title = BeanInfo Class Folders Selection
-BeanInfosWorkbookPage_SelectionDialog_JARs_Title = JAR Selection
-BeanInfosWorkbookPage_SelectionDialog_JARs_Message = &Choose JARs to be added as BeanInfo classes JARs
-BeanInfosWorkbookPage_SelectionDialog_ExtJARs_Text = JAR Selection
-BeanInfosWorkbookPage_SelectionDialog_Projects_Title = BeanInfo Projects Selection
-BeanInfosWorkbookPage_SelectionDialog_Classes_Prompt = &Choose folders to be added as BeanInfo classes folders.
-BeanInfosWorkbookPage_SelectionDialog_Projects_Prompt = &Choose projects to be added as BeanInfo projects.
-PackagesWorkbook_ChoosePackages = &Choose packages
-PackagesWorkbook_ChooseDefinedPaths = Choose &defined paths
-PackagesWorkbook_Remove = &Remove
-PackagesWorkbook_LabelText = Choose BeanInfo &packages from the class path
-PackagesWorkbook_SelectionDialog_DefinedPaths_Title = Choose Defined Paths
-PackagesWorkbook_SelectionDialog_DefinedPaths_Message = Choose the pre-defined paths to add to the search path
-LabelProvider_Library_Folder = {0} (class folder)
-LabelProvider_Library__PathLastSegment_PathRelative_ = {0} - {1}
-LabelProvider_Library__PathLastSegment_PathExceptLast_ = {0} - {1}
-LabelProvider_Variable__name_PathOSString_ = {0} - {1}
-LabelProvider__packageName_Path_ = {0}: {1}
-
-VariableSelectionBlock_variable_label = &Variable Name:
-VariableSelectionBlock_variable_button = &Browse...
-VariableSelectionBlock_extension_label = Path E&xtension:
-VariableSelectionBlock_extension_button = Bro&wse...
-VariableSelectionBlock_fullpath_label = Resolved Path:
-
-VariableSelectionBlock_error_entername_ERROR_ = IWAV0077E Variable name must be entered.
-VariableSelectionBlock_error_namenotexists_ERROR_ = IWAV0078E Variable does not exist.
-VariableSelectionBlock_error_pathexists_ERROR_ = IWAV0079E Class path entry already exists.
-VariableSelectionBlock_error_invalidextension_ERROR_ = IWAV0080E Extension is not a valid path.
-
-VariableSelectionBlock_warning_pathnotexists_WARN_ = IWAV0081W Resolved path is not an existing JAR file.
-
-VariableSelectionBlock_ExtJarDialog_title = JAR Selection
-
-
-
-
-#
-# Properties for the com.ibm.etools.beaninfo.ui plugin
-#
-
-# This shows up as the title of a message dialog
-Beaninfo_UI__errortitle = Error
-
-Beaninfo_UI__error = Error while setting BeanInfo configuration.
-
-BeaninfoPropertiesPage_INFO__nojavaproject = IWAV0019I BeanInfo is only applicable to Java projects.
-BeaninfoPropertiesPage_INFO__closedproject = IWAV0020I BeanInfo is not available for a closed project.
-
-# This is a checkbox on a preference page. The label is to indicate whether introspection is enabled to run or not.
-BeaninfoPathsBlock_UI__enablebeaninfo = &Enable BeanInfo Introspection on this Project
-
-# This is a header line for a page of preferences.
-BeaninfoPathsBlock_UI__searchpath_label = Build BeanInfo &search path order and exported entries:\n(Exported entries are contributed to dependent projects)
-BeaninfoPathsBlock_UI__searchpath_up_button = &Up
-BeaninfoPathsBlock_UI__searchpath_down_button = &Down
-BeaninfoPathsBlock_UI__searchpath_remove_button = &Remove
-BeaninfoPathsBlock_UI__serachpath_tab_order = &Order and Export
-
-BeaninfoPathsBlock_UI__warning_EntryMissing = Project class path entries, or BeanInfo class files are missing.
-
-# {0} will be the package name, e.g. java.lang
-BeaninfoPathsBlock_WARN__searchpath_missing_path_format = IWAV0021W {0} - Package path not found.
-
-# This is a message on a progress dialog.
-BeaninfoPathsBlock_UI__searchpath_operationdescription = Setting BeanInfo search paths...
-
-BeaninfoPathsBlock_UI__addsearchpath_title = Select Packages
-BeaninfoPathsBlock_UI__addsearchpath_description = &Select packages to add to search path:
-
-BeaninfoPathsBlock_UI__warning_EntryMissing = Project class path entries, or BeanInfo class files are missing.
-BeaninfoPathsBlock_UI__searchpath_add_button = Add Package...
-ExceptionHandler_errordialog_msg_seelog=See error log for more details.
diff --git a/plugins/org.eclipse.jem.ui/icons/blank.gif b/plugins/org.eclipse.jem.ui/icons/blank.gif
deleted file mode 100644
index 21f9d02..0000000
--- a/plugins/org.eclipse.jem.ui/icons/blank.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/cp_order_obj.gif b/plugins/org.eclipse.jem.ui/icons/cp_order_obj.gif
deleted file mode 100644
index b2fa4ce..0000000
--- a/plugins/org.eclipse.jem.ui/icons/cp_order_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/full/ctool16/run_exc.gif b/plugins/org.eclipse.jem.ui/icons/full/ctool16/run_exc.gif
deleted file mode 100644
index 57f4102..0000000
--- a/plugins/org.eclipse.jem.ui/icons/full/ctool16/run_exc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/full/obj16/file_obj.gif b/plugins/org.eclipse.jem.ui/icons/full/obj16/file_obj.gif
deleted file mode 100644
index 061161a..0000000
--- a/plugins/org.eclipse.jem.ui/icons/full/obj16/file_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/full/wizban/run_wiz.gif b/plugins/org.eclipse.jem.ui/icons/full/wizban/run_wiz.gif
deleted file mode 100644
index e3bd462..0000000
--- a/plugins/org.eclipse.jem.ui/icons/full/wizban/run_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/javabean.gif b/plugins/org.eclipse.jem.ui/icons/javabean.gif
deleted file mode 100644
index 1885261..0000000
--- a/plugins/org.eclipse.jem.ui/icons/javabean.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/package_obj_missing.gif b/plugins/org.eclipse.jem.ui/icons/package_obj_missing.gif
deleted file mode 100644
index 78d7e20..0000000
--- a/plugins/org.eclipse.jem.ui/icons/package_obj_missing.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/plugin_obj.gif b/plugins/org.eclipse.jem.ui/icons/plugin_obj.gif
deleted file mode 100644
index 8493df4..0000000
--- a/plugins/org.eclipse.jem.ui/icons/plugin_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/plugin.properties b/plugins/org.eclipse.jem.ui/plugin.properties
deleted file mode 100644
index 415fb5e..0000000
--- a/plugins/org.eclipse.jem.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
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.ui/Attic/plugin.properties,v $
-# $Revision: 1.4 $ $Date: 2005/08/24 21:07:12 $
-#
-
-
-pluginName=Java EMF Model UI
-providerName = Eclipse.org
-
-proxyLaunchGroup.label=Proxy
-
-ActionSet.proxyTools=Proxy Tools
-ActionSet.proxyTools.Description=Actions for working with Proxy and Proxy Launchers.
-Action.proxyLaunch=Proxy...
-Action.proxyLaunchTip=Proxy Launch Manager
-Action.selectDefault=Select Default Proxy Configuration...
-Action.selectDefaultTip=Select default for {0}.
-Menu.run=&Run
-
-Editors.OverrideEditor = Override Editor
-
-# This is the title of the Properties page for setting properties of BeanInfo paths.
-BeaninfoPath_Title_UI_ = BeanInfo Path
diff --git a/plugins/org.eclipse.jem.ui/plugin.xml b/plugins/org.eclipse.jem.ui/plugin.xml
deleted file mode 100644
index e58a61e..0000000
--- a/plugins/org.eclipse.jem.ui/plugin.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension
- point="org.eclipse.debug.ui.launchGroups">
- <launchGroup
- label="%proxyLaunchGroup.label"
- bannerImage="icons/full/wizban/run_wiz.gif"
- category="org.eclipse.jem.proxy"
- image="icons/full/ctool16/run_exc.gif"
- mode="run"
- id="org.eclipse.jem.proxy">
- </launchGroup>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- icon="icons/full/ctool16/run_exc.gif"
- configTypeID="org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"
- id="org.eclipse.jem.proxy.launchConfigurationTypeImage.localProxy">
- </launchConfigurationTypeImage>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- type="org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"
- class="org.eclipse.jem.internal.ui.proxy.remote.LocalLaunchTabGroup"
- id="org.eclipse.jem.ui.remote.LocalLaunchTabGroup1">
- </launchConfigurationTabGroup>
- </extension>
- <extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- label="%ActionSet.proxyTools"
- description="%ActionSet.proxyTools.Description"
- id="org.eclipse.jem.ui.ProxyToolsSet">
- <menu
- label="%Menu.run"
- path="additions"
- id="org.eclipse.ui.run">
- </menu>
- <action
- class="org.eclipse.jem.internal.ui.proxy.ProxyLaunchToolbarDelegate"
- icon="icons/full/ctool16/run_exc.gif"
- id="org.eclipse.jem.ui.proxy.ProxyLaunchToolbarDelegateAction"
- label="%Action.proxyLaunch"
- style="pulldown"
- toolbarPath="org.eclipse.debug.ui.launchActionSet/proxyLaunch"
- tooltip="%Action.proxyLaunchTip">
- </action>
- <action
- label="%Action.selectDefault"
- class="org.eclipse.jem.internal.ui.proxy.SelectDefaultConfigurationActionDelegate"
- menubarPath="org.eclipse.ui.run/"
- enablesFor="1"
- id="org.eclipse.jem.ui.proxy.SelectDefaultMenuDelegateAction">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <objectClass
- name="org.eclipse.jdt.core.IJavaProject">
- </objectClass>
- </or>
- </enablement>
- </action>
- <action
- label="%Action.proxyLaunch"
- icon="icons/full/ctool16/run_exc.gif"
- tooltip="%Action.proxyLaunchTip"
- class="org.eclipse.jem.internal.ui.proxy.ProxyLaunchMenuDelegate"
- menubarPath="org.eclipse.ui.run/"
- id="org.eclipse.jem.ui.proxy.ProxyLaunchMenuDelegateAction">
- </action>
- </actionSet>
- </extension>
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- objectClass="org.eclipse.core.resources.IProject"
- id="org.eclipse.jem.ui.select.default.objectcontibution">
- <action
- label="%Action.selectDefault"
- class="org.eclipse.jem.internal.ui.proxy.SelectDefaultConfigurationActionDelegate"
- enablesFor="1"
- id="org.eclipse.jem.ui.select.object.action">
- </action>
- <visibility>
- <objectState
- name="persistentProperty"
- value="org.eclipse.jem.proxy.proxyLaunchConfiguration">
- </objectState>
- </visibility>
- </objectContribution>
- </extension>
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- objectClass="org.eclipse.core.resources.IProject"
- name="%BeaninfoPath_Title_UI_"
- class="org.eclipse.jem.internal.beaninfo.ui.BeaninfosPropertyPage"
- id="BeaninfoPropertiesPage">
- <filter
- name="nature"
- value="org.eclipse.jdt.core.javanature">
- </filter>
- </page>
- <page
- objectClass="org.eclipse.jdt.core.IJavaProject"
- name="%BeaninfoPath_Title_UI_"
- class="org.eclipse.jem.internal.beaninfo.ui.BeaninfosPropertyPage"
- id="BeaninfoPropertiesPage">
- <filter
- name="nature"
- value="org.eclipse.jdt.core.javanature">
- </filter>
- </page>
- </extension>
- <extension
- point="org.eclipse.ui.editors">
- <editor
- name="%Editors.OverrideEditor"
- extensions="override"
- icon="icons/full/obj16/file_obj.gif"
- class="org.eclipse.ui.editors.text.TextEditor"
- contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
- id="org.eclipse.jem.beaninfo.OverrideEditor">
- </editor>
- </extension>
- <extension
- point="org.eclipse.jem.util.uiTester">
- <uiTester className="org.eclipse.jem.internal.ui.core.UITester"/>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/core/JEMUIPlugin.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/core/JEMUIPlugin.java
deleted file mode 100644
index 135b271..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/core/JEMUIPlugin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jem.internal.ui.core;
-
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-
-
-/**
- *
- * @since 1.0.0
- */
-public class JEMUIPlugin extends AbstractUIPlugin {
-
- private static JEMUIPlugin PLUGIN;
- public static final String PI_BEANINFO_UI = "org.eclipse.jem.internal.beaninfo.ui"; // Key for dialog settings. //$NON-NLS-1$
-
- /**
- * @param descriptor
- *
- * @since 1.0.0
- */
- public JEMUIPlugin() {
- PLUGIN = this;
- }
-
- /**
- * Return the plugin.
- *
- * @return
- *
- * @since 1.0.0
- */
- public static JEMUIPlugin getPlugin() {
- return PLUGIN;
- }
-
- private Logger logger;
- public Logger getLogger() {
- if (logger == null)
- logger = EclipseLogger.getEclipseLogger(this);
- return logger;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/core/UITester.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/core/UITester.java
deleted file mode 100644
index 5642cb4..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/core/UITester.java
+++ /dev/null
@@ -1,33 +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
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.ui.core;
-
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Tests if UI is active, and if it is, it will return true.
- * @since 1.2.1
- */
-public class UITester implements org.eclipse.jem.util.UITester {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.UITester#isCurrentContextUI()
- */
- public boolean isCurrentContextUI() {
- return PlatformUI.isWorkbenchRunning();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchMenuDelegate.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchMenuDelegate.java
deleted file mode 100644
index 0024374..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchMenuDelegate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jem.internal.ui.proxy;
-
-import org.eclipse.debug.ui.actions.OpenLaunchDialogAction;
-
-import org.eclipse.jem.internal.proxy.core.IProxyConstants;
-
-/**
- * Menu delegate to launch the Proxy Launch Manager.
- * @since 1.0.0
- */
-public class ProxyLaunchMenuDelegate extends OpenLaunchDialogAction {
-
- public ProxyLaunchMenuDelegate() {
- super(IProxyConstants.ID_PROXY_LAUNCH_GROUP);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchToolbarDelegate.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchToolbarDelegate.java
deleted file mode 100644
index ba301c9..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchToolbarDelegate.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jem.internal.ui.proxy;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2;
-
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-/**
- * The toolbar delegate for proxy launch.
- * @since 1.0.0
- */
-public class ProxyLaunchToolbarDelegate implements IWorkbenchWindowPulldownDelegate2 {
-
- private Menu menu;
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowPulldownDelegate2#getMenu(org.eclipse.swt.widgets.Menu)
- */
- public Menu getMenu(Menu parent) {
- setMenu(new Menu(parent));
- fillMenu(menu);
- return menu;
- }
-
- private void setMenu(Menu menu) {
- if (this.menu != null) {
- this.menu.dispose();
- }
- this.menu = menu;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowPulldownDelegate#getMenu(org.eclipse.swt.widgets.Control)
- */
- public Menu getMenu(Control parent) {
- setMenu(new Menu(parent));
- fillMenu(menu);
- return menu;
- }
-
- private void fillMenu(Menu menu) {
- addToMenu(menu, proxyLaunchDelegate, -1);
- addToMenu(menu, selectDelegate, -1);
- }
-
- /**
- * Adds the given action to the specified menu with an accelerator specified
- * by the given number.
- *
- * @param menu the menu to add the action to
- * @param action the action to add
- * @param accelerator the number that should appear as an accelerator
- */
- protected void addToMenu(Menu menu, IAction action, int accelerator) {
- StringBuffer label= new StringBuffer();
- if (accelerator >= 0 && accelerator < 10) {
- //add the numerical accelerator
- label.append('&');
- label.append(accelerator);
- label.append(' ');
- }
- label.append(action.getText());
- action.setText(label.toString());
- ActionContributionItem item= new ActionContributionItem(action);
- item.fill(menu, -1);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
- */
- public void dispose() {
- setMenu(null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
- */
- public void init(IWorkbenchWindow window) {
- selectDelegate.init(window);
- }
-
- protected SelectDefaultConfigurationActionDelegate selectDelegate = new SelectDefaultConfigurationActionDelegate();
- protected ProxyLaunchMenuDelegate proxyLaunchDelegate = new ProxyLaunchMenuDelegate();
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- if (selectDelegate.isEnabled())
- selectDelegate.run(action);
- else
- proxyLaunchDelegate.run(action);
- }
-
- /* (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) {
- selectDelegate.selectionChanged(null, selection);
- if (selectDelegate.isEnabled())
- action.setToolTipText(selectDelegate.getToolTipText());
- else
- action.setToolTipText(Platform.getResourceString(JEMUIPlugin.getPlugin().getBundle(), "%Action.proxyLaunchTip")); //$NON-NLS-1$
-
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyUIMessages.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyUIMessages.java
deleted file mode 100644
index 26ed81e..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyUIMessages.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.jem.internal.ui.proxy;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ProxyUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.internal.ui.proxy.messages";//$NON-NLS-1$
-
- private ProxyUIMessages() {
- // Do not instantiate
- }
-
- public static String Select_title;
- public static String Select_message;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ProxyUIMessages.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/SelectDefaultConfigurationActionDelegate.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/SelectDefaultConfigurationActionDelegate.java
deleted file mode 100644
index 153a848..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/SelectDefaultConfigurationActionDelegate.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jem.internal.ui.proxy;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-/**
- *
- * @since 1.0.0
- */
-public class SelectDefaultConfigurationActionDelegate extends Action implements IWorkbenchWindowActionDelegate, IObjectActionDelegate {
-
-
- /**
- * Helper to get single selected java project out of selection.
- * Used by ProxyLaunchToolbarDelegate too.
- *
- * @param selection
- * @return
- *
- * @since 1.0.0
- */
- protected static IJavaProject getSelectedJavaProject(ISelection selection) {
- if (selection.isEmpty() || !(selection instanceof IStructuredSelection) || ((IStructuredSelection) selection).size() > 1)
- return null; // Can't handle it.
- else {
- Object sel = ((IStructuredSelection) selection).getFirstElement();
- if (sel instanceof IProject && ((IProject) sel).isOpen()) {
- return JavaCore.create((IProject) sel); // Will return null if not exist.
- } else if (sel instanceof IJavaProject && ((IJavaProject) sel).isOpen())
- return (IJavaProject) sel;
- else
- return null;
- }
- }
-
- /**
- *
- *
- * @since 1.0.0
- */
- public SelectDefaultConfigurationActionDelegate() {
- super(Platform.getResourceString(JEMUIPlugin.getPlugin().getBundle(), "%Action.selectDefault")); //$NON-NLS-1$
- setEnabled(false);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
- */
- public void dispose() {
- }
-
- private IWorkbenchWindow window;
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
- */
- public void init(IWorkbenchWindow window) {
- this.window = window;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#run()
- */
- public void run() {
- selectDialog();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- run();
- }
-
- protected IJavaProject javaproject;
- /* (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) {
- javaproject = getSelectedJavaProject(selection);
- try {
- setEnabled(
- javaproject != null
- && javaproject.getProject().getPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION) != null);
- } catch (Exception e) {
- setEnabled(false); // Some error, so not enabled.
- }
- if (action != null)
- action.setEnabled(isEnabled());
- if (javaproject != null)
- setToolTipText(MessageFormat.format(Platform.getResourceString(JEMUIPlugin.getPlugin().getBundle(), "%Action.selectDefaultTip"), new Object[] {javaproject.getElementName()})); //$NON-NLS-1$
- else
- setToolTipText(getText());
- }
-
- private static final Object[] EMPTY = new Object[0];
- protected void selectDialog() {
- try {
- ILabelProvider labelProvider = DebugUITools.newDebugModelPresentation();
-
- CheckedTreeSelectionDialog dialog = new CheckedTreeSelectionDialog(window.getShell(), labelProvider, new ITreeContentProvider() {
- public Object[] getChildren(Object parentElement) {
- return EMPTY;
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public boolean hasChildren(Object element) {
- return false;
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement != null && inputElement instanceof Object[])
- return (Object[]) inputElement;
- else
- return null;
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }) {
- protected CheckboxTreeViewer createTreeViewer(Composite parent) {
- final CheckboxTreeViewer treeViewer = super.createTreeViewer(parent);
- treeViewer.addCheckStateListener(new ICheckStateListener() {
- boolean processingCheck = false;
- public void checkStateChanged(CheckStateChangedEvent event) {
- if (!processingCheck) {
- try {
- processingCheck = true;
- if (event.getChecked()) {
- // We are checking something, make sure old one unchecked.
- Object[] checked = treeViewer.getCheckedElements();
- for (int i = 0; i < checked.length; i++) {
- if (checked[i] != event.getElement())
- treeViewer.setChecked(checked[i], false);
- }
- }
- } finally {
- processingCheck = false;
- }
- }
-
- }
- });
- return treeViewer;
- }
-
- protected Composite createSelectionButtons(Composite composite) {
- return new Composite(composite, SWT.NONE); // We don't want selection buttons since only one can be selected at a time.
- }
- };
- dialog.setTitle(ProxyUIMessages.Select_title);
- dialog.setMessage(MessageFormat.format(ProxyUIMessages.Select_message, new Object[] { javaproject.getElementName()}));
-
- ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations();
- List configsList = new ArrayList(configs.length+1);
- String jpName = javaproject.getElementName();
- for (int i = 0; i < configs.length; i++) {
- if (IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configs[i].getCategory()) && !configs[i].getAttribute(IDebugUIConstants.ATTR_PRIVATE, false) && jpName.equals(configs[i].getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""))) //$NON-NLS-1$
- configsList.add(configs[i]);
- }
- configs = (ILaunchConfiguration[]) configsList.toArray(new ILaunchConfiguration[configsList.size()]);
- dialog.setInput(configs);
-
- String launchName = javaproject.getProject().getPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION);
- ILaunchConfiguration config = null;
- if (launchName != null) {
- for (int i = 0; i < configs.length; i++) {
- if (configs[i].getName().equals(launchName)) {
- config = configs[i];
- break;
- }
- }
- if (config != null) {
- dialog.setInitialSelections(new Object[] { config });
- }
- }
- if (dialog.open() == Window.OK) {
- config = (ILaunchConfiguration) dialog.getFirstResult();
- if (config != null)
- javaproject.getProject().setPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION, config.getName());
- else
- javaproject.getProject().setPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION, ProxyLaunchSupport.NOT_SET);
- }
-
- } catch (CoreException e) {
- ErrorDialog.openError(window.getShell(), null, null, e.getStatus());
- ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- }
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
- */
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- // This is called instead of init(WorkbenchWindow) when this is on popup menu.
- window = targetPart.getSite().getWorkbenchWindow();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/messages.properties b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/messages.properties
deleted file mode 100644
index b8828e0..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/messages.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/Attic/messages.properties,v $
-# $Revision: 1.5 $ $Date: 2005/08/24 21:07:12 $
-#
-
-Select_title=Select Default
-Select_message=Select default configuration for project "{0}":
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchProjectTab.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchProjectTab.java
deleted file mode 100644
index 2c3236e..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchProjectTab.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.ui.proxy.remote;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaLaunchTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.ide.IDE;
-
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-
-/**
- *
- * @since 1.0.0
- */
-public class LocalLaunchProjectTab extends JavaLaunchTab {
-
- // Project UI widgets
- protected Label fProjLabel;
- protected Text fProjText;
- protected Button fProjButton;
-
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(Composite)
- */
- public void createControl(Composite parent) {
- Font font = parent.getFont();
-
- Composite comp = new Composite(parent, SWT.NONE);
- setControl(comp);
- GridLayout topLayout = new GridLayout();
- comp.setLayout(topLayout);
- GridData gd;
-
- createVerticalSpacer(comp, 1);
-
- Composite projComp = new Composite(comp, SWT.NONE);
- GridLayout projLayout = new GridLayout();
- projLayout.numColumns = 2;
- projLayout.marginHeight = 0;
- projLayout.marginWidth = 0;
- projComp.setLayout(projLayout);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- projComp.setLayoutData(gd);
- projComp.setFont(font);
-
- fProjLabel = new Label(projComp, SWT.NONE);
- fProjLabel.setText(ProxyRemoteUIMessages.LocalLaunchProjectTab_Project);
- gd = new GridData();
- gd.horizontalSpan = 2;
- fProjLabel.setLayoutData(gd);
- fProjLabel.setFont(font);
-
- fProjText = new Text(projComp, SWT.SINGLE | SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- fProjText.setLayoutData(gd);
- fProjText.setFont(font);
- fProjText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent evt) {
- updateLaunchConfigurationDialog();
- }
- });
-
- fProjButton = createPushButton(projComp, ProxyRemoteUIMessages.LocalLaunchProjectTab_Browse, null);
- fProjButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent evt) {
- handleProjectButtonSelected();
- }
- });
-
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
- */
- public void initializeFrom(ILaunchConfiguration config) {
- super.initializeFrom(config);
- updateProjectFromConfig(config);
- }
-
- protected void updateProjectFromConfig(ILaunchConfiguration config) {
- String projectName = ""; //$NON-NLS-1$
- try {
- projectName = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
- } catch (CoreException ce) {
- ProxyPlugin.getPlugin().getLogger().log(ce);
- }
- fProjText.setText(projectName);
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
- */
- public void performApply(ILaunchConfigurationWorkingCopy config) {
- config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText());
- }
-
- /**
- * Show a dialog that lets the user select a project. This in turn provides
- * context for the main type, allowing the user to key a main type name, or
- * constraining the search for main types to the specified project.
- */
- protected void handleProjectButtonSelected() {
- IJavaProject project = chooseJavaProject();
- if (project == null) {
- return;
- }
-
- String projectName = project.getElementName();
- fProjText.setText(projectName);
- }
-
- /**
- * Realize a Java Project selection dialog and return the first selected project,
- * or null if there was none.
- */
- protected IJavaProject chooseJavaProject() {
- IJavaProject[] projects;
- try {
- projects= JavaCore.create(getWorkspaceRoot()).getJavaProjects();
- } catch (JavaModelException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- projects= new IJavaProject[0];
- }
-
- ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
- ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
- dialog.setTitle(ProxyRemoteUIMessages.LocalLaunchProjectTab_Project_Selection);
- dialog.setMessage(ProxyRemoteUIMessages.LocalLaunchProjectTab_ChooseProject);
- dialog.setElements(projects);
-
- IJavaProject javaProject = getJavaProject();
- if (javaProject != null) {
- dialog.setInitialSelections(new Object[] { javaProject });
- }
- if (dialog.open() == Window.OK) {
- return (IJavaProject) dialog.getFirstResult();
- }
- return null;
- }
-
- /**
- * Return the IJavaProject corresponding to the project name in the project name
- * text field, or null if the text does not match a project name.
- */
- protected IJavaProject getJavaProject() {
- String projectName = fProjText.getText().trim();
- if (projectName.length() < 1) {
- return null;
- }
- return getJavaModel().getJavaProject(projectName);
- }
-
- /**
- * Convenience method to get the workspace root.
- */
- private IWorkspaceRoot getWorkspaceRoot() {
- return ResourcesPlugin.getWorkspace().getRoot();
- }
-
- /**
- * Convenience method to get access to the java model.
- */
- private IJavaModel getJavaModel() {
- return JavaCore.create(getWorkspaceRoot());
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(ILaunchConfiguration)
- */
- public boolean isValid(ILaunchConfiguration config) {
-
- setErrorMessage(null);
- setMessage(null);
-
- String name = fProjText.getText().trim();
- if (name.length() > 0) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus status = workspace.validateName(name, IResource.PROJECT);
- if (status.isOK()) {
- IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (!project.exists()) {
- setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.LocalLaunchProjectTab_ProjectNotExist_ERROR_, new String[] {name}));
- return false;
- }
- if (!project.isOpen()) {
- setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.LocalLaunchProjectTab_ProjectNotOpen_ERROR_, new String[] {name}));
- return false;
- }
- } else {
- setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.LocalLaunchProjectTab_ProjectValidateError_ERROR_, new String[]{status.getMessage()}));
- return false;
- }
- }
-
- return false; // Kludge. We always return false so that "Run" button is never enabled. We can't launch these configurations using the standard way. Only through ProxyLaunchSupport.
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
- */
- public void setDefaults(ILaunchConfigurationWorkingCopy config) {
- IJavaElement javaElement = getContext();
- if (javaElement != null) {
- initializeJavaProject(javaElement, config);
- } else {
- // We set empty attributes for project so that when one config is
- // compared to another, the existence of empty attributes doesn't cause an
- // incorrect result (the performApply() method can result in empty values
- // for these attributes being set on a config if there is nothing in the
- // corresponding text boxes)
- config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
- }
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
- */
- public String getName() {
- return ProxyRemoteUIMessages.LocalLaunchProjectTab_name;
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
- */
- public Image getImage() {
- return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT);
- }
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchTabGroup.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchTabGroup.java
deleted file mode 100644
index 1162f2c..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchTabGroup.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * $RCSfile: LocalLaunchTabGroup.java,v $ $Revision: 1.5 $ $Date: 2005/08/24 21:07:12 $
- */
-package org.eclipse.jem.internal.ui.proxy.remote;
-
-import org.eclipse.debug.ui.*;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.*;
-
-/**
- * Launch Tab Group for the Local Launch of a Remote Proxy Configuration.
- *
- * @since 1.0.0
- */
-public class LocalLaunchTabGroup extends AbstractLaunchConfigurationTabGroup {
-
- /**
- * Constructs a new Java applet tab group.
- */
- public LocalLaunchTabGroup() {
- }
-
- /*
- * @see ILaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog, String)
- */
- public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
- ILaunchConfigurationTab[] tabs =
- new ILaunchConfigurationTab[] {
- new LocalLaunchProjectTab(),
- new JavaArgumentsTab(),
- new JavaJRETab(),
- new JavaClasspathTab(),
- new SourceLookupTab(), // TODO Need to see why SourceLookupTab didn't work. Until then use this.
- new EnvironmentTab(),
- new CommonTab()};
- setTabs(tabs);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/ProxyRemoteUIMessages.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/ProxyRemoteUIMessages.java
deleted file mode 100644
index 822126c..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/ProxyRemoteUIMessages.java
+++ /dev/null
@@ -1,35 +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.jem.internal.ui.proxy.remote;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ProxyRemoteUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.internal.ui.proxy.remote.messages";//$NON-NLS-1$
-
- private ProxyRemoteUIMessages() {
- // Do not instantiate
- }
-
- public static String LocalLaunchProjectTab_name;
- public static String LocalLaunchProjectTab_Project;
- public static String LocalLaunchProjectTab_Browse;
- public static String LocalLaunchProjectTab_Project_Selection;
- public static String LocalLaunchProjectTab_ChooseProject;
- public static String LocalLaunchProjectTab_ProjectNotExist_ERROR_;
- public static String LocalLaunchProjectTab_ProjectNotOpen_ERROR_;
- public static String LocalLaunchProjectTab_ProjectValidateError_ERROR_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ProxyRemoteUIMessages.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/messages.properties b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/messages.properties
deleted file mode 100644
index b7ca012..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/messages.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
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/Attic/messages.properties,v $
-# $Revision: 1.8 $ $Date: 2005/08/24 21:07:12 $
-#
-
-LocalLaunchProjectTab_name = &Project
-LocalLaunchProjectTab_Project = &Project
-LocalLaunchProjectTab_Browse = &Browse...
-LocalLaunchProjectTab_Project_Selection = Project Selection
-LocalLaunchProjectTab_ChooseProject = Choose a &project to for the launch:
-LocalLaunchProjectTab_ProjectNotExist_ERROR_ = IWAV0174E Project "{0}" doesn''t exist.
-LocalLaunchProjectTab_ProjectNotOpen_ERROR_ = IWAV0175E Project "{0}" is not open.
-LocalLaunchProjectTab_ProjectValidateError_ERROR_ = IWAV0176E Project validation error. Msg is "{0}."
