3651 files changed, 0 insertions, 696813 deletions

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 6e60185a7..000000000
--- 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 86d94083c..000000000
--- 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 4bd469de7..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,60 +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
--->
-<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>
-</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 351b03929..000000000
--- 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.0.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 73db36ed5..000000000
--- 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 06, 2007</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 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>
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 10f19b18a..000000000
--- 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 a56a758a4..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/AddRelationship.gif
+++ /dev/null
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 d5c72901b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/ProjectExplorer.gif
+++ /dev/null
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 a9f52eb04..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/Relationships.gif
+++ /dev/null
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 68be18cb6..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/n5rpdcst.gif
+++ /dev/null
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 895f9ca06..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/ycwin.gif
+++ /dev/null
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/_12.cfs b/docs/org.eclipse.jst.j2ee.doc.user/index/_12.cfs
deleted file mode 100644
index 8fa0b7a2c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/_12.cfs
+++ /dev/null
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 e423242b3..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/deletable
+++ /dev/null
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 033a04144..000000000
--- 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.

-#Wed May 09 13:37:25 EDT 2007

-org.eclipse.jst.j2ee.doc.user=org.eclipse.jst.j2ee.doc.user\n1.0.300.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 5f057cd9d..000000000
--- 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.

-#Wed May 09 13:37:26 EDT 2007

-lucene=1.4.103.v20060601

-analyzer=org.eclipse.help.base\#3.2.0.v20060601?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 ad65d989c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,36 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 13:37:26 EDT 2007

-/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjear.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjval.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.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/ph-importexport.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/cjview.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html=0

-/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.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 19b5d0c42..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/segments
+++ /dev/null
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 499435bf3..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.ditamap
+++ /dev/null
@@ -1,156 +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></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 a0c990b2e..000000000
--- 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 5ab1ef4da..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.ditamap
+++ /dev/null
@@ -1,109 +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="J2EE applications">

-<anchor id="before_intro_topics"/>

-<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 J2EE 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 J2EE 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 J2EE 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/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 f098fa07a..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml
+++ /dev/null
@@ -1,83 +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="J2EE applications" href="topics/ph-j2eeapp.html">
-<anchor id="before_intro_topics"/>
-<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 J2EE 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 J2EE 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 J2EE 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="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 d718056ff..000000000
--- 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 ab8c2ad9f..000000000
--- 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 8a4c09652..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="J2EE">
-    <entry keyword="architecture">
-      <topic href="topics/cjarch.html#cjarch" title="J2EE architecture"/>
-    </entry>
-    <entry keyword="workbench perspectives">
-      <topic href="topics/cjpers.html#cjpers" title="Java EE perspective"/>
-    </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="application client projects">
-      <topic href="topics/cjappcliproj.html#cjappcliproj" title="Application client projects"/>
-    </entry>
-    <entry keyword="target servers">
-      <topic href="topics/tjtargetserver.html#tjtargetserver" title="Specifying target servers for J2EE 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 J2EE project"/>
-    </entry>
-    <entry keyword="changing facet versions">
-      <topic href="topics/tchangefacet.html#tchangefacet" title="Changing the version of a facet"/>
-    </entry>
-    <entry keyword="cyclical dependencies between modules">
-      <topic href="topics/cjcircle.html#cjcircle" title="Cyclical dependencies between J2EE modules"/>
-    </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>
-  <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/cjviewfilters.html#cjviewfiltersCait" title="Filters in the project explorer view"/>
-    </entry>
-  </entry>
-  <entry keyword="filters">
-    <entry keyword="Project Explorer view">
-      <topic href="topics/cjviewfilters.html#cjviewfiltersCait" title="Filters in the project explorer view"/>
-    </entry>
-  </entry>
-  <entry keyword="projects">
-    <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 J2EE 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 J2EE project"/>
-    </entry>
-    <entry keyword="cyclical dependencies">
-      <topic href="topics/cjcircle.html#cjcircle" title="Cyclical dependencies between J2EE 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="Java">
-    <entry keyword="J2EE project compiler level">
-      <topic href="topics/tchangejavalevel.html#tchangejavalevel" title="Changing the Java compiler version for a J2EE project"/>
-    </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 keyword="correcting cyclical dependencies">
-      <topic href="topics/tjcircleb.html#tjcircleb" title="Correcting cyclical dependencies after an EAR is imported"/>
-    </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 J2EE 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="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 8930de3ed..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-
-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 d718056ff..000000000
--- 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/cfacets.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita
deleted file mode 100644
index c415b7cc7..000000000
--- 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 J2EE projects and are used as part of the runtime configuration. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>J2EE<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 J2EE 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 82b49b4da..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta 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 J2EE projects and are used as part of the runtime configuration." />
-<meta name="description" content="Facets define characteristics and requirements for J2EE projects and are used as part of the runtime configuration." />
-<meta content="J2EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="DC.subject" />
-<meta content="J2EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
-<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/tchangejavalevel.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 J2EE 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 J2EE 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&#10;to an existing project in your workspace.">Adding a facet to a J2EE 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&#10;in a J2EE project by editing the facets for the project.">Changing the version of a facet</a>.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/taddingfacet.html">Adding a facet to a J2EE project</a></strong><br />
-This topic explains how to add a facet to an existing project in your workspace.</li>
-<li class="ulchildlink"><strong><a href="../topics/tchangefacet.html">Changing the version of a facet</a></strong><br />
-You can change the version of a facet in a J2EE project by editing the facets for the project.</li>
-<li class="ulchildlink"><strong><a href="../topics/tchangejavalevel.html">Changing the Java compiler version for a J2EE project</a></strong><br />
-You can change the version of Java used in a J2EE project by changing the value of the Java facet.</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/cjappcliproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita
deleted file mode 100644
index d9c651a7c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita
+++ /dev/null
@@ -1,80 +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>J2EE<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 J2EE resources defined in your server. When you place the client

-code in an application client module instead of a simple JAR file, the application

-client benefits from the server's resources (it does not need to re-specify

-the class path to J2EE and server JAR files) as well as from easier JNDI lookup

-(the client container fills in the initial context and other parameters).

-The application client project allows you to work as if you are creating a

-standalone <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 J2EE (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 J2EE application client container provides access to the J2EE service

-(JNDI naming services, deployment services, transaction services, and security

-services) and communications APIs (internet protocols, Remote Method Invocation

-protocols, Object Management Group protocols, Messaging protocols, and data

-formats).</p>

-<p>By default, application client projects contain one folder named <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 fceb834d9..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.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="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, J2EE" name="DC.subject" />
-<meta content="application client projects, overview, J2EE" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.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 J2EE resources defined in your server. When you place the client
-code in an application client module instead of a simple JAR file, the application
-client benefits from the server's resources (it does not need to re-specify
-the class path to J2EE and server JAR files) as well as from easier JNDI lookup
-(the client container fills in the initial context and other parameters).
-The application client project allows you to work as if you are creating a
-standalone Java application in a Java project.</p>
-
-<p>An application client project enables you to do the following things:</p>
-
-<ul>
-<li>Develop the Java classes that implement the client module</li>
-
-<li>Set the application client deployment descriptor</li>
-
-<li>Test the application client</li>
-
-</ul>
-
-<p>Like Java projects, application client projects contain the
-resources needed for application clients, including Java class
-files. When you create a new application client project, the environment is
-set up for Java development. A Java 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 J2EE (EJB) servers. The point of entry for the application client
-is a Java main-class,
-which is simply a Java class that contains a static main method. The class
-is declared in the manifest file of the client module. </p>
-
-<p>A J2EE application client container provides access to the J2EE service
-(JNDI naming services, deployment services, transaction services, and security
-services) and communications APIs (internet protocols, Remote Method Invocation
-protocols, Object Management Group protocols, Messaging protocols, and data
-formats).</p>
-
-<p>By default, application client projects contain one folder named <span class="uicontrol">appClientModule</span>,
-which contains both Java source code and compiled <samp class="codeph">.class</samp> files,
-along with all the meta-data files in the <span class="uicontrol">META-INF</span> subfolder.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-</div>
-
-</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 f715cd4c3..000000000
--- 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 f66fe2730..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.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="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/ph-j2eeapp.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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita
deleted file mode 100644
index d4be75971..000000000
--- 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 J2EE 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>J2EE<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 3aeb5f3ee..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html
+++ /dev/null
@@ -1,57 +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 J2EE 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, J2EE, cyclical dependencies between modules, projects, cyclical dependencies" name="DC.subject" />
-<meta content="dependencies, cycles between modules, J2EE, cyclical dependencies between modules, projects, cyclical dependencies" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.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 J2EE modules</title>
-</head>
-<body id="cjcircle"><a name="cjcircle"><!-- --></a>
-
-
-<h1 class="id_title">Cyclical dependencies between J2EE 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="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/cjearproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.dita
deleted file mode 100644
index aca0056fd..000000000
--- 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 2a3970af2..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html
+++ /dev/null
@@ -1,106 +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/ph-projects.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&#10;for J2EE 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="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/cjpers.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita
deleted file mode 100644
index 5f0468eb9..000000000
--- 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>J2EE<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 ee16b19ed..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html
+++ /dev/null
@@ -1,134 +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="J2EE, workbench perspectives, enterprise applications, Java EE perspective" name="DC.subject" />
-<meta content="J2EE, workbench perspectives, enterprise applications, Java EE perspective" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
-<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> &gt; <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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.dita
deleted file mode 100644
index 8ca49e104..000000000
--- 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 1fb4db218..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.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="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/ph-j2eeapp.html" />
-<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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.dita
deleted file mode 100644
index be377a148..000000000
--- 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 621bba38d..000000000
--- 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/ph-importexport.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.dita
deleted file mode 100644
index 833c39f3c..000000000
--- 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 7ac450b02..000000000
--- 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 J2EE 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 5584b1dd5..000000000
--- 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">J2EE applications</title>

-<shortdesc outputclass="id_shortdesc">These topics deal with the <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> 2

-Platform, Enterprise Edition (J2EE).</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 a4076301e..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html
+++ /dev/null
@@ -1,63 +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="J2EE applications" />
-<meta name="abstract" content="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE)." />
-<meta name="description" content="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE)." />
-<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>J2EE applications</title>
-</head>
-<body id="ph-j2eeapp"><a name="ph-j2eeapp"><!-- --></a>
-
-
-<h1 class="id_title">J2EE applications</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">These topics deal with the Javaâ„¢ 2
-Platform, Enterprise Edition (J2EE).</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjarch.html">J2EE architecture</a></strong><br />
-The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise 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 57572fa5e..000000000
--- 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 f01ecfd10..000000000
--- 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 J2EE 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 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.dita
deleted file mode 100644
index 71f8c8c2b..000000000
--- 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 a2dac8267..000000000
--- 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 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.dita
deleted file mode 100644
index 9cbad0940..000000000
--- 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 b8eaa0695..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.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="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 scheme="URI" name="DC.Relation" content="../topics/ph-ref.html" />
-<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>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-ref.html" title="The following reference material on J2EE is available:">Reference</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.dita
deleted file mode 100644
index b4c14dfa5..000000000
--- 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">&lt;ejb-client-jar> {0} must exist in every EAR file

-that contains this EJB module.</entry>

-<entry colname="col3">If <codeph>&lt;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>&lt;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 8f2942813..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html
+++ /dev/null
@@ -1,328 +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/tjval.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-ref.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 ">&nbsp;</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 ">&nbsp;</td>
-
-</tr>
-
-<tr class="id_CHKJ2875E">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2875E       </td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">&lt;ejb-client-jar&gt; {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">&lt;ejb-client-jar&gt;</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">&lt;ejb-client-jar&gt;</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 &gt; Preferences &gt; Java &gt;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 &gt; Preferences &gt;
-Java &gt; 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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-ref.html" title="The following reference material on J2EE is available:">Reference</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.dita
deleted file mode 100644
index 51bdd7f1b..000000000
--- 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 &amp; 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 &lt;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 f28957cb9..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html
+++ /dev/null
@@ -1,251 +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/tjval.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-ref.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 ">&nbsp;</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 &amp; 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 &lt;types&gt; 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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-ref.html" title="The following reference material on J2EE is available:">Reference</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita
deleted file mode 100644
index ba9f271e2..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita
+++ /dev/null
@@ -1,54 +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 J2EE 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>J2EE<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 6fb1d0264..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.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="Adding a facet to a J2EE 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, J2EE, adding project facets" name="DC.subject" />
-<meta content="projects, facets, adding, J2EE, adding project facets" name="keywords" />
-<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 J2EE project</title>
-</head>
-<body id="taddingfacet"><a name="taddingfacet"><!-- --></a>
-
-
-<h1 class="id_title">Adding a facet to a J2EE 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,&#10;you can specify the server runtime environments for your J2EE projects. The&#10;target server is specified during project creation and import, and it can&#10;be changed in the project properties. The target server setting is the default&#10;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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cfacets.html" title="Facets define characteristics and requirements for J2EE 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/tchangefacet.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita
deleted file mode 100644
index 252889e39..000000000
--- 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 J2EE project by editing the facets for the project.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>facets<indexterm>changing versions</indexterm></indexterm>

-<indexterm>J2EE<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 J2EE 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 9d0749576..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html
+++ /dev/null
@@ -1,73 +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 J2EE project by editing the facets for the project." />
-<meta name="description" content="You can change the version of a facet in a J2EE project by editing the facets for the project." />
-<meta content="facets, changing versions, J2EE, changing facet versions, projects" name="DC.subject" />
-<meta content="facets, changing versions, J2EE, changing facet versions, projects" name="keywords" />
-<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 J2EE 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 J2EE 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&#10;in a J2EE project by changing the value of the Java facet.">Changing the Java compiler version for a J2EE 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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cfacets.html" title="Facets define characteristics and requirements for J2EE 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/tchangejavalevel.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita
deleted file mode 100644
index 443530b20..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita
+++ /dev/null
@@ -1,42 +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 J2EE 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 J2EE project by changing the value of the <uicontrol>Java</uicontrol> facet.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>Java<indexterm>J2EE 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-J2EE 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-preferences-compiler.htm"

-scope="peer"><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> 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 c4fda4554..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html
+++ /dev/null
@@ -1,71 +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 J2EE project" />
-<meta name="abstract" content="You can change the version of Java used in a J2EE project by changing the value of the Java facet." />
-<meta name="description" content="You can change the version of Java used in a J2EE project by changing the value of the Java facet." />
-<meta content="Java, J2EE project compiler level, projects, Java compiler level" name="DC.subject" />
-<meta content="Java, J2EE project compiler level, projects, Java compiler level" name="keywords" />
-<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 J2EE project</title>
-</head>
-<body id="tchangejavalevel"><a name="tchangejavalevel"><!-- --></a>
-
-
-<h1 class="id_title">Changing the Java compiler version for a J2EE project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can change the version of Javaâ„¢ used
-in a J2EE 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-J2EE project,
-such as a Java project, see <a href="../../org.eclipse.jdt.doc.user/reference/ref-preferences-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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cfacets.html" title="Facets define characteristics and requirements for J2EE 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/tjappproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita
deleted file mode 100644
index 8a01f5399..000000000
--- 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>J2EE</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 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>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 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 fbfc64763..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.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 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/ph-projects.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>
- &gt; <span class="uicontrol">New</span> &gt; <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>
- &gt; <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 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>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"><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="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/tjcircleb.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita
deleted file mode 100644
index 77d1b0b26..000000000
--- 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<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 7b55ebde2..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html
+++ /dev/null
@@ -1,77 +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, correcting cyclical dependencies, projects" name="DC.subject" />
-<meta content="dependencies, correcting cyclical, EAR, correcting cyclical dependencies, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.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="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/tjear.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.dita
deleted file mode 100644
index c89f63317..000000000
--- 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 24d716f7b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html
+++ /dev/null
@@ -1,141 +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/ph-projects.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>
- &gt; <span class="uicontrol">New</span> &gt; <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>
- &gt; <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="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/tjexpapp.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.dita
deleted file mode 100644
index d99519b66..000000000
--- 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 95830203f..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html
+++ /dev/null
@@ -1,77 +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/ph-importexport.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>
- &gt; <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> &gt; <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="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/tjexpear.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.dita
deleted file mode 100644
index c51e5b219..000000000
--- 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 9a47da361..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.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="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/ph-importexport.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>
- &gt; <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> &gt; <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="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/tjexprar.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.dita
deleted file mode 100644
index aa2405b48..000000000
--- 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 0a50592b4..000000000
--- 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>
- &gt; <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> &gt; <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 78a47c141..000000000
--- 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 8fce24e25..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html
+++ /dev/null
@@ -1,91 +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/ph-importexport.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>
- &gt; <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> &gt; <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="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/tjimpear.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.dita
deleted file mode 100644
index cd6c4ae3c..000000000
--- 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 3ee61d901..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html
+++ /dev/null
@@ -1,91 +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/ph-importexport.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>
- &gt; <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> &gt; <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="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/tjimprar.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.dita
deleted file mode 100644
index 5d9a2945a..000000000
--- 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 ec292edc4..000000000
--- 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>
- &gt; <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> &gt; <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 861366d94..000000000
--- 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 99375e459..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.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="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/ph-projects.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>
- &gt; <span class="uicontrol">New</span> &gt; <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>
- &gt; <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="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/tjtargetserver.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.dita
deleted file mode 100644
index b9bb0f52c..000000000
--- 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="html"

-href="../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html" 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 a3f33940c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html
+++ /dev/null
@@ -1,124 +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/ph-projects.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="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/tjval.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.dita
deleted file mode 100644
index 851f9e656..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.dita
+++ /dev/null
@@ -1,68 +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 Properties 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>

-</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 or on build

-validation.</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>

-<step><cmd>Begin the validation process by one of the following methods:</cmd>

-<choices>

-<choice>Right-click a project and click <uicontrol>Run Validation</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 a8b9b54eb..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html
+++ /dev/null
@@ -1,147 +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/ph-j2eeapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.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 Properties 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> &gt; <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>
-
-</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 or on build
-validation.</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>
-
-<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">Run Validation</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&#10;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>
-<ul class="ullinks">
-<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/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/tjvaldisable.html">Disabling validation</a></strong><br />
-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.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvalselect.html">Selecting code validators</a></strong><br />
-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.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvalglobalpref.html">Overriding global validation preferences</a></strong><br />
-For a given project, you can override the global validation preferences.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvalmanual.html">Manually validating code</a></strong><br />
-When you run a manual validation, all resources in the selected project are validated according to the validation settings.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.dita
deleted file mode 100644
index afe3aa197..000000000
--- 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 4200037e4..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.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="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/tjval.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> &gt; <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&#10;the global validation preferences.">Overriding global validation preferences</a></div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <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>
-
-</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 50487df7b..000000000
--- 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 11cda494e..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta 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/tjval.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> &gt; <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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <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>
-
-</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 4f67f5fac..000000000
--- 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>Run Validation</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 6a38a284f..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta 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/tjval.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">Run Validation</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&#10;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&#10;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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <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>
-
-</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 d0547d594..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.dita
+++ /dev/null
@@ -1,47 +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.</note></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>

-<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 e1fbe630a..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html
+++ /dev/null
@@ -1,85 +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/tjval.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> &gt; <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.</div>
-
-</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="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&#10;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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <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>
-
-</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 2b0d100c3..000000000
--- 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>

-</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 f407eb6f1..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html
+++ /dev/null
@@ -1,71 +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" name="DC.subject" />
-<meta content="filters, Project Explorer view, views, Project Explorer filters" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.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="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/.cvsignore b/docs/org.eclipse.jst.j2ee.infopop/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.jst.j2ee.infopop/.project b/docs/org.eclipse.jst.j2ee.infopop/.project
deleted file mode 100644
index 63eb8c98c..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml
deleted file mode 100644
index 373458803..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-
-<!-- Page 1, Create an Enterprise Bean  -->
-<context id="antejb0000" title="Create an Enterprise Bean">
-<description>Use this page to select the enterprise bean type: session bean, message-driven bean, or container managed entity bean.
-
-You must install and enable XDoclet before creating an entity bean. Complete the following steps:
-1 - Download and install XDoclet from http://xdoclet.sourceforge.net/xdoclet/install.html
-2 - Click the <b>preferences</b> link in the wizard to configure the XDoclet Runtime Preferences. Another way to get to the XDoclet Runtime Preferences page is from <b>Window > Preferences > XDoclet</b>.
-3 - Check the <b>Enable XDoclet Builder</b> check box.
-4 - Select the version of XDoclet that you have installed.
-5 - Use the Browse button to locate the installation directory for XDoclet (<b>XDoclet Home</b>).
-6 - Click <b>OK</b> to save the preferences.
-
-After installing and configuring XDoclet, select the bean type you want to create and click <b>Next</b>.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
-<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
-<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
-<topic label="Configuring XDoclet annotation support" href="../org.eclipse.jst.ejb.doc.user/topics/txdocletconf.html"/>
-<topic label="EJB architecture" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html"/>
-<!-- link to org.eclipse.jst.annotation.user.doc  annotation tagging -->
-</context>
-
-<!-- Page 2, Enterprise Bean class file definition -->
-<context id="antejb1100">
-<description>Enter the <b>Project</b>, <b>Module Name</b>, and workspace <b>Folder</b> for the new enterprise bean.
-
-Enter the <b>Java package</b> and <b>Class name</b> for the new enterprise bean. 
-Change the <b>Superclass</b> if your class will override a class other than java.lang.Object.
-
-<!-- Select the <b>Generate an annotated bean class</b> check box to add J2EE annotations to the source file. -->
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
-<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
-<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
-<!-- link to org.eclipse.jst.annotation.user.doc  annotation tagging -->
-</context>
-
-<!-- Page 3, Enterprise Bean details -->
-<context id="antejb1000">
-<description>Specify the EJB, JNDI and Display names for the enterprise bean. 
-The <b>EJB name</b> is the name of the enterprise bean class.
-The <b>JNDI name</b> is a logical name used by the server to locate an enterprise bean at runtime.
-The <b>Display name</b> is a short name for the enterprise bean that is used by tools.
-
-Optionally, provide a text <b>Description</b> of the enterprise bean class.
-
-Select the <b>State Type</b> (stateless or stateful) if you are creating a session bean.
-A stateful session bean maintains client-specific session information, or conversational state, across multiple method calls and transactions.
-A stateless session bean does not maintain conversational state.
-
-Select the <b>Transaction Type</b> (container or bean) for the enterprise bean. This specifies whether the container or the bean will handle transaction demarcation.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
-<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
-<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
-</context>
-
-<!-- Page 4, Enterprise Bean modifiers, interfaces and method stubs -->
-<context id="antejb1200">
-<description>Select the type of <b>Modifiers</b> for the bean class.
-
-Select the <b>Interfaces</b> that your bean class will implement. Use the <b>Add</b> and <b>Remove</b> buttons to create the list of interfaces.
-
-Select which method stubs you want created in the bean class.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-</context>
-
-
-
- 
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml
deleted file mode 100644
index 5eb25583f..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="APPCLIENT_EXPORT_APPCLIENT_WIZARD_PAGE1">
-<description>Use this wizard to export an application client project into a JAR file.  Select the application project to export, and provide a directory and filename for the exported JAR file.
-
-Select <b>Export source files</b> to include source files in the JAR file. 
-
-Select <b>Overwrite existing file</b> to replace an existing file. 
-</description>
-<!--topic label="Exporting an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjexpapp.html"/-->
-<!--topic label="Creating an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjappproj.html"/-->
-</context>
-<context id="EAR_EXPORT_PAGE1">
-<description>Use this wizard to export an enterprise application project into an EAR file. Select the enterprise application project to export, and provide a directory and filename for the exported EAR file.
-
-Select <b>Export source files</b> to include source files in the EAR file. 
-
-Select <b>Overwrite existing file</b> to replace an existing file. 
-</description>
-<!--topic label="Exporting an enterprise application into an EAR file" href="../com.ibm.etools.j2eeapp.doc/topics/tjexpear.html"/-->
-<!--topic label="Creating an enterprise application project" href="../com.ibm.etools.j2eeapp.doc/topics/tjear.html"/-->
-</context>
-<context id="EJB_EXPORT_PAGE1">
-<description>Use this wizard to export an EJB module into a JAR file. Select the EJB module to export, and provide a directory and filename for the exported JAR file.
-
-Select <b>Export source files</b> to include source files in the JAR file. 
-
-Select <b>Overwrite existing file</b> to replace an existing file. </description>
-<!--topic label="Exporting an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teexp.html"/-->
-<!--topic label="Importing an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teimp.html"/-->
-</context>
-
-<context id="EXPORT_RAR_WIZARD_PAGE">
-<description>Use this wizard to export a connector project into a RAR file.  Select the connector project to export, and provide a directory and filename for the exported RAR file.
-
-Select <b>Export source files</b> to include source files in the RAR file. 
-
-Select <b>Overwrite existing file</b> to replace an existing file. 
-</description>
-<!--topic label="Exporting a connector project to a RAR file" href="../com.ibm.etools.j2ee.doc/topics/tjexprar.html"/-->
-<!--topic label="Creating a connector project" href="../com.ibm.etools.j2ee.doc/topics/tjrar.html"/-->
-</context>
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml
deleted file mode 100644
index f013fc479..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="APPCLIENT_IMPORT_APPCLIENT_WIZARD_PAGE1">
-<description>Use this wizard to import an application client JAR file. Locate the application client JAR file on your file system using the <b>Browse</b> button. Optionally, modify the project name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for. 
-
-You can also specify whether or not to add the imported application client module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjimpapp.html"/-->
-<!--topic label="Creating an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjappproj.html"/-->
-</context>
-
-<context id="EAR_IMPORT_EAR_WIZARD_PAGE1">
-    <!-- wizard broken at time of this writing -->
-<description>Use this wizard to import an enterprise application EAR file.  Locate the enterprise application EAR file on your file system using the <b>Browse</b> button. Optionally, modify the project name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the resulting projects will be developed for. 
-</description>
-<!--topic label="Importing an enterprise application EAR file" href="../com.ibm.etools.j2eeapp.doc/topics/tjimpear.html"/-->
-<!--topic label="Creating an enterprise application project" href="../com.ibm.etools.j2eeapp.doc/topics/tjear.html"/-->
-</context>
-
-
-<context id="EJB_IMPORT_EJB_WIZARD_PAGE1">
-<description>Use this wizard to import an EJB JAR file. Locate the EJB JAR file on your file system using the <b>Browse</b> button. Optionally, modify the module name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for. 
-
-You can also specify whether or not to add the imported EJB module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teimp.html"/-->
-<!--topic label="Creating an EJB project" href="../com.ibm.etools.ejb.assembly.doc/topics/tecrtpro.html"/-->
-</context>
-
-<context id="IMPORT_RAR_WIZARD_PAGE">
-<description>Use this wizard to import a JCA Connector RAR file. Locate the Connector RAR file on your file system using the <b>Browse</b> button. Optionally, modify the module name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for. 
-
-You can also specify whether or not to add the imported connector module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing a connector project RAR file" href="../com.ibm.etools.j2ee.doc/topics/tjimprar.html"/-->
-<!--topic label="Creating a connector project" href="../com.ibm.etools.j2ee.doc/hmtl/tjrar.html"/-->
-</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml
deleted file mode 100644
index 14bd53265..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="com.ibm.wtp.ui.ProjectNavigator">
-<description>The J2EE Project Explorer view provides a hierarchical view of the content models for resources in the workbench. From this view, you can open the various project files in the appropriate editor. 
-
-By right-clicking on modules, you can access the pop-up context menu for additional development options.
-</description>
-<!--topic label="J2EE Hierarchy and Project Navigator views" href="../com.ibm.etools.j2eeapp.doc/topics/cjview.html"/-->
-<!--topic label="J2EE perspective" href="../com.ibm.etools.j2eeapp.doc/topics/cjpers.html"/-->
-</context>
-
-
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index f0dc1b590..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.infopop; singleton:=true
-Bundle-Version: 1.0.203.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml
deleted file mode 100644
index e7b6e4219..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<!--Eclipse preferences -->
-
-<context id="FlexibleProject">
-	<!-- Flexible Java Project  preferences-->
-<description>Select <b>Allow Multiple modules per project</b> to allow an enterprise application (EAR) project to contain more than one module
-of a particular type. For instance, more than one Application Client module. 
-</description>
-<!-- links to Flexible java project stuff-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE1">
-	<!-- J2EE Annotations  preferences main-->
-<description>Select the J2EE Annotation Provider  to use. 
-
-J2EE Annotations allow programmers to add specialized Javadoc tags to their source code, which can be used to generate code artifacts from templates.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!-- http://xdoclet.sourceforge.net/xdoclet/index.html -->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE2">
-	<!-- J2EE Annotations  preferences XDoclet-->
-<description>Use this page to set the XDoclet runtime preferences. XDoclet must be installed on the local system to use this function.
-
-Select <b>Enable XDoclet Builder</b> to turn on annotation-based artifact creation.
-
-Select the <b>Version</b> of XDoclet. Supported versions include 1.2.1, 1.2.2, 1.2.3; XDoclet version 1.1.2 is no longer supported.
-
-Provide the installation directory (<b>XDoclet Home</b>) for XDoclet on the local system.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!-- http://xdoclet.sourceforge.net/xdoclet/index.html -->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE3">
-	<!-- J2EE Annotations  preferences ejbdoclet-->
-<description>Ejbdoclet is a subset of the XDoclet specification that specifies details on EJB deployment descriptors.
-The syntax of deployment descriptors differs, depending on the vendor of  the Application Server being used. 
-
-Use this page to define which Application Server vendors to support. You can select one or more Application Server
-vendors, including JBoss, JOnAS, WebLogic, and WebSphere. Also select the version of the Application Server to support.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!--http://xdoclet.sourceforge.net/xdoclet/ant/xdoclet/modules/ejb/EjbDocletTask.html -->
-<!-- http://www.jboss.org-->
-<!-- http://jonas.objectweb.org/-->
-<!-- http:/www.bea.com-->
-<!-- http://www.ibm.com/software/websphere/-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-
-
-</contexts>
-
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml
deleted file mode 100644
index a9b9ce17f..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<contexts>
-<context id="csh_outer_container" title="Project creation wizards">
-<description/>
-</context>
-<context id="APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE1" title="New application client">
-<description>Use this wizard to create an application client project.
-
-On this page, name the application client project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html" label="Application client projects"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html" label="Creating an application client project"/>
-</context>
-<context id="APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE3" title="New application client">
-<description>In the <b>Source Folder</b> field, enter the name of the folder to use for source code. If you want to create a default class for the module, select the <b>Create a default Main class</b> check box.
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html" label="Application client projects"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html" label="Creating an application client project"/>
-</context>
-<context id="EAR_NEW_EAR_WIZARD_PAGE1" title="New EAR">
-<description>Use this wizard to create an enterprise application (EAR) project. An enterprise application project ties together one or more J2EE modules, including application client modules, EJB modules, Connector modules, or Web modules.
-
-On this page, name the EAR application project and select the workspace location to store the project files. You can also select a target runtime and a common configuration for the project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html" label="Enterprise application projects"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjear.html" label="Creating an enterprise application project"/>
-</context>
-<context id="NEW_EAR_COMP_PAGE">
-<!-- This page is no longer used -->
-<description>Use this page to select the facets the project will have and the runtimes the project will support.
-
-Select the check boxes under <b>Project Facet</b> to select the facets that the project will have. You can also change the default version level of each facet.
-
-To see the runtimes that your new project will support, click <b>Show Runtimes</b>. The <b>Runtimes</b> field lists the available runtimes. Select the check boxes next to the runtimes that you want the new project to support. The <b>Project Facets</b> list shows only the facets supported by the selected runtimes, preventing you from selecting a facet that does not work on a selected runtime. You can also choose a preferred runtime by selecting a runtime and then clicking the <b>Make Preferred</b> button. The preferred runtime provides the classpath for the project.
-
-You can save the settings for this project so you can create other projects with the same settings later. To save the settings for a project, set up the project on the Select Project Facets page, click the <b>Save</b> button, and type a name for the new preset. When you create a project later, you can select that preset from the <b>Presets</b> list.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cfacets.html" label="Project facets"/>
-</context>
-<context id="NEW_EAR_ADD_MODULES_PAGE" title="New EAR">
-<description>Select the check boxes next to each J2EE module you want to add to the new enterprise application project. Click the <b>New Module</b> button to create new modules.</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjear.html" label="Creating an enterprise application project"/>
-</context>
-<context id="EAR_NEW_MODULE_PROJECTS_PAGE">
-<description>Use this page to create new J2EE modules to add to the new enterprise application. The wizard can generate a set of default J2EE modules or individual customized J2EE modules.</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjear.html" label="Creating an enterprise application project"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-</context>
-<context id="EJB_NEW_EJB_WIZARD_PAGE1">
-<description>Use this wizard to create an EJB project.
-
-On this page, name the project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html" label="Creating EJB projects"/>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html" label="EJB architecture"/>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html" label="EJB client JAR projects"/>
-</context>
-<context id="EJB_NEW_EJB_WIZARD_PAGE2">
-<description>
-
-In the Source Folder field, enter the name of the folder to use for source code. You can also specify the name of the EJB client JAR module, as well as the name of the JAR file (<b>Client JAR URI</b>).
-
-</description>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html" label="Creating EJB projects"/>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html" label="EJB client JAR projects"/>
-</context>
-<context id="JCA_NEWIZARD_PAGE1" title="New connector wizard">
-<description>Use this wizard to create a Connector project. The J2EE Connector Architecture (JCA) specifies how a J2EE application component accesses a connection-based resource.
-
-On this page, name the Connector project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjrar.html" label="Creating a connector project"/>
-</context>
-<context id="JCA_NEWIZARD_PAGE3" title="New connector wizard">
-<description>In the <b>Source Folder</b> field, enter the name of the folder to use for source code.</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjrar.html" label="Creating a connector project"/>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml
deleted file mode 100644
index 8bd3a03bd..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<!-- project preferences -->
-
-<context id="JARdep">
-		<!-- JAR dependencies preferences-->
-<description>Use this page to specify dependent JAR files for modules within the associated project.
-
-Select <b>Use EJB JARs</b>, <b>Use EJB client JARs</b>, or <b>Allow both</b> to control which JAR files are listed.  Then, select the JAR files from the list. This will update the run-time class path and Java project build path with the appropriate JAR files.
-
-The <b>Manifest Class-Path</b> field displays the manifest class-path changes based on the JAR files selected. This field is display only and shows you the class path for your module file.
-</description>
-<!-- need links to EJB base info, EJB Client info, project class paths-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="EARmod">
-	<!-- EAR modules preferences-->
-<description><!-- page is blank at the time of this writing -->
-</description>
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-
-
-</contexts>
-
diff --git a/docs/org.eclipse.jst.j2ee.infopop/about.html b/docs/org.eclipse.jst.j2ee.infopop/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</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 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>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/build.properties b/docs/org.eclipse.jst.j2ee.infopop/build.properties
deleted file mode 100644
index 0aada8721..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = EJBCreateWizard_HelpContexts.xml,\
-               ExportWizard_HelpContexts.xml,\
-               ImportWizard_HelpContexts.xml,\
-               J2EEGeneral_HelpContexts.xml,\
-               Preferences_HelpContexts.xml,\
-               ProjectCreateWizard_HelpContexts.xml,\
-               ProjectPrefs_HelpContexts.xml,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/
-src.includes = build.properties
-generateSourceBundle=false
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/plugin.properties b/docs/org.eclipse.jst.j2ee.infopop/plugin.properties
deleted file mode 100644
index b56d2b5d9..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# NLS_MESSAGEFORMAT_VAR 
-# NLS_ENCODING=UTF-8 
-
-pluginName    = J2EE tools infopops
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.jst.j2ee.infopop/plugin.xml b/docs/org.eclipse.jst.j2ee.infopop/plugin.xml
deleted file mode 100644
index d8dff6f95..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-   
-   <extension point="org.eclipse.help.contexts">
-	<contexts file="ExportWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-	<contexts file="ImportWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-	<contexts file="J2EEGeneral_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-	<contexts file="ProjectCreateWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-	<contexts file="EJBCreateWizard_HelpContexts.xml" />
-	<contexts file="ProjectPrefs_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-	<contexts file="Preferences_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-   </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/.cvsignore b/docs/org.eclipse.jst.servlet.ui.infopop/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/.project b/docs/org.eclipse.jst.servlet.ui.infopop/.project
deleted file mode 100644
index 26eedc488..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.servlet.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/DynWebWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/DynWebWizContexts.xml
deleted file mode 100644
index e8bea47f0..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/DynWebWizContexts.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="webw1000">
-<description>Use this page to name your Web project and specify the file system location (the place where the resources you create are stored.) When the Use default check box is selected, the project will be created in the file system location where your workspace resides. To change the default file system location, clear the checkbox and locate the path using the <b>Browse</b> button. To configure additional options, select the <b>Next</b> button.
-In the Target Runtime field, select the server where you want to deploy the Web project. if a server is not already defined, click <b>New</b> to select a server runtime environment. 
-Click <b>Add project to EAR</b> to add the project to an enterprise application project. The default EAR project name is the name of the Web project appended with EAR.</description>
-<topic label="Creating a dynamic Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcreprj.html"/>
-</context>
-
-<context id="webw1100">
-<description>Presets are used to define a default set of facet versions that will configure a project for a particular type of development. Select one or more facets for the dynamic Web project. To change the version of the facet, click the facet version and select a version from the drop-down list.
-Click Show Runtimes to view the available runtimes and runtime compositions.</description>
-<topic label="Creating a dynamic Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcreprj.html"/>
-</context>
-
-<context id="webw1200">
-<description>The context root is the top-level directory of your application when it is deployed to a Web server. 
-The Content directory folder is the mandatory location of all Web resources, for example Web pages, style sheets or graphics. If the files are not placed in this directory (or in a subdirectory structure under this directory), the files will not be available when the application is executed on a server. 
-The Java source directory contains the project's Java source code for classes, beans, and servlets. When these resources are added to a Web project, they are automatically compiled and the generated files are added to the WEB-INF/classes directory.
-</description>
-<topic label="Creating a dynamic Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcreprj.html"/>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/FilterWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/FilterWizContexts.xml
deleted file mode 100644
index 25bf23c91..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/FilterWizContexts.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-
-<contexts>
-<context id="fltw1050">
-<description>
-A filter is used to give you access to the HttpServletRequest and the HttpServletResponse objects before they are passed into a servlet.
-
-Specify the <b>Project</b> and <b>Folder</b> where the filter class will be placed. The filter class should be stored in the Java source directory, which you specified when you created the Dynamic Web Project (for example src).
-
-Specify the <b>Java package</b> that the class will belong to. If you do not specify one, the class will be added into a default package.
-
-Specify the <b>Class name</b> of the filter (for example MyFilter).
-
-In the field <b>Superclass</b> specify the superclass for the filter,only if it is derived from one. Click <b>Browse</b> to choose from the available, already existing or created, superclasses. (This field is optional).
-
-Check <b>Use existing Filter class</b> and you could get an already existing class and it will be registered automatically in your web.xml.
-
-Note: If you have selected the XDoclet facet when creating the Dynamic Web Project, you can now select <b>Generate a XDoclet annotated class</b>. This will create a XDoclet annotated filter class. The annotations will generate the metadata in the web.xml deployment descriptor.
-</description>
-<topic label="Creating Filters" href="../org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html"/>
-</context>
-
-<context id="fltw1100">
-<description>
-Note that the Class Name value provided in the first page of the wizard is automatically mapped to the <b>Name</b> field on this page. 
-
-Specify the <b>Initialization Parameters</b> of the filter as name/value pairs (for example passwords).
-
-In the <b>Filter Mappings</b> field, specify the Servlet, to which the filter will be mapped. Do this by clicking the <b>Add</b> button. In the <b>Add filter mapping</b> dialog that appears after you click the <b>Add</b> button, if you select the <b>Servlet</b> radio button you can choose an existing servlet class, but if you select the <b>URL Pattern</b> radio button you have to enter the URL pattern to which you want to map the filter. In the same dialog, but from <b>Select Dispatchers</b> group, you can choose which dispatchers to be invoked in the deployment descriptor. The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE, and ERROR. 
- <b>-</b> A value of <b>FORWARD</b> means the Filter will be applied under <b>RequestDispatcher.forward()</b> calls.
- <b>-</b> A value of <b>REQUEST</b> means the Filter will be applied under ordinary client calls to the <b>path</b> or <b>servlet</b>.
- <b>-</b> A value of <b>INCLUDE</b> means the Filter will be applied under <b>RequestDispatcher.include()</b> calls.
- <b>-</b> A value of <b>ERROR</b> means the Filter will be applied under the error page mechanism.
- <b>-</b> If no despatcher is selected, it indicates that filters will be applied only under ordinary client calls to the <b>path</b> or <b>servlet</b>.
-</description>
-<topic label="Creating Filters" href="../org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html"/>
-</context>
-
-<context id="fltw1200">
-<description>
-Note that the Sun Microsystems Java Servlet Specification states that a Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore, you cannot change these modifiers. The only one available for change is the <b>final</b> modifier. 
-
-A filter class must implement the Filter interface, that's why the <b>javax.servlet.Filter</b> is provided as the default Interface. You can also add additional interfaces to implement. Click <b>Add</b> to open the <b>Interface Selection</b> dialog. In this dialog, as you type the name of the interface that you are interested to add, there will be displayed only the interfaces that match the pattern.
-
-Note: Because the methods init, doFilter and destroy are provided from javax.servlet.Filter interface and this interface is obligatory for each Filter class, the option <b>Inherited abstract methods</b> is always checked and can't be changed.
-
-Using the option <b>Constructors from superclass</b> you can choose whether to override the constructor of the class, which you specified as superclass in the first page of the wizard. Note: If you did not specify any class as superclass, you can not check this option.
-</description>
-<topic label="Creating Filters" href="../org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/ListenerWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/ListenerWizContexts.xml
deleted file mode 100644
index 6d609d145..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/ListenerWizContexts.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<contexts>
-<context id="lstw1050">
-<description>
-Specify the <b>Project</b> and <b>Folder</b> where the listener class will be placed. The listener class should be stored in the Java source directory, which you specified when you created the Dynamic Web Project (for example src).
-
-Specify the <b>Java package</b> that the class will belong to. If you do not specify one, the class will be added into a default package. Specify the <b>Class name</b> of the listener (for example MyListener).
-
-In the field <b>Superclass</b> specify the superclass for the listener class,only if your listener class is derived from one. Click <b>Browse</b> to choose from the available, already existing or created, superclasses. (This field is optional).
-
-Note: If you have selected the XDoclet facet when creating the Dynamic Web Project, you can now select <b>Generate a XDoclet annotated class</b>. This will create a XDoclet annotated listener class. The annotations will generate the metadata in the web.xml deployment descriptor.
-</description>
-<topic label="Creating Listeners" href="../org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html"/>
-</context>
-
-<context id="lstw1100">
-<description>
-From the <b>Servlet Context Events</b> group, you can select any appropriate group of method stubs to be created in the listener file. These are the methods of the two basic listener interfaces, that are provided from the <b>javax.servlet</b> package:
-  <b>-</b> The <b>ServletContextListener</b> interface is used to listen to the ServletContext life cycle events.
-  <b>-</b> The <b>ServletContextAttributeListener</b> interface is used to be notified when any attribute is added to the ServletContext or if any of the ServletContext's attributes are changed or removed. 
-
-From the <b>HTTP Session Events</b> group, you can select any appropriate group of method stubs to be created in the listener class. These are the methods of the listener interfaces provided from the <b>javax.servlet.http</b> package:
-  <b>-</b> The <b>HttpSessionListener</b> and <b>HttpSessionActivationListener</b> interfaces are used to listen to creation, invalidation, activation, passivation and timeout of an HttpEvent object. 
-  <b>-</b> The <b>HttpSessionAttributeListener</b> and <b>HttpSessionBindingListener</b> interfaces are used to be notified when any attribute is added to, removed from, or replaced in the HttpSession object. 
-
-From the <b>Servlet Request Events</b> group, you can select any appropriate group of method stubs to be created in the listener class. These are the methods of the additional listener interfaces provided from the <b>javax.servlet</b> package:
-  <b>-</b> The <b>ServletRequestListener</b> interface is used to be notified when a servlet request has started being processed by web components.
-  <b>-</b> The <b>ServletRequestAttributeListener</b> interface is used to be notified when any attribute is added to, removed from or replaced in the ServletRequest object.
-
-You can click the <b>Select All</b> button to select all available groups of method stubs or click the <b>Clear</b> button to clear all already selected method stubs.
-</description>
-<topic label="Creating Listeners" href="../org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html"/> 
-</context>
-
-<context id="lstw1200">
-<description>
-Note that the Sun Microsystems Java Servlet Specification states that a Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore, you cannot change these modifiers. The only one available for change is the <b>final</b> modifier. 
-
-Note that the listener interface of the selected method stubs provided in the previous page of the wizard, is automatically mapped to the Interfaces field on this page. You can click the <b>Add</b> button to add additional interfaces to implement.
-
-If the <b>Inherited abstract methods</b> option is checked, it means that you want to override the methods provided by the interface, which is defined in the <b>Interfaces</b> filed.
-
-Using the option <b>Constructors from superclass</b> you can choose whether to override the constructor of the class, which you specified as superclass in the first page of the wizard. Note: If you did not specify any class as superclass, you can not check this option.
-</description>
-<topic label="Creating Listeners" href="../org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.servlet.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 013f2dcd6..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.servlet.ui.infopop; singleton:=true
-Bundle-Version: 1.0.202.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/ServletWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/ServletWizContexts.xml
deleted file mode 100644
index 8942b51d5..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/ServletWizContexts.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="srvw1050">
-<description>
-Specify the <b>Project</b> and <b>Folder</b> where the servlet class will be placed. The servlet class should be stored in the Java source directory that you specified when you created the Dynamic Web Project (for example src). 
-
-Specify the <b>Java package</b> that the class will belong to (it is added into a default package if you do not specify one).
-
-Specify the <b>Class name</b> of the servlet (for example HelloServlet).
-
-In the field <b>Superclass</b> specify a superclass for the servlet class. A servlet created by this wizard can have HttpServlet, or any class that has HttpServlet in its hierarchy as its superclass. Click <b>Browse</b> to choose from the available superclasses.
-
-Check <b>Use existing Servlet class</b> and you could get an already existing class and it will be registered automatically in your web.xml.
-
-Note: If you have selected the XDoclet facet when creating the Dynamic Web Project, you can now select <b>Generate a XDoclet annotated class</b>. This will create a XDoclet annotated servlet class. The annotations will generate the metadata in the web.xml deployment descriptor.
-</description>
-<topic label="Creating Servlets" href="../org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html"/>
-</context>
-
-<context id="srvw1100">
-<description>
-Note that the Class Name value provided in the first page of the wizard is automatically mapped to the <b>Name</b> field on this page. 
-
-Specify the <b>Initialization Parameters</b> of the servlet as name/value pairs, for example passwords.
-
-In the <b>URL Mappings</b> field, specify the URL pattern to be mapped with the servlet.
-</description>
-<topic label="Creating Servlets" href="../org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html"/>
-</context>
-
-<context id="srvw1200">
-<description>
-Note that the Sun Microsystems Java Servlet Specification states that a Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore, you cannot change these modifiers. The only one available for change is the <b>final</b> modifier.  
-
-If one of the HttpServlet or GenericServlet classes is not specified as a superclass of the Servlet class, the <b>javax.servlet.Servlet</b> is provided as the default interface and defines life cycle methods. You can use the wizard to add additional interfaces to implement.Click <b>Add</b> to open the
-<b>Interface Selection</b> dialog. In this dialog, as you type the name of the interface that you are interested in adding in the <b>Choose interfaces</b> field, the list of available interfaces listed in the <b>Matching items</b> list box updates dynamically to display only the interfaces that match the pattern. 
-
-When the <b>Inherited abstract methods</b> option is checked you can select which methods, provided by HttpServlet class, to be overridden. The available methods are:
-  - <b>init, service and destroy</b> which carries of the servlet's life cycle; 
-  - <b>getServletConfig and getServletInfo</b>, which returns respectively servlet's ServletConfig object containing initialization and startup parameters and information about the current servlet;  
-  - the six <b>doXXX</b> that get called when a related HTTP request method is used. 
-
-Note: If you did not specify HttpServlet class as superclass in the first page of the wizard, the option <b>Inherited abstract methods</b> is always checked and can not be changed, because each servlet must implement the methods of the javax.servlet.Servlet interface: init, service, destroy, getServletConfig and getServletInfo.   
-
-Using the option <b>Constructors from superclass</b> you can choose whether to override the constructor of the class, which you specified as superclass in the first page of the wizard. Note: If you did not specify any class as superclass, you can not check this option.
-</description>
-<topic label="Creating Servlets" href="../org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/about.html b/docs/org.eclipse.jst.servlet.ui.infopop/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</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 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>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/build.properties b/docs/org.eclipse.jst.servlet.ui.infopop/build.properties
deleted file mode 100644
index 0768accd2..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = ServletWizContexts.xml,\
-               FilterWizContexts.xml,\
-               ListenerWizContexts.xml,\
-               about.html,\
-               plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               DynWebWizContexts.xml
-src.includes = build.properties
-generateSourceBundle=false
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.properties b/docs/org.eclipse.jst.servlet.ui.infopop/plugin.properties
deleted file mode 100644
index 21abadf85..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName     = Servlet infopop
-pluginProvider = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.xml b/docs/org.eclipse.jst.servlet.ui.infopop/plugin.xml
deleted file mode 100644
index aff6d1f5a..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-      <contexts file="ServletWizContexts.xml" plugin ="org.eclipse.jst.servlet.ui"/>
-   <contexts file="DynWebWizContexts.xml" plugin ="org.eclipse.jst.servlet.ui"/>
-   <contexts
-         file="ListenerWizContexts.xml"
-         plugin="org.eclipse.jst.servlet.ui">
-   </contexts>
-   <contexts
-         file="FilterWizContexts.xml"
-         plugin="org.eclipse.jst.servlet.ui">
-   </contexts>
-
-</extension>
-
-
-</plugin>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore b/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.project b/docs/org.eclipse.wst.web.ui.infopop/.project
deleted file mode 100644
index 10c4a6e98..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index f703703db..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Static Web infopop
-Bundle-SymbolicName: org.eclipse.wst.web.ui.infopop; singleton:=true
-Bundle-Version: 1.0.202.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml b/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
deleted file mode 100644
index bf0f403b0..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="webw2000">
-<description> Use this page to name your Web project and specify the file system location (the place where the resources you create are stored.) When the Use default check box is selected, the project will be created in the file system location where your workspace resides. To change the default file system location, clear the checkbox and locate the path using the <b>Browse</b> button. To configure additional options, select the <b>Next</b> button.
-In the Target Runtime field, select the server where you want to publish the Web project. if a server is not already defined, click <b>New</b> to select a server runtime environment. </description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2100">
-<description>Presets are used to define a default set of facet versions that will configure a project for a particular type of development. The Static Web Module facet enables the project to be deployed as a static
-Web module. Click Show Runtimes to view the available runtimes and runtime compositions.</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2200">
-<description>The Web content folder is where the elements of your Web site such as Web pages, graphics and style sheets are stored. This directory structure is necessary to ensure that the content of your Web site will be included in the WAR file at deployment and that link validation will work correctly.
-</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-
-</contexts>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/about.html b/docs/org.eclipse.wst.web.ui.infopop/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</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 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>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/build.properties b/docs/org.eclipse.wst.web.ui.infopop/build.properties
deleted file mode 100644
index 0c7c1a9ed..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = StaticWebWizContexts.xml,\
-               about.html,\
-               plugin.xml,\
-               plugin.properties,\
-               META-INF/
-src.includes = build.properties
-generateSourceBundle=false
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.properties b/docs/org.eclipse.wst.web.ui.infopop/plugin.properties
deleted file mode 100644
index b61d2de9c..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName     = Static Web infopop
-pluginProvider = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml b/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
deleted file mode 100644
index 20ac01893..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-      <contexts file="StaticWebWizContexts.xml" plugin ="org.eclipse.wst.web.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/features/org.eclipse.jem-feature/.project b/features/org.eclipse.jem-feature/.project
deleted file mode 100644
index 866466f99..000000000
--- a/features/org.eclipse.jem-feature/.project
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-</projectDescription>
diff --git a/features/org.eclipse.jem-feature/archived.txt b/features/org.eclipse.jem-feature/archived.txt
deleted file mode 100644
index ae7c321b2..000000000
--- a/features/org.eclipse.jem-feature/archived.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This feature is no longer used, 
-so I have "nulled out" the head stream 
-to avoid confusion. 
-
diff --git a/features/org.eclipse.jst.doc.user.feature/.cvsignore b/features/org.eclipse.jst.doc.user.feature/.cvsignore
deleted file mode 100644
index de0aa9303..000000000
--- a/features/org.eclipse.jst.doc.user.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.jst.doc.user.feature_0.7.0.bin.dist.zip
diff --git a/features/org.eclipse.jst.doc.user.feature/.project b/features/org.eclipse.jst.doc.user.feature/.project
deleted file mode 100644
index 20b066ae8..000000000
--- a/features/org.eclipse.jst.doc.user.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.doc.isv.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.doc.user.feature/build.properties b/features/org.eclipse.jst.doc.user.feature/build.properties
deleted file mode 100644
index 5ccd634a8..000000000
--- a/features/org.eclipse.jst.doc.user.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.properties,\
-               feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/features/org.eclipse.jst.doc.user.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.doc.user.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.doc.user.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.doc.user.feature/epl-v10.html b/features/org.eclipse.jst.doc.user.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.doc.user.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.doc.user.feature/feature.properties b/features/org.eclipse.jst.doc.user.feature/feature.properties
deleted file mode 100644
index 9ad20c357..000000000
--- a/features/org.eclipse.jst.doc.user.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 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 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.doc.user.feature/feature.xml b/features/org.eclipse.jst.doc.user.feature/feature.xml
deleted file mode 100644
index 77e1a59a0..000000000
--- a/features/org.eclipse.jst.doc.user.feature/feature.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.doc.user.feature"
-      label="%featureName"
-      version="1.6.0.qualifier"
-      provider-name="%providerName">
-   <install-handler/>
-
-   <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"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.server.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.server.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.doc.user.feature/license.html b/features/org.eclipse.jst.doc.user.feature/license.html
deleted file mode 100644
index 56445985d..000000000
--- a/features/org.eclipse.jst.doc.user.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/features/org.eclipse.jst.enterprise_core.feature.patch/.project b/features/org.eclipse.jst.enterprise_core.feature.patch/.project
deleted file mode 100644
index fa4494a12..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_core.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/build.properties b/features/org.eclipse.jst.enterprise_core.feature.patch/build.properties
deleted file mode 100644
index 64f93a9f0..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature.patch/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/feature.xml b/features/org.eclipse.jst.enterprise_core.feature.patch/feature.xml
deleted file mode 100644
index e655a2af7..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature.patch/feature.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_core.feature.patch"
-      label="Patch Feature"
-      version="1.0.0">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jst.enterprise_core.feature" version="1.5.5.v200707311635--2PD88S8V_KASA8" patch="true"/>
-   </requires>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/.cvsignore b/features/org.eclipse.jst.enterprise_core.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.enterprise_core.feature/.project b/features/org.eclipse.jst.enterprise_core.feature/.project
deleted file mode 100644
index b522b4769..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_core.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/build.properties b/features/org.eclipse.jst.enterprise_core.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.enterprise_core.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_core.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_core.feature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/feature.properties
deleted file mode 100644
index cf186dbd6..000000000
--- a/features/org.eclipse.jst.enterprise_core.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 Core
-
-# "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 core functionality
-
-# "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_core.feature/feature.xml b/features/org.eclipse.jst.enterprise_core.feature/feature.xml
deleted file mode 100644
index 3d70e1365..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/feature.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_core.feature"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jem" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jem.util" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.commands" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jem.workbench" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.edit" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.j2ee" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.emf" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.common.frameworks" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.ws.parser" version="1.0.100" match="equivalent"/>
-      <import plugin="org.eclipse.wst.wsdl" version="1.1.0" match="equivalent"/>
-      <import plugin="javax.wsdl" version="1.4.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.web" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="equivalent"/>
-      <import plugin="org.eclipse.emf.codegen"/>
-      <import plugin="org.eclipse.jst.common.annotations.controller"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.wst.validation" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.common.project.facet.core" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jee" version="1.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb" version="1.1.0" match="equivalent"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.webservice"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.jca"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jee.ejb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/license.html b/features/org.eclipse.jst.enterprise_core.feature/license.html
deleted file mode 100644
index 56445985d..000000000
--- a/features/org.eclipse.jst.enterprise_core.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/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f10..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 1e9f89efd..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/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 Core Developer Resources
-
-# "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=Source code zips for JST enterprise core.
-
-# "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_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a489a..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>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 &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <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>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df47..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index c3f19257e..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Enterprise Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d68..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 85bf6e4bc..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Enterprise Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore b/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore
deleted file mode 100644
index 95a8d29f1..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-features
-plugins
-build.xml
-org.eclipse.jst.enterprise_sdk.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/.project b/features/org.eclipse.jst.enterprise_sdk.feature/.project
deleted file mode 100644
index 44e698217..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/build.properties b/features/org.eclipse.jst.enterprise_sdk.feature/build.properties
deleted file mode 100644
index 925a0405c..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
-
-generate.feature@org.eclipse.jst.enterprise_ui.feature.source=org.eclipse.jst.enterprise_ui.feature, feature@org.eclipse.jst.enterprise_core.feature.source
-
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties b/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties
deleted file mode 100644
index 9ce770a75..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.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 Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for JST enterprise tools
-
-# "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_sdk.feature/feature.xml b/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
deleted file mode 100644
index 3dec14bdc..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_sdk.feature"
-      label="%featureName"
-      version="3.0.0.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>
-
-   <includes
-         id="org.eclipse.jst.enterprise_ui.feature"
-         version="0.0.0"/>
-   <includes
-         id="org.eclipse.jst.enterprise_ui.feature.source"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/license.html b/features/org.eclipse.jst.enterprise_sdk.feature/license.html
deleted file mode 100644
index 56445985d..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.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/features/org.eclipse.jst.enterprise_ui.feature.patch/.project b/features/org.eclipse.jst.enterprise_ui.feature.patch/.project
deleted file mode 100644
index b157d640f..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_ui.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/build.properties b/features/org.eclipse.jst.enterprise_ui.feature.patch/build.properties
deleted file mode 100644
index 64f93a9f0..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
deleted file mode 100644
index 863acb3fa..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_ui.feature.patch"
-      label="Patch Feature"
-      version="1.0.0">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jst.enterprise_ui.feature" version="1.5.5.qualifier" patch="true"/>
-   </requires>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore b/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/.project b/features/org.eclipse.jst.enterprise_ui.feature/.project
deleted file mode 100644
index 956956314..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_ui.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.enterprise_ui.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_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/feature.properties
deleted file mode 100644
index c89eac6c5..000000000
--- a/features/org.eclipse.jst.enterprise_ui.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 UI
-
-# "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 UI functionality
-
-# "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_ui.feature/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature/feature.xml
deleted file mode 100644
index 7ed0cee70..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_ui.feature"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.enterprise_userdoc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.enterprise_core.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.wst.command.env" version="1.0.101" match="equivalent"/>
-      <import plugin="org.eclipse.wst.command.env.core" version="1.0.101" match="equivalent"/>
-      <import plugin="org.eclipse.jem.util" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jem.workbench" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jem" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.wsdl" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.jca" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.web" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.validation" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.emf" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.ltk.core.refactoring" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.web" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.common.frameworks" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.common.annotations.controller" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb.annotation.model" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.web.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.ui.navigator.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.navigator" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jee" version="1.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.ws.parser" version="1.0.100" match="equivalent"/>
-      <import plugin="org.eclipse.jst.ws" version="1.0.101" match="equivalent"/>
-      <import plugin="org.eclipse.jst.ws.consumption.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.ws.consumption" version="1.0.101" match="equivalent"/>
-      <import plugin="org.eclipse.jst.ws.ui" version="1.0.100" match="equivalent"/>
-      <import plugin="org.eclipse.jst.ws.axis.consumption.core" version="1.0.101" match="equivalent"/>
-      <import plugin="org.eclipse.jst.ws.axis.consumption.ui" version="1.0.101" match="equivalent"/>
-      <import plugin="javax.wsdl" version="1.4.0" match="equivalent"/>
-      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.apache.axis" version="1.4.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.ui.workbench" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.ejb.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.servlet.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.jca.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.common.project.facet.core" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.j2ee.webservice" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.navigator.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.apache.ant" version="1.6.5" match="compatible"/>
-      <import plugin="org.eclipse.core.commands" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.ws.explorer" version="1.0.204" match="equivalent"/>
-      <import plugin="org.eclipse.wst.ws.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.ws.explorer" version="1.0.101" match="equivalent"/>
-      <import plugin="org.apache.xerces" version="2.8.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.j2ee.webservice.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.wsdl.validation" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.xsd" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.internet.monitor.core" version="1.0.102" match="equivalent"/>
-      <import plugin="org.eclipse.emf.codegen" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.validation.ui" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.environment" version="1.0.100"/>
-      <import plugin="org.eclipse.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb.annotations.emitter" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jdt" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ant.core" version="3.1.100" match="compatible"/>
-      <import plugin="org.eclipse.ant.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb.annotations.xdoclet" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb" version="1.1.103" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.core" version="1.1.102" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.emf" version="1.1.103" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.wst.ws" version="1.0.100"/>
-      <import plugin="org.eclipse.wst.server.ui" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.wst.command.env.ui" version="1.0.101"/>
-      <import plugin="org.eclipse.jst.ws.consumption" version="1.0.304" match="equivalent"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.j2ee.navigator.ui" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.common.frameworks" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.j2ee.jca" version="1.1.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.ws"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.creation.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.consumption.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.jca.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.navigator.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.webservice.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.consumption.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.servlet.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.uddiregistry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.creation.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.servlet.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.creation.ejb.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ejb.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotations.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotation.model"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotations.emitter"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.xdoclet.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jee.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ejb.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/license.html
deleted file mode 100644
index 76abfb462..000000000
--- a/features/org.eclipse.jst.enterprise_ui.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/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 2ff923484..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.jst.enterprise_core.feature.source = org.eclipse.jst.enterprise_core.feature
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 34dd00bd8..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise UI Developer Resources
-
-# "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=Source code zips for JST enterprise UI.
-
-# "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_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a489a..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>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 &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <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>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df47..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index e00fafaaf..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Enterprise UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 30a575c96..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index d6209ea83..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Enterprise UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
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 4b5f609bf..000000000
--- 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 ffcfb55b8..000000000
--- 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 7f47694aa..000000000
--- 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 bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
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 ed4b19665..000000000
--- 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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![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 18dcbf5e3..000000000
--- 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 caabe4fb7..000000000
--- 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.0.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 56445985d..000000000
--- 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/features/org.eclipse.jst.servlet.ui.patch/.project b/features/org.eclipse.jst.servlet.ui.patch/.project
deleted file mode 100644
index e47f1ea9b..000000000
--- a/features/org.eclipse.jst.servlet.ui.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.servlet.ui.patch</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.servlet.ui.patch/build.properties b/features/org.eclipse.jst.servlet.ui.patch/build.properties
deleted file mode 100644
index 64f93a9f0..000000000
--- a/features/org.eclipse.jst.servlet.ui.patch/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.jst.servlet.ui.patch/feature.xml b/features/org.eclipse.jst.servlet.ui.patch/feature.xml
deleted file mode 100644
index db27fe46c..000000000
--- a/features/org.eclipse.jst.servlet.ui.patch/feature.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.servlet.ui.patch"
-      label="Patch Feature"
-      version="1.0.0">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jst.enterprise_ui.feature" version="1.5.5.qualifier" patch="true"/>
-   </requires>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_core.feature.patch/.project b/features/org.eclipse.jst.web_core.feature.patch/.project
deleted file mode 100644
index 4c41cabd5..000000000
--- a/features/org.eclipse.jst.web_core.feature.patch/.project
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_core.feature.patch</name>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_core.feature.patch/description.txt b/features/org.eclipse.jst.web_core.feature.patch/description.txt
deleted file mode 100644
index a1fc6d0af..000000000
--- a/features/org.eclipse.jst.web_core.feature.patch/description.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-The HEAD branch of this patch feature is intentionally empty, 
-to attempt to try and avoid confusion. 
-
-Please load the correct version from the branch of the related patch.
diff --git a/features/org.eclipse.jst.web_core.feature/.cvsignore b/features/org.eclipse.jst.web_core.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.web_core.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_core.feature/.project b/features/org.eclipse.jst.web_core.feature/.project
deleted file mode 100644
index 5eac7ba28..000000000
--- a/features/org.eclipse.jst.web_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_core.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_core.feature/build.properties b/features/org.eclipse.jst.web_core.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.web_core.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.web_core.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/epl-v10.html b/features/org.eclipse.jst.web_core.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_core.feature/feature.properties b/features/org.eclipse.jst.web_core.feature/feature.properties
deleted file mode 100644
index bf394c7a3..000000000
--- a/features/org.eclipse.jst.web_core.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 Web Core
-
-# "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 Web core functionality.
-
-# "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.web_core.feature/feature.xml b/features/org.eclipse.jst.web_core.feature/feature.xml
deleted file mode 100644
index 528fc48b3..000000000
--- a/features/org.eclipse.jst.web_core.feature/feature.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_core.feature"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jem.util" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jem.proxy" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jem.workbench" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jem" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.change" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.commands" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.codegen" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface" version="3.2.0" match="compatible"/>
-      <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
-      <import plugin="javax.servlet.jsp" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.emf" version="1.1.103" match="compatible"/>
-      <import plugin="com.ibm.icu" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsf.facesconfig" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsp.core" version="1.1.0"/>
-      <import plugin="org.eclipse.jst.jsf.common" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.sse.ui" version="1.0.101"/>
-      <import plugin="org.eclipse.swt" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsf.common.runtime" version="1.0.0" match="compatible"/>
-      <import plugin="javax.servlet" version="2.4.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.emf" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.common.annotations.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.validation" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.common.project.facet.core" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.j2ee" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.web" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.common.annotations.controller" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.common.frameworks" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="equivalent"/>
-      <import plugin="com.ibm.icu" version="3.8.1" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filebuffers" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.4.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.301" match="equivalent"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.300" match="equivalent"/>
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.300" match="equivalent"/>
-      <import plugin="org.eclipse.wst.css.core" version="1.1.200" match="equivalent"/>
-      <import plugin="org.eclipse.wst.html.core" version="1.1.200" match="equivalent"/>
-      <import plugin="org.eclipse.wst.validation" version="1.2.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.jca" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jee" version="1.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.web" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.j2ee.core" version="1.1.102" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.html.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.common.frameworks" version="1.1.102" match="equivalent"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jem.beaninfo"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jem.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jem.workbench"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.annotations.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.annotations.controller"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.frameworks"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.web"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jee"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jee.web"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.standard.schemas"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.common.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.facesconfig"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.standard.tagsupport"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_core.feature/license.html b/features/org.eclipse.jst.web_core.feature/license.html
deleted file mode 100644
index 76abfb462..000000000
--- a/features/org.eclipse.jst.web_core.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/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f10..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index f12c794c9..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +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 Web Core Developer Resources
-# "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=Source code zips for JST Web core.
-
-# "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.web_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a489a..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>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 &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <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>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df47..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index cedcbea0d..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Web Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d68..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index f188816f6..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Web Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_sdk.feature/.cvsignore b/features/org.eclipse.jst.web_sdk.feature/.cvsignore
deleted file mode 100644
index 262183fe9..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-build.xml
-org.eclipse.jst.web_sdk.feature_1.0.0.bin.dist.zip
-features
-plugins
-dev.properties
diff --git a/features/org.eclipse.jst.web_sdk.feature/.project b/features/org.eclipse.jst.web_sdk.feature/.project
deleted file mode 100644
index 0aa6f523e..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_sdk.feature/build.properties b/features/org.eclipse.jst.web_sdk.feature/build.properties
deleted file mode 100644
index f8e0401a7..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
-
-
-generate.feature@org.eclipse.jst.web_ui.feature.source=org.eclipse.jst.web_ui.feature, feature@org.eclipse.jst.web_core.feature.source
diff --git a/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_sdk.feature/epl-v10.html b/features/org.eclipse.jst.web_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_sdk.feature/feature.properties b/features/org.eclipse.jst.web_sdk.feature/feature.properties
deleted file mode 100644
index 99618d608..000000000
--- a/features/org.eclipse.jst.web_sdk.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 Web Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for JST Web tools
-
-# "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.web_sdk.feature/feature.xml b/features/org.eclipse.jst.web_sdk.feature/feature.xml
deleted file mode 100644
index 092ef16ee..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_sdk.feature"
-      label="%featureName"
-      version="3.0.0.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>
-
-   <includes
-         id="org.eclipse.jst.web_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.web_ui.feature.source"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.doc.dev"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_sdk.feature/license.html b/features/org.eclipse.jst.web_sdk.feature/license.html
deleted file mode 100644
index 56445985d..000000000
--- a/features/org.eclipse.jst.web_sdk.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/features/org.eclipse.jst.web_ui.feature.patch/.project b/features/org.eclipse.jst.web_ui.feature.patch/.project
deleted file mode 100644
index 4603a674b..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_ui.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/build.properties b/features/org.eclipse.jst.web_ui.feature.patch/build.properties
deleted file mode 100644
index 64f93a9f0..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/buildnotes_org.eclipse.jst.web_ui.feature.patch.html b/features/org.eclipse.jst.web_ui.feature.patch/buildnotes_org.eclipse.jst.web_ui.feature.patch.html
deleted file mode 100644
index 60c3bc43e..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/buildnotes_org.eclipse.jst.web_ui.feature.patch.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Build" content="Build">
-   <title>WTP 1.5.5 Patches</title>
-</head>
-
-<body>
-
-<h1>WTP 1.5.5 Patches</h1>
-
-<h2>org.eclipse.jst.web_ui.feature</h2>
-
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=185402'>185402</a>. JSP validation fails because of defaulted attribute flush on jsp:include</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=203711'>203711</a>. taglib declarations in JSP fragments</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=199053'>199053</a>. Syntax errors outside of scripting areas not reported</p>
-
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/epl-v10.html b/features/org.eclipse.jst.web_ui.feature.patch/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/feature.properties b/features/org.eclipse.jst.web_ui.feature.patch/feature.properties
deleted file mode 100644
index ae57485a9..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/feature.properties
+++ /dev/null
@@ -1,156 +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=WTP Patch for jst.web_ui
-
-# "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=\
-A patch for wst.html.core, sse.ui, and jsp.core  \n\
-This patch fixes problems described in the following bugs: \n\
-\n\
-Bug 185402 JSP validation fails because of defaulted attribute flush on jsp:include  \n\
-See bug 185402 (https://bugs.eclipse.org/bugs/show_bug.cgi?id=185402)) \n\
-\n\
-Bug 203711 taglib declarations in JSP fragments  \n\
-See bug 203711 (https://bugs.eclipse.org/bugs/show_bug.cgi?id=203711)) \n\
-\n\
-Bug 199053 Syntax errors outside of scripting areas not reported  \n\
-See bug 199053 (https://bugs.eclipse.org/bugs/show_bug.cgi?id=199053)) \n\
-\n\
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2007 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\
-October, 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\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/feature.xml b/features/org.eclipse.jst.web_ui.feature.patch/feature.xml
deleted file mode 100644
index 743a15a23..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/feature.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_ui.feature.patch"
-      label="%featureName"
-      version="1.5.5.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jst.web_ui.feature" version="1.5.5.v200708020120--2PD88Q8T9FAIAH" patch="true"/>
-   </requires>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/license.html b/features/org.eclipse.jst.web_ui.feature.patch/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.web_ui.feature/.cvsignore b/features/org.eclipse.jst.web_ui.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.web_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_ui.feature/.project b/features/org.eclipse.jst.web_ui.feature/.project
deleted file mode 100644
index 75b769791..000000000
--- a/features/org.eclipse.jst.web_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_ui.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_ui.feature/build.properties b/features/org.eclipse.jst.web_ui.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.web_ui.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.web_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/epl-v10.html b/features/org.eclipse.jst.web_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_ui.feature/feature.properties b/features/org.eclipse.jst.web_ui.feature/feature.properties
deleted file mode 100644
index 47e40ee0e..000000000
--- a/features/org.eclipse.jst.web_ui.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 Web UI
-
-# "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 Web UI functionality.
-
-# "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.web_ui.feature/feature.xml b/features/org.eclipse.jst.web_ui.feature/feature.xml
deleted file mode 100644
index ff63fbf42..000000000
--- a/features/org.eclipse.jst.web_ui.feature/feature.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_ui.feature"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.web_userdoc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.web_core.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.jsdt.web.ui"/>
-      <import plugin="org.eclipse.wst.sse.ui" version="1.0.101"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.wst.html.ui" version="1.0.100"/>
-      <import plugin="org.eclipse.wst.html.core" version="1.1.0"/>
-      <import plugin="org.eclipse.jst.jsp.core" version="1.1.0"/>
-      <import plugin="org.eclipse.wst.css.core" version="1.1.0"/>
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0"/>
-      <import plugin="org.eclipse.wst.jsdt.web.core"/>
-      <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jem.beaninfo" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jem.proxy" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jem.util" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.swt" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.common.annotations.controller" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.emf" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jst.common.annotations.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.ui.ide" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.3.100"/>
-      <import plugin="org.eclipse.wst.sse.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.html.ui" version="1.0.300" match="equivalent"/>
-      <import plugin="org.eclipse.wst.css.ui" version="1.0.300" match="equivalent"/>
-      <import plugin="org.eclipse.wst.xml.ui" version="1.0.400" match="equivalent"/>
-      <import plugin="org.eclipse.jst.jsp.core" version="1.2.100" match="equivalent"/>
-      <import plugin="org.eclipse.wst.html.core" version="1.1.200" match="equivalent"/>
-      <import plugin="org.eclipse.wst.css.core" version="1.1.200" match="equivalent"/>
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.300" match="equivalent"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.300" match="equivalent"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.search" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.ltk.core.refactoring" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.301" match="equivalent"/>
-      <import plugin="org.eclipse.ui.views" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.validation" version="1.2.0" match="equivalent"/>
-      <import plugin="com.ibm.icu" version="3.8.1" match="compatible"/>
-      <import plugin="org.eclipse.ui.cheatsheets" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.draw2d" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.j2ee" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.emf" version="1.1.103" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsf.common" version="1.0.1" match="compatible"/>
-      <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" match="equivalent"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsf.facesconfig" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsf.common.ui" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsf.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsf.common" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsp.ui" version="1.1.0"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.0.101"/>
-      <import plugin="org.eclipse.jst.jsf.common.runtime" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsp.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsf.common.ui" version="1.0.1" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.wst.jsdt.web.support.jsp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jem.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.annotations.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.common.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.facesconfig.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_ui.feature/license.html b/features/org.eclipse.jst.web_ui.feature/license.html
deleted file mode 100644
index 56445985d..000000000
--- a/features/org.eclipse.jst.web_ui.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/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index a7c973f3b..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.jst.web_core.feature.source = org.eclipse.jst.web_core.feature
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 6b719e21f..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/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 Web UI Developer Resources
-
-# "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=Source code zips for JST Web UI.
-
-# "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.web_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a489a..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>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 &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <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>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df47..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 307bab915..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Web UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 30a575c96..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index e711acf76..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Web UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_userdoc.feature/.cvsignore b/features/org.eclipse.jst.web_userdoc.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_userdoc.feature/.project b/features/org.eclipse.jst.web_userdoc.feature/.project
deleted file mode 100644
index 56501046f..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_userdoc.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_userdoc.feature/build.properties b/features/org.eclipse.jst.web_userdoc.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.web_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.web_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html b/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_userdoc.feature/feature.properties b/features/org.eclipse.jst.web_userdoc.feature/feature.properties
deleted file mode 100644
index 1cdbe4202..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,144 +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 Web 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 Web 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\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_userdoc.feature/feature.xml b/features/org.eclipse.jst.web_userdoc.feature/feature.xml
deleted file mode 100644
index c8121193f..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_userdoc.feature"
-      label="%featureName"
-      version="3.0.0.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.jsf.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_userdoc.feature/license.html b/features/org.eclipse.jst.web_userdoc.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/plugins/org.eclipse.jem.beaninfo.common/.classpath b/plugins/org.eclipse.jem.beaninfo.common/.classpath
deleted file mode 100644
index efbd865d4..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="beaninfoCommon"/>
-	<classpathentry kind="src" output="bin_vm_beaninfovm" path="vm_beaninfovm"/>
-	<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"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.beaninfo.common/.cvsignore b/plugins/org.eclipse.jem.beaninfo.common/.cvsignore
deleted file mode 100644
index 9b8171d4d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-bin_beaninfocommon
-bin_vm_beaninfovm
diff --git a/plugins/org.eclipse.jem.beaninfo.common/.options b/plugins/org.eclipse.jem.beaninfo.common/.options
deleted file mode 100644
index 5b246520d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jem.beaninfo/debug/logtrace=default
-org.eclipse.jem.beaninfo/debug/logtracefile=default
-org.eclipse.jem.beaninfo/debug/loglevel=default
diff --git a/plugins/org.eclipse.jem.beaninfo.common/.project b/plugins/org.eclipse.jem.beaninfo.common/.project
deleted file mode 100644
index 2d66fd663..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.beaninfo.common</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.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.beaninfo.common/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.beaninfo.common/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1e7f49867..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,294 +0,0 @@
-#Tue Mar 13 10:35:59 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=warning
-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.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-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
-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.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.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.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.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.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/plugins/org.eclipse.jem.beaninfo.common/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.beaninfo.common/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 855e13665..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:18 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem.beaninfo.common/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.jem.beaninfo.common/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 59dc1688c..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#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.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.beaninfo.common/META-INF/MANIFEST.MF
deleted file mode 100644
index 196053c96..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem.beaninfo.common;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.jem.internal.beaninfo.common.BeaninfoCommonPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.beaninfo.common,
- org.eclipse.jem.beaninfo.vm,
- org.eclipse.jem.internal.beaninfo.common,
- org.eclipse.jem.internal.beaninfo.vm
-Require-Bundle: org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jem.beaninfo.common/about.html b/plugins/org.eclipse.jem.beaninfo.common/about.html
deleted file mode 100644
index afceed0cc..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
deleted file mode 100644
index 3b63c764f..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
+++ /dev/null
@@ -1,155 +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.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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
deleted file mode 100644
index 724b0d811..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeaninfoCommonPlugin.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeaninfoCommonPlugin.java
deleted file mode 100644
index 492828b17..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeaninfoCommonPlugin.java
+++ /dev/null
@@ -1,41 +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.common;
-/*
-
-
- */
-
-
-import org.eclipse.core.runtime.Plugin;
-
-
-/**
- * The plugin class for the org.eclipse.jem.internal.proxy.core plugin.
- */
-
-public class BeaninfoCommonPlugin extends Plugin {
-	public static final String PI_BEANINFO_PLUGINID = "org.eclipse.jem.beaninfo.common";	// Plugin ID, used for QualifiedName. //$NON-NLS-1$
-	
-	private static BeaninfoCommonPlugin BEANINFO_PLUGIN = null;
-		
-	public BeaninfoCommonPlugin() {	
-		BEANINFO_PLUGIN = this;
-	}
-	
-	/**
-	 * Accessor method to get the singleton plugin.
-	 */
-	public static BeaninfoCommonPlugin getPlugin() {
-		return BEANINFO_PLUGIN;
-	}
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
deleted file mode 100644
index b235382cc..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
deleted file mode 100644
index 5fd3cd54a..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
+++ /dev/null
@@ -1,785 +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.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", null); //$NON-NLS-1$
-													Method getLogger = biPluginClass.getMethod("getLogger", null); //$NON-NLS-1$
-													Method log = getLogger.getReturnType().getMethod("log", new Class[] {Throwable.class, Level.class}); //$NON-NLS-1$
-													Object biPlugin = getPlugin.invoke(null, null);
-													Object logger = getLogger.invoke(biPlugin, 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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
deleted file mode 100644
index 9d392fca3..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
deleted file mode 100644
index e067449fa..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
+++ /dev/null
@@ -1,129 +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.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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
deleted file mode 100644
index 88d291615..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.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.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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
deleted file mode 100644
index 7e731ceba..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
deleted file mode 100644
index 4b37be9ed..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
deleted file mode 100644
index 5b2f370bb..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.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.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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
deleted file mode 100644
index 3e032412d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
deleted file mode 100644
index 98298394a..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.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.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java b/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
deleted file mode 100644
index 9f112910d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.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.beaninfo.common/build.properties b/plugins/org.eclipse.jem.beaninfo.common/build.properties
deleted file mode 100644
index 2796a2af3..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-src.excludes = **/.cvsignore
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               .options,\
-               META-INF/,\
-               vm/beaninfovm.jar,\
-               .
-jars.compile.order = .,\
-                     vm/beaninfovm.jar
-src.includes = about.html,\
-               proxy.jars
-source.. = beaninfoCommon/
-source.vm/beaninfovm.jar = vm_beaninfovm/
-output.vm/beaninfovm.jar = bin_vm_beaninfovm/
-output.. = bin/
-
diff --git a/plugins/org.eclipse.jem.beaninfo.common/plugin.properties b/plugins/org.eclipse.jem.beaninfo.common/plugin.properties
deleted file mode 100644
index 307f67af7..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo.common/Attic/plugin.properties,v $
-# $Revision: 1.1 $  $Date: 2007/03/14 03:13:03 $
-#
-
-
-pluginName=Java EMF Model BeanInfo (Introspection) Common Support
-providerName = Eclipse.org
diff --git a/plugins/org.eclipse.jem.beaninfo.common/plugin.xml b/plugins/org.eclipse.jem.beaninfo.common/plugin.xml
deleted file mode 100644
index 7943bf249..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.beaninfo.common/proxy.jars b/plugins/org.eclipse.jem.beaninfo.common/proxy.jars
deleted file mode 100644
index 23309123e..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/proxy.jars
+++ /dev/null
@@ -1,2 +0,0 @@
-vm/beaninfovm.jar=/org.eclipse.jem.beaninfo/bin_vm_beaninfovm/

-beaninfocommon.jar=/org.eclipse.jem.beaninfo/bin_beaninfocommon/
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
deleted file mode 100644
index 4f8a589d2..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
+++ /dev/null
@@ -1,850 +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.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", 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.common/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
deleted file mode 100644
index 820de973a..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/Attic/basebeaninfonls.properties,v $
-# $Revision: 1.1 $  $Date: 2007/03/14 03:13:03 $
-#
-
-
-#
-# 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.common/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
deleted file mode 100644
index d6eb1285d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/Attic/beaninfo.properties,v $
-# $Revision: 1.1 $  $Date: 2007/03/14 03:13:03 $
-#
-
-
-#
-# 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.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
deleted file mode 100644
index 3c99de2db..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
+++ /dev/null
@@ -1,77 +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.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.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
deleted file mode 100644
index b53aa8a72..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
+++ /dev/null
@@ -1,145 +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.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.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
deleted file mode 100644
index 9888393fd..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
+++ /dev/null
@@ -1,201 +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.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.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
deleted file mode 100644
index 42100e47d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
+++ /dev/null
@@ -1,91 +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.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.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
deleted file mode 100644
index a56159c1e..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
+++ /dev/null
@@ -1,135 +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.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.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
deleted file mode 100644
index 1344589c0..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
+++ /dev/null
@@ -1,863 +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.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.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
deleted file mode 100644
index 04d2cb68f..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
deleted file mode 100644
index bd2d85cbb..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
deleted file mode 100644
index 8e09fcdf5..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
+++ /dev/null
@@ -1,37 +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.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.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
deleted file mode 100644
index 75d5eee64..000000000
--- a/plugins/org.eclipse.jem.beaninfo.common/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
+++ /dev/null
@@ -1,83 +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.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.beaninfo.ui/.project b/plugins/org.eclipse.jem.beaninfo.ui/.project
deleted file mode 100644
index 3898d5625..000000000
--- a/plugins/org.eclipse.jem.beaninfo.ui/.project
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.beaninfo.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.beaninfo.ui/OBSOLETE-moved to org.eclipse.jem.ui b/plugins/org.eclipse.jem.beaninfo.ui/OBSOLETE-moved to org.eclipse.jem.ui
deleted file mode 100644
index e69de29bb..000000000
--- a/plugins/org.eclipse.jem.beaninfo.ui/OBSOLETE-moved to org.eclipse.jem.ui
+++ /dev/null
diff --git a/plugins/org.eclipse.jem.beaninfo/.classpath b/plugins/org.eclipse.jem.beaninfo/.classpath
deleted file mode 100644
index 2bb0b5c57..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="beaninfoCommon"/>
-	<classpathentry kind="src" path="beaninfo"/>
-	<classpathentry kind="src" output="bin_vm_beaninfovm" path="vm_beaninfovm"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.beaninfo/.cvsignore b/plugins/org.eclipse.jem.beaninfo/.cvsignore
deleted file mode 100644
index a70639229..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-bin_beaninfocommon
-bin_vm_beaninfovm
-javaCompiler.vm_beaninfovm.jar.args
-javaCompiler...args
diff --git a/plugins/org.eclipse.jem.beaninfo/.options b/plugins/org.eclipse.jem.beaninfo/.options
deleted file mode 100644
index 5b246520d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jem.beaninfo/debug/logtrace=default
-org.eclipse.jem.beaninfo/debug/logtracefile=default
-org.eclipse.jem.beaninfo/debug/loglevel=default
diff --git a/plugins/org.eclipse.jem.beaninfo/.project b/plugins/org.eclipse.jem.beaninfo/.project
deleted file mode 100644
index c562a5580..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.project
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-    <name>org.eclipse.jem.beaninfo</name>
-    <comment></comment>
-    <projects></projects>
-    <buildSpec>
-        <buildCommand>
-            <name>org.eclipse.jdt.core.javabuilder</name>
-            <arguments></arguments>
-        </buildCommand>
-        <buildCommand>
-            <name>org.eclipse.pde.ManifestBuilder</name>
-            <arguments></arguments>
-        </buildCommand>
-        <buildCommand>
-            <name>org.eclipse.pde.SchemaBuilder</name>
-            <arguments></arguments>
-        </buildCommand>
-    </buildSpec>
-    <natures>
-        <nature>org.eclipse.pde.PluginNature</nature>
-        <nature>org.eclipse.jdt.core.javanature</nature>
-    </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5a36f5590..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Apr 15 21:15:04 EDT 2007
-eclipse.preferences.version=1
-encoding//beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties=8859_1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b88ad8645..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,294 +0,0 @@
-#Sat Mar 31 23:05:43 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-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=error
-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=warning
-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.rawTypeReference=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=ignore
-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.5
-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
-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.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.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.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.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.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 855e13665..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:18 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 59dc1688c..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#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/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF
deleted file mode 100644
index 83dbd10d1..000000000
--- a/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem.beaninfo; singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-ClassPath: .,
- vm/beaninfovm.jar
-Export-Package: org.eclipse.jem.beaninfo.common,
- org.eclipse.jem.beaninfo.vm,
- org.eclipse.jem.internal.beaninfo,
- org.eclipse.jem.internal.beaninfo.adapters,
- org.eclipse.jem.internal.beaninfo.common,
- org.eclipse.jem.internal.beaninfo.core,
- org.eclipse.jem.internal.beaninfo.impl
-Require-Bundle: org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)",
- com.ibm.etools.emf.event;bundle-version="[3.0.0,4.0.0)";resolution:=optional,
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.change;bundle-version="[2.2.0,3.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jem.beaninfo/about.html b/plugins/org.eclipse.jem.beaninfo/about.html
deleted file mode 100644
index 266717d26..000000000
--- a/plugins/org.eclipse.jem.beaninfo/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java
deleted file mode 100644
index 13821d5f6..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java
+++ /dev/null
@@ -1,432 +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;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jem.java.JavaClass;
-import java.net.URL;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bean Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to BeanDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames <em>Not Inherited Event Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator()
- * @model
- * @generated
- */
-
-
-public interface BeanDecorator extends FeatureDecorator{
-	
-	/**
-	 * Returns the value of the '<em><b>Merge Super Properties</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Super Properties</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the properties of super types be merged when asking for eAllAttributes/eAllReferences.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Super Properties</em>' attribute.
-	 * @see #isSetMergeSuperProperties()
-	 * @see #unsetMergeSuperProperties()
-	 * @see #setMergeSuperProperties(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperProperties()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isMergeSuperProperties();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Super Properties</em>' attribute.
-	 * @see #isSetMergeSuperProperties()
-	 * @see #unsetMergeSuperProperties()
-	 * @see #isMergeSuperProperties()
-	 * @generated
-	 */
-	void setMergeSuperProperties(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMergeSuperProperties()
-	 * @see #isMergeSuperProperties()
-	 * @see #setMergeSuperProperties(boolean)
-	 * @generated
-	 */
-	void unsetMergeSuperProperties();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Merge Super Properties</em>' attribute is set.
-	 * @see #unsetMergeSuperProperties()
-	 * @see #isMergeSuperProperties()
-	 * @see #setMergeSuperProperties(boolean)
-	 * @generated
-	 */
-	boolean isSetMergeSuperProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Merge Super Methods</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Super Behaviors</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the methods of super types be merged when asking for eAllBehaviors.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Super Methods</em>' attribute.
-	 * @see #isSetMergeSuperMethods()
-	 * @see #unsetMergeSuperMethods()
-	 * @see #setMergeSuperMethods(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperMethods()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isMergeSuperMethods();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Super Methods</em>' attribute.
-	 * @see #isSetMergeSuperMethods()
-	 * @see #unsetMergeSuperMethods()
-	 * @see #isMergeSuperMethods()
-	 * @generated
-	 */
-	void setMergeSuperMethods(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMergeSuperMethods()
-	 * @see #isMergeSuperMethods()
-	 * @see #setMergeSuperMethods(boolean)
-	 * @generated
-	 */
-	void unsetMergeSuperMethods();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Merge Super Methods</em>' attribute is set.
-	 * @see #unsetMergeSuperMethods()
-	 * @see #isMergeSuperMethods()
-	 * @see #setMergeSuperMethods(boolean)
-	 * @generated
-	 */
-	boolean isSetMergeSuperMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Merge Super Events</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Super Events</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the events of super types be merged when asking for eAllEvents.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Super Events</em>' attribute.
-	 * @see #isSetMergeSuperEvents()
-	 * @see #unsetMergeSuperEvents()
-	 * @see #setMergeSuperEvents(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperEvents()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isMergeSuperEvents();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Super Events</em>' attribute.
-	 * @see #isSetMergeSuperEvents()
-	 * @see #unsetMergeSuperEvents()
-	 * @see #isMergeSuperEvents()
-	 * @generated
-	 */
-	void setMergeSuperEvents(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMergeSuperEvents()
-	 * @see #isMergeSuperEvents()
-	 * @see #setMergeSuperEvents(boolean)
-	 * @generated
-	 */
-	void unsetMergeSuperEvents();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Merge Super Events</em>' attribute is set.
-	 * @see #unsetMergeSuperEvents()
-	 * @see #isMergeSuperEvents()
-	 * @see #setMergeSuperEvents(boolean)
-	 * @generated
-	 */
-	boolean isSetMergeSuperEvents();
-
-	/**
-	 * Returns the value of the '<em><b>Introspect Properties</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Introspect Properties</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the properties from the introspection be added to the class. This allows properties to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Introspect Properties</em>' attribute.
-	 * @see #setIntrospectProperties(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectProperties()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isIntrospectProperties();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Introspect Properties</em>' attribute.
-	 * @see #isIntrospectProperties()
-	 * @generated
-	 */
-	void setIntrospectProperties(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Introspect Methods</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Introspect Behaviors</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the methods from the introspection be added to the class. This allows methods to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Introspect Methods</em>' attribute.
-	 * @see #setIntrospectMethods(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectMethods()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isIntrospectMethods();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Introspect Methods</em>' attribute.
-	 * @see #isIntrospectMethods()
-	 * @generated
-	 */
-	void setIntrospectMethods(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Introspect Events</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Introspect Events</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the events from the introspection be added to the class. This allows events to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Introspect Events</em>' attribute.
-	 * @see #setIntrospectEvents(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectEvents()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isIntrospectEvents();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Introspect Events</em>' attribute.
-	 * @see #isIntrospectEvents()
-	 * @generated
-	 */
-	void setIntrospectEvents(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Customizer Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Customizer Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Customizer Class</em>' reference.
-	 * @see #setCustomizerClass(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_CustomizerClass()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getCustomizerClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Customizer Class</em>' reference.
-	 * @see #getCustomizerClass()
-	 * @generated
-	 */
-	void setCustomizerClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Do Beaninfo</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Do Beaninfo</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This means do we go and get the beaninfo from the remote vm. If false, then it will not try to get the beaninfo. This doesn't prevent introspection through reflection. That is controled by the separate introspect... attributes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Do Beaninfo</em>' attribute.
-	 * @see #setDoBeaninfo(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_DoBeaninfo()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isDoBeaninfo();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Do Beaninfo</em>' attribute.
-	 * @see #isDoBeaninfo()
-	 * @generated
-	 */
-	void setDoBeaninfo(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Not Inherited Property Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the list of inherited property names to not use in getAllProperties(). These names are properties that should not be inherited and should not show through. If the inherited property is not on the list then it will show in getAllProperties().
-	 * <p>
-	 * This list will be empty if all properties are inherited or if the mergeSuperProperties flag is false.
-	 * <p>
-	 * Note: This attribute is not meant to be changed by clients. It is an internal attribute.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Not Inherited Property Names</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedPropertyNames()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getNotInheritedPropertyNames();
-
-	/**
-	 * Returns the value of the '<em><b>Not Inherited Method Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the list of inherited method names to not use in eAllOperations(). These names are operations that should not be inherited and should not show through. If the inherited operation is not on the list then it will show in getAllOperations().
-	 * <p>
-	 * This list will be empty if all operations are inherited or if the mergeSuperBehaviors flag is false.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Not Inherited Method Names</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedMethodNames()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getNotInheritedMethodNames();
-
-	/**
-	 * Returns the value of the '<em><b>Not Inherited Event Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the list of inherited event names to not use in getAllEvents(). These names are events that should not be inherited and should not show through. If the inherited event is not on the list then it will show in getAllEvents().
-	 * <p>
-	 * This list will be empty if all events are inherited or if the mergeSuperEvents flag is false.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Not Inherited Event Names</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedEventNames()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getNotInheritedEventNames();
-
-	/**
-	 * Return the URL of a 16x16 Color icon
-	 */
-	URL getIconURL();
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.java
deleted file mode 100644
index 852eba272..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.java
+++ /dev/null
@@ -1,41 +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;
-/*
-
-
- */
-
-import org.eclipse.jem.java.JavaEvent;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bean Event</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Event from Introspection/Reflection.
- * <p>
- * The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanEvent()
- * @model
- * @generated
- */
-
-public interface BeanEvent extends JavaEvent{
-
-	
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java
deleted file mode 100644
index 3cc9a1122..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java
+++ /dev/null
@@ -1,128 +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;
-/*
-
-
- */
-
-
-import org.eclipse.emf.ecore.EFactory;
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage
- * @generated
- */
-
-
-public interface BeaninfoFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	BeaninfoFactory eINSTANCE = org.eclipse.jem.internal.beaninfo.impl.BeaninfoFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Feature Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Feature Decorator</em>'.
-	 * @generated
-	 */
-	FeatureDecorator createFeatureDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Event Set Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Event Set Decorator</em>'.
-	 * @generated
-	 */
-	EventSetDecorator createEventSetDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Method Proxy</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Proxy</em>'.
-	 * @generated
-	 */
-	MethodProxy createMethodProxy();
-
-	/**
-	 * Returns a new object of class '<em>Property Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Property Decorator</em>'.
-	 * @generated
-	 */
-	PropertyDecorator createPropertyDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Indexed Property Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Indexed Property Decorator</em>'.
-	 * @generated
-	 */
-	IndexedPropertyDecorator createIndexedPropertyDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Bean Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bean Decorator</em>'.
-	 * @generated
-	 */
-	BeanDecorator createBeanDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Method Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Decorator</em>'.
-	 * @generated
-	 */
-	MethodDecorator createMethodDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Parameter Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Parameter Decorator</em>'.
-	 * @generated
-	 */
-	ParameterDecorator createParameterDecorator();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	BeaninfoPackage getBeaninfoPackage();
-
-	/**
-	 * Returns a new object of class '<em>Bean Event</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bean Event</em>'.
-	 * @generated
-	 */
-	BeanEvent createBeanEvent();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java
deleted file mode 100644
index 3dd81d39f..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java
+++ /dev/null
@@ -1,3271 +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;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.jem.java.JavaRefPackage;
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoFactory
- * @model kind="package"
- * @generated
- */
-
-public interface BeaninfoPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "beaninfo"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jem.internal.beaninfo.beaninfo"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	BeaninfoPackage eINSTANCE = org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl.init();
-
-	
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl <em>Feature Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureDecorator()
-	 * @generated
-	 */
-	int FEATURE_DECORATOR = 0;
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__EANNOTATIONS = EcorePackage.EANNOTATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__SOURCE = EcorePackage.EANNOTATION__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__DETAILS = EcorePackage.EANNOTATION__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__EMODEL_ELEMENT = EcorePackage.EANNOTATION__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__CONTENTS = EcorePackage.EANNOTATION__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__REFERENCES = EcorePackage.EANNOTATION__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__DISPLAY_NAME = EcorePackage.EANNOTATION_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__SHORT_DESCRIPTION = EcorePackage.EANNOTATION_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__CATEGORY = EcorePackage.EANNOTATION_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__EXPERT = EcorePackage.EANNOTATION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__HIDDEN = EcorePackage.EANNOTATION_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__PREFERRED = EcorePackage.EANNOTATION_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__MERGE_INTROSPECTION = EcorePackage.EANNOTATION_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = EcorePackage.EANNOTATION_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__IMPLICITLY_SET_BITS = EcorePackage.EANNOTATION_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG = EcorePackage.EANNOTATION_FEATURE_COUNT + 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl <em>Event Set Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getEventSetDecorator()
-	 * @generated
-	 */
-	int EVENT_SET_DECORATOR = 2;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl <em>Method Proxy</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodProxy()
-	 * @generated
-	 */
-	int METHOD_PROXY = 7;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl <em>Property Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getPropertyDecorator()
-	 * @generated
-	 */
-	int PROPERTY_DECORATOR = 5;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl <em>Indexed Property Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getIndexedPropertyDecorator()
-	 * @generated
-	 */
-	int INDEXED_PROPERTY_DECORATOR = 6;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl <em>Bean Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanDecorator()
-	 * @generated
-	 */
-	int BEAN_DECORATOR = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl <em>Method Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodDecorator()
-	 * @generated
-	 */
-	int METHOD_DECORATOR = 3;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl <em>Parameter Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getParameterDecorator()
-	 * @generated
-	 */
-	int PARAMETER_DECORATOR = 4;
-	/**
-	 * The meta object id for the '<em>Feature Attribute Value</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeValue()
-	 * @generated
-	 */
-	int FEATURE_ATTRIBUTE_VALUE = 11;
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__ATTRIBUTES = EcorePackage.EANNOTATION_FEATURE_COUNT + 10;
-	/**
-	 * The number of structural features of the '<em>Feature Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR_FEATURE_COUNT = EcorePackage.EANNOTATION_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Merge Super Properties</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_SUPER_PROPERTIES = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Merge Super Methods</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_SUPER_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Merge Super Events</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_SUPER_EVENTS = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Introspect Properties</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__INTROSPECT_PROPERTIES = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Introspect Methods</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__INTROSPECT_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Introspect Events</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__INTROSPECT_EVENTS = FEATURE_DECORATOR_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Do Beaninfo</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__DO_BEANINFO = FEATURE_DECORATOR_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Not Inherited Property Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Not Inherited Method Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Not Inherited Event Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Customizer Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__CUSTOMIZER_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 10;
-	/**
-	 * The number of structural features of the '<em>Bean Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>In Default Event Set</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Unicast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__UNICAST = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Listener Methods Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl <em>Bean Event</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanEvent()
-	 * @generated
-	 */
-	int BEAN_EVENT = 8;
-	/**
-	 * The feature id for the '<em><b>Add Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__ADD_LISTENER_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Listener Methods</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__LISTENER_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Listener Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__LISTENER_TYPE = FEATURE_DECORATOR_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Remove Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Event Adapter Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Ser List Mthd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__SER_LIST_MTHD = FEATURE_DECORATOR_FEATURE_COUNT + 8;
-
-	/**
-	 * The number of structural features of the '<em>Event Set Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Parms Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Descriptors</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__PARAMETER_DESCRIPTORS = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Ser Parm Desc</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__SER_PARM_DESC = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Method Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__NAME = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__PARAMETER = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>Parameter Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__BOUND = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Constrained</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__CONSTRAINED = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Design Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__DESIGN_TIME = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Always Incompatible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Filter Flags</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__FILTER_FLAGS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Field Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__FIELD_READ_ONLY = FEATURE_DECORATOR_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Property Editor Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__READ_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__WRITE_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__FIELD = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
-	/**
-	 * The number of structural features of the '<em>Property Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 10;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__EANNOTATIONS = PROPERTY_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__SOURCE = PROPERTY_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__DETAILS = PROPERTY_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT = PROPERTY_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__CONTENTS = PROPERTY_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__REFERENCES = PROPERTY_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME = PROPERTY_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION = PROPERTY_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__CATEGORY = PROPERTY_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__EXPERT = PROPERTY_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__HIDDEN = PROPERTY_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__PREFERRED = PROPERTY_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION = PROPERTY_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS = PROPERTY_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG = PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__ATTRIBUTES = PROPERTY_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__BOUND = PROPERTY_DECORATOR__BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Constrained</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__CONSTRAINED = PROPERTY_DECORATOR__CONSTRAINED;
-
-	/**
-	 * The feature id for the '<em><b>Design Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__DESIGN_TIME = PROPERTY_DECORATOR__DESIGN_TIME;
-
-	/**
-	 * The feature id for the '<em><b>Always Incompatible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE = PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Filter Flags</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS = PROPERTY_DECORATOR__FILTER_FLAGS;
-	/**
-	 * The feature id for the '<em><b>Field Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY = PROPERTY_DECORATOR__FIELD_READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Property Editor Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS = PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS;
-	/**
-	 * The feature id for the '<em><b>Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__READ_METHOD = PROPERTY_DECORATOR__READ_METHOD;
-	/**
-	 * The feature id for the '<em><b>Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__WRITE_METHOD = PROPERTY_DECORATOR__WRITE_METHOD;
-	/**
-	 * The feature id for the '<em><b>Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__FIELD = PROPERTY_DECORATOR__FIELD;
-
-	/**
-	 * The feature id for the '<em><b>Indexed Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD = PROPERTY_DECORATOR_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Indexed Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD = PROPERTY_DECORATOR_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>Indexed Property Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR_FEATURE_COUNT = PROPERTY_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__EANNOTATIONS = EcorePackage.EOPERATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__NAME = EcorePackage.EOPERATION__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__ORDERED = EcorePackage.EOPERATION__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__UNIQUE = EcorePackage.EOPERATION__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__LOWER_BOUND = EcorePackage.EOPERATION__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__UPPER_BOUND = EcorePackage.EOPERATION__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__MANY = EcorePackage.EOPERATION__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__REQUIRED = EcorePackage.EOPERATION__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__ETYPE = EcorePackage.EOPERATION__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__EGENERIC_TYPE = EcorePackage.EOPERATION__EGENERIC_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__ECONTAINING_CLASS = EcorePackage.EOPERATION__ECONTAINING_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__ETYPE_PARAMETERS = EcorePackage.EOPERATION__ETYPE_PARAMETERS;
-
-	/**
-	 * The feature id for the '<em><b>EParameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__EPARAMETERS = EcorePackage.EOPERATION__EPARAMETERS;
-
-	/**
-	 * The feature id for the '<em><b>EExceptions</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__EEXCEPTIONS = EcorePackage.EOPERATION__EEXCEPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>EGeneric Exceptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__EGENERIC_EXCEPTIONS = EcorePackage.EOPERATION__EGENERIC_EXCEPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__METHOD = EcorePackage.EOPERATION_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Method Proxy</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY_FEATURE_COUNT = EcorePackage.EOPERATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__EANNOTATIONS = JavaRefPackage.JAVA_EVENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__NAME = JavaRefPackage.JAVA_EVENT__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__ORDERED = JavaRefPackage.JAVA_EVENT__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__UNIQUE = JavaRefPackage.JAVA_EVENT__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__LOWER_BOUND = JavaRefPackage.JAVA_EVENT__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__UPPER_BOUND = JavaRefPackage.JAVA_EVENT__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__MANY = JavaRefPackage.JAVA_EVENT__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__REQUIRED = JavaRefPackage.JAVA_EVENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__ETYPE = JavaRefPackage.JAVA_EVENT__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__EGENERIC_TYPE = JavaRefPackage.JAVA_EVENT__EGENERIC_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__CHANGEABLE = JavaRefPackage.JAVA_EVENT__CHANGEABLE;
-
-	/**
-	 * The feature id for the '<em><b>Volatile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__VOLATILE = JavaRefPackage.JAVA_EVENT__VOLATILE;
-
-	/**
-	 * The feature id for the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__TRANSIENT = JavaRefPackage.JAVA_EVENT__TRANSIENT;
-
-	/**
-	 * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__DEFAULT_VALUE_LITERAL = JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__DEFAULT_VALUE = JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Unsettable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__UNSETTABLE = JavaRefPackage.JAVA_EVENT__UNSETTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Derived</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__DERIVED = JavaRefPackage.JAVA_EVENT__DERIVED;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__ECONTAINING_CLASS = JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS;
-
-	/**
-	 * The number of structural features of the '<em>Bean Event</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT_FEATURE_COUNT = JavaRefPackage.JAVA_EVENT_FEATURE_COUNT + 0;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl <em>Feature Attribute Map Entry</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeMapEntry()
-	 * @generated
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY = 9;
-
-	/**
-	 * The feature id for the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY__KEY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Feature Attribute Map Entry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY_FEATURE_COUNT = 2;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.ImplicitItem <em>Implicit Item</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getImplicitItem()
-	 * @generated
-	 */
-	int IMPLICIT_ITEM = 10;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator <em>Feature Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator
-	 * @generated
-	 */
-	EClass getFeatureDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_DisplayName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Short Description</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_ShortDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Category</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Category();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Expert</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Expert();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hidden</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Hidden();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Preferred</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Preferred();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Introspection</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_MergeIntrospection();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attributes Explicit Empty</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_AttributesExplicitEmpty();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Implicitly Set Bits</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_ImplicitlySetBits();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Implicit Decorator Flag</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_ImplicitDecoratorFlag();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes <em>Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>Attributes</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EReference getFeatureDecorator_Attributes();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator <em>Event Set Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Event Set Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator
-	 * @generated
-	 */
-	EClass getEventSetDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>In Default Event Set</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EAttribute getEventSetDecorator_InDefaultEventSet();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Unicast</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EAttribute getEventSetDecorator_Unicast();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Listener Methods Explicit Empty</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EAttribute getEventSetDecorator_ListenerMethodsExplicitEmpty();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Add Listener Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_AddListenerMethod();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods <em>Listener Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Listener Methods</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_ListenerMethods();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Listener Type</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_ListenerType();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Remove Listener Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_RemoveListenerMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Event Adapter Class</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_EventAdapterClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd <em>Ser List Mthd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ser List Mthd</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_SerListMthd();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.MethodProxy <em>Method Proxy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Proxy</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodProxy
-	 * @generated
-	 */
-	EClass getMethodProxy();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod()
-	 * @see #getMethodProxy()
-	 * @generated
-	 */
-	EReference getMethodProxy_Method();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator <em>Property Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Property Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator
-	 * @generated
-	 */
-	EClass getPropertyDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Bound</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_Bound();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Constrained</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_Constrained();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Design Time</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_DesignTime();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Always Incompatible</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_AlwaysIncompatible();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags <em>Filter Flags</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Filter Flags</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_FilterFlags();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field Read Only</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_FieldReadOnly();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Property Editor Class</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_PropertyEditorClass();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Read Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_ReadMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Write Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_WriteMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Field</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_Field();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator <em>Indexed Property Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Indexed Property Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator
-	 * @generated
-	 */
-	EClass getIndexedPropertyDecorator();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Indexed Read Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod()
-	 * @see #getIndexedPropertyDecorator()
-	 * @generated
-	 */
-	EReference getIndexedPropertyDecorator_IndexedReadMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Indexed Write Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod()
-	 * @see #getIndexedPropertyDecorator()
-	 * @generated
-	 */
-	EReference getIndexedPropertyDecorator_IndexedWriteMethod();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator <em>Bean Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bean Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator
-	 * @generated
-	 */
-	EClass getBeanDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Super Properties</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_MergeSuperProperties();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Super Methods</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_MergeSuperMethods();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Super Events</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_MergeSuperEvents();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Introspect Properties</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_IntrospectProperties();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Introspect Methods</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_IntrospectMethods();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Introspect Events</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_IntrospectEvents();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Customizer Class</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EReference getBeanDecorator_CustomizerClass();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator <em>Method Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator
-	 * @generated
-	 */
-	EClass getMethodDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Parms Explicit Empty</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty()
-	 * @see #getMethodDecorator()
-	 * @generated
-	 */
-	EAttribute getMethodDecorator_ParmsExplicitEmpty();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors <em>Parameter Descriptors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Parameter Descriptors</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors()
-	 * @see #getMethodDecorator()
-	 * @generated
-	 */
-	EReference getMethodDecorator_ParameterDescriptors();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc <em>Ser Parm Desc</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ser Parm Desc</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc()
-	 * @see #getMethodDecorator()
-	 * @generated
-	 */
-	EReference getMethodDecorator_SerParmDesc();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator <em>Parameter Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Parameter Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.ParameterDecorator
-	 * @generated
-	 */
-	EClass getParameterDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName()
-	 * @see #getParameterDecorator()
-	 * @generated
-	 */
-	EAttribute getParameterDecorator_Name();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue <em>Feature Attribute Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Feature Attribute Value</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue
-	 * @model instanceClass="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue"
-	 * @generated
-	 */
-	EDataType getFeatureAttributeValue();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	BeaninfoFactory getBeaninfoFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl <em>Feature Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureDecorator()
-		 * @generated
-		 */
-		EClass FEATURE_DECORATOR = eINSTANCE.getFeatureDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__DISPLAY_NAME = eINSTANCE.getFeatureDecorator_DisplayName();
-
-		/**
-		 * The meta object literal for the '<em><b>Short Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__SHORT_DESCRIPTION = eINSTANCE.getFeatureDecorator_ShortDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Category</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__CATEGORY = eINSTANCE.getFeatureDecorator_Category();
-
-		/**
-		 * The meta object literal for the '<em><b>Expert</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__EXPERT = eINSTANCE.getFeatureDecorator_Expert();
-
-		/**
-		 * The meta object literal for the '<em><b>Hidden</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__HIDDEN = eINSTANCE.getFeatureDecorator_Hidden();
-
-		/**
-		 * The meta object literal for the '<em><b>Preferred</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__PREFERRED = eINSTANCE.getFeatureDecorator_Preferred();
-
-		/**
-		 * The meta object literal for the '<em><b>Merge Introspection</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__MERGE_INTROSPECTION = eINSTANCE.getFeatureDecorator_MergeIntrospection();
-
-		/**
-		 * The meta object literal for the '<em><b>Attributes Explicit Empty</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = eINSTANCE.getFeatureDecorator_AttributesExplicitEmpty();
-
-		/**
-		 * The meta object literal for the '<em><b>Implicitly Set Bits</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__IMPLICITLY_SET_BITS = eINSTANCE.getFeatureDecorator_ImplicitlySetBits();
-
-		/**
-		 * The meta object literal for the '<em><b>Implicit Decorator Flag</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG = eINSTANCE.getFeatureDecorator_ImplicitDecoratorFlag();
-
-		/**
-		 * The meta object literal for the '<em><b>Attributes</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FEATURE_DECORATOR__ATTRIBUTES = eINSTANCE.getFeatureDecorator_Attributes();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl <em>Bean Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanDecorator()
-		 * @generated
-		 */
-		EClass BEAN_DECORATOR = eINSTANCE.getBeanDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Merge Super Properties</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__MERGE_SUPER_PROPERTIES = eINSTANCE.getBeanDecorator_MergeSuperProperties();
-
-		/**
-		 * The meta object literal for the '<em><b>Merge Super Methods</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__MERGE_SUPER_METHODS = eINSTANCE.getBeanDecorator_MergeSuperMethods();
-
-		/**
-		 * The meta object literal for the '<em><b>Merge Super Events</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__MERGE_SUPER_EVENTS = eINSTANCE.getBeanDecorator_MergeSuperEvents();
-
-		/**
-		 * The meta object literal for the '<em><b>Introspect Properties</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__INTROSPECT_PROPERTIES = eINSTANCE.getBeanDecorator_IntrospectProperties();
-
-		/**
-		 * The meta object literal for the '<em><b>Introspect Methods</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__INTROSPECT_METHODS = eINSTANCE.getBeanDecorator_IntrospectMethods();
-
-		/**
-		 * The meta object literal for the '<em><b>Introspect Events</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__INTROSPECT_EVENTS = eINSTANCE.getBeanDecorator_IntrospectEvents();
-
-		/**
-		 * The meta object literal for the '<em><b>Do Beaninfo</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__DO_BEANINFO = eINSTANCE.getBeanDecorator_DoBeaninfo();
-
-		/**
-		 * The meta object literal for the '<em><b>Not Inherited Property Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES = eINSTANCE.getBeanDecorator_NotInheritedPropertyNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Not Inherited Method Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES = eINSTANCE.getBeanDecorator_NotInheritedMethodNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Not Inherited Event Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES = eINSTANCE.getBeanDecorator_NotInheritedEventNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Customizer Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BEAN_DECORATOR__CUSTOMIZER_CLASS = eINSTANCE.getBeanDecorator_CustomizerClass();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl <em>Event Set Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getEventSetDecorator()
-		 * @generated
-		 */
-		EClass EVENT_SET_DECORATOR = eINSTANCE.getEventSetDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>In Default Event Set</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET = eINSTANCE.getEventSetDecorator_InDefaultEventSet();
-
-		/**
-		 * The meta object literal for the '<em><b>Unicast</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EVENT_SET_DECORATOR__UNICAST = eINSTANCE.getEventSetDecorator_Unicast();
-
-		/**
-		 * The meta object literal for the '<em><b>Listener Methods Explicit Empty</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY = eINSTANCE.getEventSetDecorator_ListenerMethodsExplicitEmpty();
-
-		/**
-		 * The meta object literal for the '<em><b>Add Listener Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__ADD_LISTENER_METHOD = eINSTANCE.getEventSetDecorator_AddListenerMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Listener Methods</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__LISTENER_METHODS = eINSTANCE.getEventSetDecorator_ListenerMethods();
-
-		/**
-		 * The meta object literal for the '<em><b>Listener Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__LISTENER_TYPE = eINSTANCE.getEventSetDecorator_ListenerType();
-
-		/**
-		 * The meta object literal for the '<em><b>Remove Listener Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD = eINSTANCE.getEventSetDecorator_RemoveListenerMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Event Adapter Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS = eINSTANCE.getEventSetDecorator_EventAdapterClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Ser List Mthd</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__SER_LIST_MTHD = eINSTANCE.getEventSetDecorator_SerListMthd();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl <em>Method Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodDecorator()
-		 * @generated
-		 */
-		EClass METHOD_DECORATOR = eINSTANCE.getMethodDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Parms Explicit Empty</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY = eINSTANCE.getMethodDecorator_ParmsExplicitEmpty();
-
-		/**
-		 * The meta object literal for the '<em><b>Parameter Descriptors</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_DECORATOR__PARAMETER_DESCRIPTORS = eINSTANCE.getMethodDecorator_ParameterDescriptors();
-
-		/**
-		 * The meta object literal for the '<em><b>Ser Parm Desc</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_DECORATOR__SER_PARM_DESC = eINSTANCE.getMethodDecorator_SerParmDesc();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl <em>Parameter Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getParameterDecorator()
-		 * @generated
-		 */
-		EClass PARAMETER_DECORATOR = eINSTANCE.getParameterDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PARAMETER_DECORATOR__NAME = eINSTANCE.getParameterDecorator_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Parameter</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PARAMETER_DECORATOR__PARAMETER = eINSTANCE.getParameterDecorator_Parameter();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl <em>Property Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getPropertyDecorator()
-		 * @generated
-		 */
-		EClass PROPERTY_DECORATOR = eINSTANCE.getPropertyDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Bound</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__BOUND = eINSTANCE.getPropertyDecorator_Bound();
-
-		/**
-		 * The meta object literal for the '<em><b>Constrained</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__CONSTRAINED = eINSTANCE.getPropertyDecorator_Constrained();
-
-		/**
-		 * The meta object literal for the '<em><b>Design Time</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__DESIGN_TIME = eINSTANCE.getPropertyDecorator_DesignTime();
-
-		/**
-		 * The meta object literal for the '<em><b>Always Incompatible</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE = eINSTANCE.getPropertyDecorator_AlwaysIncompatible();
-
-		/**
-		 * The meta object literal for the '<em><b>Filter Flags</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__FILTER_FLAGS = eINSTANCE.getPropertyDecorator_FilterFlags();
-
-		/**
-		 * The meta object literal for the '<em><b>Field Read Only</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__FIELD_READ_ONLY = eINSTANCE.getPropertyDecorator_FieldReadOnly();
-
-		/**
-		 * The meta object literal for the '<em><b>Property Editor Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS = eINSTANCE.getPropertyDecorator_PropertyEditorClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Read Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROPERTY_DECORATOR__READ_METHOD = eINSTANCE.getPropertyDecorator_ReadMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Write Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROPERTY_DECORATOR__WRITE_METHOD = eINSTANCE.getPropertyDecorator_WriteMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Field</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROPERTY_DECORATOR__FIELD = eINSTANCE.getPropertyDecorator_Field();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl <em>Indexed Property Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getIndexedPropertyDecorator()
-		 * @generated
-		 */
-		EClass INDEXED_PROPERTY_DECORATOR = eINSTANCE.getIndexedPropertyDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Indexed Read Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD = eINSTANCE.getIndexedPropertyDecorator_IndexedReadMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Indexed Write Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD = eINSTANCE.getIndexedPropertyDecorator_IndexedWriteMethod();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl <em>Method Proxy</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodProxy()
-		 * @generated
-		 */
-		EClass METHOD_PROXY = eINSTANCE.getMethodProxy();
-
-		/**
-		 * The meta object literal for the '<em><b>Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PROXY__METHOD = eINSTANCE.getMethodProxy_Method();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl <em>Bean Event</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanEvent()
-		 * @generated
-		 */
-		EClass BEAN_EVENT = eINSTANCE.getBeanEvent();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl <em>Feature Attribute Map Entry</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeMapEntry()
-		 * @generated
-		 */
-		EClass FEATURE_ATTRIBUTE_MAP_ENTRY = eINSTANCE.getFeatureAttributeMapEntry();
-
-		/**
-		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_ATTRIBUTE_MAP_ENTRY__KEY = eINSTANCE.getFeatureAttributeMapEntry_Key();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE = eINSTANCE.getFeatureAttributeMapEntry_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.ImplicitItem <em>Implicit Item</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getImplicitItem()
-		 * @generated
-		 */
-		EEnum IMPLICIT_ITEM = eINSTANCE.getImplicitItem();
-
-		/**
-		 * The meta object literal for the '<em>Feature Attribute Value</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeValue()
-		 * @generated
-		 */
-		EDataType FEATURE_ATTRIBUTE_VALUE = eINSTANCE.getFeatureAttributeValue();
-
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Do Beaninfo</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_DoBeaninfo();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Not Inherited Property Names</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_NotInheritedPropertyNames();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Not Inherited Method Names</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_NotInheritedMethodNames();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames <em>Not Inherited Event Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Not Inherited Event Names</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_NotInheritedEventNames();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Parameter</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter()
-	 * @see #getParameterDecorator()
-	 * @generated
-	 */
-	EReference getParameterDecorator_Parameter();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.BeanEvent <em>Bean Event</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bean Event</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanEvent
-	 * @generated
-	 */
-	EClass getBeanEvent();
-
-	/**
-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Feature Attribute Map Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature Attribute Map Entry</em>'.
-	 * @see java.util.Map.Entry
-	 * @model keyType="java.lang.String"
-	 *        valueType="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue" valueDataType="org.eclipse.jem.internal.beaninfo.FeatureAttributeValue"
-	 * @generated
-	 */
-	EClass getFeatureAttributeMapEntry();
-
-	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Key</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getFeatureAttributeMapEntry()
-	 * @generated
-	 */
-	EAttribute getFeatureAttributeMapEntry_Key();
-
-	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getFeatureAttributeMapEntry()
-	 * @generated
-	 */
-	EAttribute getFeatureAttributeMapEntry_Value();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jem.internal.beaninfo.ImplicitItem <em>Implicit Item</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Implicit Item</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @generated
-	 */
-	EEnum getImplicitItem();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java
deleted file mode 100644
index bb889dda5..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java
+++ /dev/null
@@ -1,326 +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;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Event Set Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to EventSetDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods <em>Listener Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd <em>Ser List Mthd</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator()
- * @model
- * @generated
- */
-
-
-public interface EventSetDecorator extends FeatureDecorator{
-	
-	/**
-	 * Returns the value of the '<em><b>In Default Event Set</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>In Default Event Set</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>In Default Event Set</em>' attribute.
-	 * @see #isSetInDefaultEventSet()
-	 * @see #unsetInDefaultEventSet()
-	 * @see #setInDefaultEventSet(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_InDefaultEventSet()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isInDefaultEventSet();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>In Default Event Set</em>' attribute.
-	 * @see #isSetInDefaultEventSet()
-	 * @see #unsetInDefaultEventSet()
-	 * @see #isInDefaultEventSet()
-	 * @generated
-	 */
-	void setInDefaultEventSet(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetInDefaultEventSet()
-	 * @see #isInDefaultEventSet()
-	 * @see #setInDefaultEventSet(boolean)
-	 * @generated
-	 */
-	void unsetInDefaultEventSet();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>In Default Event Set</em>' attribute is set.
-	 * @see #unsetInDefaultEventSet()
-	 * @see #isInDefaultEventSet()
-	 * @see #setInDefaultEventSet(boolean)
-	 * @generated
-	 */
-	boolean isSetInDefaultEventSet();
-
-	/**
-	 * Returns the value of the '<em><b>Unicast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unicast</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unicast</em>' attribute.
-	 * @see #isSetUnicast()
-	 * @see #unsetUnicast()
-	 * @see #setUnicast(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_Unicast()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isUnicast();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unicast</em>' attribute.
-	 * @see #isSetUnicast()
-	 * @see #unsetUnicast()
-	 * @see #isUnicast()
-	 * @generated
-	 */
-	void setUnicast(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetUnicast()
-	 * @see #isUnicast()
-	 * @see #setUnicast(boolean)
-	 * @generated
-	 */
-	void unsetUnicast();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Unicast</em>' attribute is set.
-	 * @see #unsetUnicast()
-	 * @see #isUnicast()
-	 * @see #setUnicast(boolean)
-	 * @generated
-	 */
-	boolean isSetUnicast();
-
-	/**
-	 * Returns the value of the '<em><b>Listener Methods Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Set true if the listenerMethods feature is explicitly set as empty and is not to have listener methods merged in from BeanInfo or reflection.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Listener Methods Explicit Empty</em>' attribute.
-	 * @see #setListenerMethodsExplicitEmpty(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerMethodsExplicitEmpty()
-	 * @model
-	 * @generated
-	 */
-	boolean isListenerMethodsExplicitEmpty();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Listener Methods Explicit Empty</em>' attribute.
-	 * @see #isListenerMethodsExplicitEmpty()
-	 * @generated
-	 */
-	void setListenerMethodsExplicitEmpty(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Add Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Add Listener Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Add Listener Method</em>' reference.
-	 * @see #setAddListenerMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_AddListenerMethod()
-	 * @model required="true"
-	 * @generated
-	 */
-	Method getAddListenerMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Add Listener Method</em>' reference.
-	 * @see #getAddListenerMethod()
-	 * @generated
-	 */
-	void setAddListenerMethod(Method value);
-
-	/**
-	 * Returns the value of the '<em><b>Listener Methods</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.MethodProxy}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Listener Methods</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * listener methods. If it is desired that the list be explicitly empty and not have BeanInfo set it, then set listenerMethodsExplicitEmpty to true.
-	 * <p>
-	 * ListenerMethods will be decorated with MethodDecorators.
-	 * <p>
-	 * Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serListMthd" notifications instead.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Listener Methods</em>' reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerMethods()
-	 * @model type="org.eclipse.jem.internal.beaninfo.MethodProxy" required="true" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	EList getListenerMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Listener Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Listener Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Listener Type</em>' reference.
-	 * @see #setListenerType(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerType()
-	 * @model required="true"
-	 * @generated
-	 */
-	JavaClass getListenerType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Listener Type</em>' reference.
-	 * @see #getListenerType()
-	 * @generated
-	 */
-	void setListenerType(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Remove Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Remove Listener Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Remove Listener Method</em>' reference.
-	 * @see #setRemoveListenerMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_RemoveListenerMethod()
-	 * @model required="true"
-	 * @generated
-	 */
-	Method getRemoveListenerMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remove Listener Method</em>' reference.
-	 * @see #getRemoveListenerMethod()
-	 * @generated
-	 */
-	void setRemoveListenerMethod(Method value);
-
-	/**
-	 * Returns the value of the '<em><b>Event Adapter Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * For some listener interfaces an adapter class is provided that implements default no-op methods, e.g. java.awt.event.FocusEvent which has java.awt.event.FocusAdapter. The Adapter class is provided in a key/value pair on the java.beans.EventSetDescriptor with a key defined in a static final constants EVENTADAPTERCLASS = "eventAdapterClass".
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Event Adapter Class</em>' reference.
-	 * @see #setEventAdapterClass(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_EventAdapterClass()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getEventAdapterClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Event Adapter Class</em>' reference.
-	 * @see #getEventAdapterClass()
-	 * @generated
-	 */
-	void setEventAdapterClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Ser List Mthd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.MethodProxy}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is a private feature. It is used internally only. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ser List Mthd</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_SerListMthd()
-	 * @model type="org.eclipse.jem.internal.beaninfo.MethodProxy" containment="true" required="true"
-	 * @generated
-	 */
-	EList getSerListMthd();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java
deleted file mode 100644
index 298fb38ef..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java
+++ /dev/null
@@ -1,491 +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;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EAnnotation;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Feature Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to FeatureDescriptor in java.
- * <p>
- * Note: If any attribute is explicitly set then the BeanInfo/Reflection will not be merged into the decorator. This provides a way of overriding the BeanInfos. Also for any many-valued attribute, if it is desired to have it explicitly empty and not have BeanInfo fill it in, there will be another attribute named of the form "attibutueExplicitEmpty" If this is true then the BeanInfo will not merge in and will leave it empty.
- * <p>
- * These comments about merging apply to all subclasses of this decorator too. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator()
- * @model
- * @generated
- */
-
-
-public interface FeatureDecorator extends EAnnotation{
-		
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #isSetDisplayName()
-	 * @see #unsetDisplayName()
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_DisplayName()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #isSetDisplayName()
-	 * @see #unsetDisplayName()
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDisplayName()
-	 * @see #getDisplayName()
-	 * @see #setDisplayName(String)
-	 * @generated
-	 */
-	void unsetDisplayName();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Display Name</em>' attribute is set.
-	 * @see #unsetDisplayName()
-	 * @see #getDisplayName()
-	 * @see #setDisplayName(String)
-	 * @generated
-	 */
-	boolean isSetDisplayName();
-
-	/**
-	 * Returns the value of the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Short Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Short Description</em>' attribute.
-	 * @see #isSetShortDescription()
-	 * @see #unsetShortDescription()
-	 * @see #setShortDescription(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ShortDescription()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	String getShortDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Short Description</em>' attribute.
-	 * @see #isSetShortDescription()
-	 * @see #unsetShortDescription()
-	 * @see #getShortDescription()
-	 * @generated
-	 */
-	void setShortDescription(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetShortDescription()
-	 * @see #getShortDescription()
-	 * @see #setShortDescription(String)
-	 * @generated
-	 */
-	void unsetShortDescription();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Short Description</em>' attribute is set.
-	 * @see #unsetShortDescription()
-	 * @see #getShortDescription()
-	 * @see #setShortDescription(String)
-	 * @generated
-	 */
-	boolean isSetShortDescription();
-
-	/**
-	 * Returns the value of the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Category</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Category</em>' attribute.
-	 * @see #setCategory(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Category()
-	 * @model
-	 * @generated
-	 */
-	String getCategory();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Category</em>' attribute.
-	 * @see #getCategory()
-	 * @generated
-	 */
-	void setCategory(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Expert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Expert</em>' attribute.
-	 * @see #isSetExpert()
-	 * @see #unsetExpert()
-	 * @see #setExpert(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Expert()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isExpert();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expert</em>' attribute.
-	 * @see #isSetExpert()
-	 * @see #unsetExpert()
-	 * @see #isExpert()
-	 * @generated
-	 */
-	void setExpert(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetExpert()
-	 * @see #isExpert()
-	 * @see #setExpert(boolean)
-	 * @generated
-	 */
-	void unsetExpert();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Expert</em>' attribute is set.
-	 * @see #unsetExpert()
-	 * @see #isExpert()
-	 * @see #setExpert(boolean)
-	 * @generated
-	 */
-	boolean isSetExpert();
-
-	/**
-	 * Returns the value of the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hidden</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Hidden</em>' attribute.
-	 * @see #isSetHidden()
-	 * @see #unsetHidden()
-	 * @see #setHidden(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Hidden()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isHidden();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hidden</em>' attribute.
-	 * @see #isSetHidden()
-	 * @see #unsetHidden()
-	 * @see #isHidden()
-	 * @generated
-	 */
-	void setHidden(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetHidden()
-	 * @see #isHidden()
-	 * @see #setHidden(boolean)
-	 * @generated
-	 */
-	void unsetHidden();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Hidden</em>' attribute is set.
-	 * @see #unsetHidden()
-	 * @see #isHidden()
-	 * @see #setHidden(boolean)
-	 * @generated
-	 */
-	boolean isSetHidden();
-
-	/**
-	 * Returns the value of the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Preferred</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Preferred</em>' attribute.
-	 * @see #isSetPreferred()
-	 * @see #unsetPreferred()
-	 * @see #setPreferred(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Preferred()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isPreferred();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Preferred</em>' attribute.
-	 * @see #isSetPreferred()
-	 * @see #unsetPreferred()
-	 * @see #isPreferred()
-	 * @generated
-	 */
-	void setPreferred(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetPreferred()
-	 * @see #isPreferred()
-	 * @see #setPreferred(boolean)
-	 * @generated
-	 */
-	void unsetPreferred();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Preferred</em>' attribute is set.
-	 * @see #unsetPreferred()
-	 * @see #isPreferred()
-	 * @see #setPreferred(boolean)
-	 * @generated
-	 */
-	boolean isSetPreferred();
-
-	/**
-	 * Returns the value of the '<em><b>Merge Introspection</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Introspection</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the introspection results be merged into this decorator. If this is set to false, then the introspection results are ignored for this particular decorator. This is an internal feature simply to allow desired override capabilities. Customers would use it to prevent ANY introspection/reflection from occurring.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Introspection</em>' attribute.
-	 * @see #setMergeIntrospection(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_MergeIntrospection()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isMergeIntrospection();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Introspection</em>' attribute.
-	 * @see #isMergeIntrospection()
-	 * @generated
-	 */
-	void setMergeIntrospection(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The attributes are explicitly set as empty and not retrieved from the beaninfo/reflection. Customers should set this if they want the list of attributes to be empty and not merged with the BeanInfo results. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Attributes Explicit Empty</em>' attribute.
-	 * @see #setAttributesExplicitEmpty(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_AttributesExplicitEmpty()
-	 * @model
-	 * @generated
-	 */
-	boolean isAttributesExplicitEmpty();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attributes Explicit Empty</em>' attribute.
-	 * @see #isAttributesExplicitEmpty()
-	 * @generated
-	 */
-	void setAttributesExplicitEmpty(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A bitflag for which attributes have been set by BeanInfo/Reflection.
-	 * <p>
-	 * This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Implicitly Set Bits</em>' attribute.
-	 * @see #setImplicitlySetBits(long)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ImplicitlySetBits()
-	 * @model
-	 * @generated
-	 */
-	long getImplicitlySetBits();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Implicitly Set Bits</em>' attribute.
-	 * @see #getImplicitlySetBits()
-	 * @generated
-	 */
-	void setImplicitlySetBits(long value);
-
-	/**
-	 * Returns the value of the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jem.internal.beaninfo.ImplicitItem}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Is this decorator/feature implicit. This means created by Introspection/Reflection and not by customer.
-	 * <p>
-	 * This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Implicit Decorator Flag</em>' attribute.
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @see #setImplicitDecoratorFlag(ImplicitItem)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ImplicitDecoratorFlag()
-	 * @model
-	 * @generated
-	 */
-	ImplicitItem getImplicitDecoratorFlag();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Implicit Decorator Flag</em>' attribute.
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @see #getImplicitDecoratorFlag()
-	 * @generated
-	 */
-	void setImplicitDecoratorFlag(ImplicitItem value);
-
-	/**
-	 * Returns the value of the '<em><b>Attributes</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attributes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Feature attributes. Key/value pairs. If it is desired that the feature attributes is explicitly empty and not have BeanInfo/reflection set it, set attributesExplicitEmpty to true.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Attributes</em>' map.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Attributes()
-	 * @model mapType="org.eclipse.jem.internal.beaninfo.FeatureAttributeMapEntry" keyType="java.lang.String" valueType="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue"
-	 * @generated
-	 */
-	EMap getAttributes();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	String getName();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java
deleted file mode 100644
index c5e5b4bdb..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java
+++ /dev/null
@@ -1,168 +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;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Implicit Item</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This enum is an internal enum. It is used by BeanInfo for cache maintenance.
- * <p>
- * This enum is not meant to be used by clients.
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getImplicitItem()
- * @model
- * @generated
- */
-public final class ImplicitItem extends AbstractEnumerator {
-	/**
-	 * The '<em><b>NOT IMPLICIT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Means this decorator is not implicit. That is it was created by customer.
-	 * <!-- end-model-doc -->
-	 * @see #NOT_IMPLICIT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOT_IMPLICIT = 0;
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This means that the decorator is implicit. That is it was not created by the customer.
-	 * <!-- end-model-doc -->
-	 * @see #IMPLICIT_DECORATOR_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPLICIT_DECORATOR = 1;
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR AND FEATURE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This means the decorator and the feature where implicit. That is they were not created by the customer.
-	 * <!-- end-model-doc -->
-	 * @see #IMPLICIT_DECORATOR_AND_FEATURE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPLICIT_DECORATOR_AND_FEATURE = 2;
-
-	/**
-	 * The '<em><b>NOT IMPLICIT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NOT_IMPLICIT
-	 * @generated
-	 * @ordered
-	 */
-	public static final ImplicitItem NOT_IMPLICIT_LITERAL = new ImplicitItem(NOT_IMPLICIT, "NOT_IMPLICIT");
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPLICIT_DECORATOR
-	 * @generated
-	 * @ordered
-	 */
-	public static final ImplicitItem IMPLICIT_DECORATOR_LITERAL = new ImplicitItem(IMPLICIT_DECORATOR, "IMPLICIT_DECORATOR");
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR AND FEATURE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPLICIT_DECORATOR_AND_FEATURE
-	 * @generated
-	 * @ordered
-	 */
-	public static final ImplicitItem IMPLICIT_DECORATOR_AND_FEATURE_LITERAL = new ImplicitItem(IMPLICIT_DECORATOR_AND_FEATURE, "IMPLICIT_DECORATOR_AND_FEATURE");
-
-	/**
-	 * An array of all the '<em><b>Implicit Item</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ImplicitItem[] VALUES_ARRAY =
-		new ImplicitItem[] {
-			NOT_IMPLICIT_LITERAL,
-			IMPLICIT_DECORATOR_LITERAL,
-			IMPLICIT_DECORATOR_AND_FEATURE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Implicit Item</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Implicit Item</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ImplicitItem get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ImplicitItem result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Implicit Item</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ImplicitItem get(int value) {
-		switch (value) {
-			case NOT_IMPLICIT: return NOT_IMPLICIT_LITERAL;
-			case IMPLICIT_DECORATOR: return IMPLICIT_DECORATOR_LITERAL;
-			case IMPLICIT_DECORATOR_AND_FEATURE: return IMPLICIT_DECORATOR_AND_FEATURE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ImplicitItem(int value, String name) {
-		super(value, name);
-	}
-
-} //ImplicitItem
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java
deleted file mode 100644
index a45351538..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java
+++ /dev/null
@@ -1,149 +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;
-/*
-
-
- */
-
-
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Indexed Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to IndexedPropertyDecorator
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator()
- * @model
- * @generated
- */
-
-
-public interface IndexedPropertyDecorator extends PropertyDecorator{
-	/**
-	 * Returns the value of the '<em><b>Indexed Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Indexed Read Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Indexed Read Method</em>' reference.
-	 * @see #isSetIndexedReadMethod()
-	 * @see #unsetIndexedReadMethod()
-	 * @see #setIndexedReadMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator_IndexedReadMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getIndexedReadMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Indexed Read Method</em>' reference.
-	 * @see #isSetIndexedReadMethod()
-	 * @see #unsetIndexedReadMethod()
-	 * @see #getIndexedReadMethod()
-	 * @generated
-	 */
-	void setIndexedReadMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIndexedReadMethod()
-	 * @see #getIndexedReadMethod()
-	 * @see #setIndexedReadMethod(Method)
-	 * @generated
-	 */
-	void unsetIndexedReadMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Indexed Read Method</em>' reference is set.
-	 * @see #unsetIndexedReadMethod()
-	 * @see #getIndexedReadMethod()
-	 * @see #setIndexedReadMethod(Method)
-	 * @generated
-	 */
-	boolean isSetIndexedReadMethod();
-
-	/**
-	 * Returns the value of the '<em><b>Indexed Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Indexed Write Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Indexed Write Method</em>' reference.
-	 * @see #isSetIndexedWriteMethod()
-	 * @see #unsetIndexedWriteMethod()
-	 * @see #setIndexedWriteMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator_IndexedWriteMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getIndexedWriteMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Indexed Write Method</em>' reference.
-	 * @see #isSetIndexedWriteMethod()
-	 * @see #unsetIndexedWriteMethod()
-	 * @see #getIndexedWriteMethod()
-	 * @generated
-	 */
-	void setIndexedWriteMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIndexedWriteMethod()
-	 * @see #getIndexedWriteMethod()
-	 * @see #setIndexedWriteMethod(Method)
-	 * @generated
-	 */
-	void unsetIndexedWriteMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Indexed Write Method</em>' reference is set.
-	 * @see #unsetIndexedWriteMethod()
-	 * @see #getIndexedWriteMethod()
-	 * @see #setIndexedWriteMethod(Method)
-	 * @generated
-	 */
-	boolean isSetIndexedWriteMethod();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.java
deleted file mode 100644
index 3cd3cb8a6..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.java
+++ /dev/null
@@ -1,109 +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;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to MethodDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors <em>Parameter Descriptors</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc <em>Ser Parm Desc</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator()
- * @model
- * @generated
- */
-
-
-public interface MethodDecorator extends FeatureDecorator{
-	/**
-	 * Returns the value of the '<em><b>Parms Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Set true if the parms feature is explicitly set as empty and is not to have parameters merged in from BeanInfo or reflection.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parms Explicit Empty</em>' attribute.
-	 * @see #setParmsExplicitEmpty(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_ParmsExplicitEmpty()
-	 * @model
-	 * @generated
-	 */
-	boolean isParmsExplicitEmpty();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parms Explicit Empty</em>' attribute.
-	 * @see #isParmsExplicitEmpty()
-	 * @generated
-	 */
-	void setParmsExplicitEmpty(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Parameter Descriptors</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.ParameterDecorator}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameter Descriptors</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the parameter descriptors list.
-	 * <p>
-	 * Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serParmDesc" notifications instead.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parameter Descriptors</em>' reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_ParameterDescriptors()
-	 * @model type="org.eclipse.jem.internal.beaninfo.ParameterDecorator" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	EList getParameterDescriptors();
-
-	/**
-	 * Returns the value of the '<em><b>Ser Parm Desc</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.ParameterDecorator}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ser Parm Desc</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is a private feature. It is used internally only. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ser Parm Desc</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_SerParmDesc()
-	 * @model type="org.eclipse.jem.internal.beaninfo.ParameterDecorator" containment="true"
-	 * @generated
-	 */
-	EList getSerParmDesc();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java
deleted file mode 100644
index 3945a7597..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java
+++ /dev/null
@@ -1,75 +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;
-/*
-
-
- */
-
-
-import org.eclipse.emf.ecore.EOperation;
-
-import org.eclipse.jem.java.Method;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Proxy</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This is just a wrapper of a java Method. It allows access to the method but doesn't duplicate the interface for it.
- * <p>
- * MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.
- * <p>
- * MethodProxies would also have MethodDecorators.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodProxy()
- * @model
- * @generated
- */
-
-
-public interface MethodProxy extends EOperation{
-	/**
-	 * Returns the value of the '<em><b>Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method</em>' reference.
-	 * @see #setMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodProxy_Method()
-	 * @model required="true"
-	 * @generated
-	 */
-	Method getMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method</em>' reference.
-	 * @see #getMethod()
-	 * @generated
-	 */
-	void setMethod(Method value);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.java
deleted file mode 100644
index 485f9b87e..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.java
+++ /dev/null
@@ -1,97 +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;
-/*
-
-
- */
-
-
-import org.eclipse.jem.java.JavaParameter;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parameter Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator()
- * @model
- * @generated
- */
-
-
-public interface ParameterDecorator extends FeatureDecorator{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The name is explicit here because unlike the other feature decorators, the name does not come from the object being decorated.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameter</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The JavaParameter that this ParameterDecorator is decorating. Can't use eDecorates in this.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parameter</em>' reference.
-	 * @see #setParameter(JavaParameter)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator_Parameter()
-	 * @model transient="true"
-	 * @generated
-	 */
-	JavaParameter getParameter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parameter</em>' reference.
-	 * @see #getParameter()
-	 * @generated
-	 */
-	void setParameter(JavaParameter value);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java
deleted file mode 100644
index 6977b4736..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java
+++ /dev/null
@@ -1,513 +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;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClassifier;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to PropertyDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags <em>Filter Flags</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator()
- * @model
- * @generated
- */
-
-
-public interface PropertyDecorator extends FeatureDecorator{
-	/**
-	 * Returns the value of the '<em><b>Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Bound</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Bound</em>' attribute.
-	 * @see #isSetBound()
-	 * @see #unsetBound()
-	 * @see #setBound(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Bound()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isBound();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bound</em>' attribute.
-	 * @see #isSetBound()
-	 * @see #unsetBound()
-	 * @see #isBound()
-	 * @generated
-	 */
-	void setBound(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBound()
-	 * @see #isBound()
-	 * @see #setBound(boolean)
-	 * @generated
-	 */
-	void unsetBound();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Bound</em>' attribute is set.
-	 * @see #unsetBound()
-	 * @see #isBound()
-	 * @see #setBound(boolean)
-	 * @generated
-	 */
-	boolean isSetBound();
-
-	/**
-	 * Returns the value of the '<em><b>Constrained</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Constrained</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Constrained</em>' attribute.
-	 * @see #isSetConstrained()
-	 * @see #unsetConstrained()
-	 * @see #setConstrained(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Constrained()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isConstrained();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constrained</em>' attribute.
-	 * @see #isSetConstrained()
-	 * @see #unsetConstrained()
-	 * @see #isConstrained()
-	 * @generated
-	 */
-	void setConstrained(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetConstrained()
-	 * @see #isConstrained()
-	 * @see #setConstrained(boolean)
-	 * @generated
-	 */
-	void unsetConstrained();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Constrained</em>' attribute is set.
-	 * @see #unsetConstrained()
-	 * @see #isConstrained()
-	 * @see #setConstrained(boolean)
-	 * @generated
-	 */
-	boolean isSetConstrained();
-
-	/**
-	 * Returns the value of the '<em><b>Design Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Design Time</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If not set, then normal default processing.
-	 * 
-	 * If set true, then this property is a design time property. This means it will show up in the property sheet, but it won't be able to be connected to at runtime. It may not even be a true bean property but instead the builder will know how to handle it.
-	 * 
-	 * If set false, then this property will not show up on the property sheet, but will be able to be connected to for runtime.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Design Time</em>' attribute.
-	 * @see #isSetDesignTime()
-	 * @see #unsetDesignTime()
-	 * @see #setDesignTime(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_DesignTime()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isDesignTime();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Design Time</em>' attribute.
-	 * @see #isSetDesignTime()
-	 * @see #unsetDesignTime()
-	 * @see #isDesignTime()
-	 * @generated
-	 */
-	void setDesignTime(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDesignTime()
-	 * @see #isDesignTime()
-	 * @see #setDesignTime(boolean)
-	 * @generated
-	 */
-	void unsetDesignTime();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Design Time</em>' attribute is set.
-	 * @see #unsetDesignTime()
-	 * @see #isDesignTime()
-	 * @see #setDesignTime(boolean)
-	 * @generated
-	 */
-	boolean isSetDesignTime();
-
-	/**
-	 * Returns the value of the '<em><b>Always Incompatible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Always Incompatible</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If set true, then when multiple objects are selected, this property is always incompatible with each other. So in this case the property will not show up on the property sheet if more than one object has been selected.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Always Incompatible</em>' attribute.
-	 * @see #setAlwaysIncompatible(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_AlwaysIncompatible()
-	 * @model
-	 * @generated
-	 */
-	boolean isAlwaysIncompatible();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Always Incompatible</em>' attribute.
-	 * @see #isAlwaysIncompatible()
-	 * @generated
-	 */
-	void setAlwaysIncompatible(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Filter Flags</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Filter Flags</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Filter Flags</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_FilterFlags()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getFilterFlags();
-
-	/**
-	 * Returns the value of the '<em><b>Field Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Is this field read-only (i.e. is a "final" field). This is only referenced if the field reference is set.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field Read Only</em>' attribute.
-	 * @see #setFieldReadOnly(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_FieldReadOnly()
-	 * @model
-	 * @generated
-	 */
-	boolean isFieldReadOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field Read Only</em>' attribute.
-	 * @see #isFieldReadOnly()
-	 * @generated
-	 */
-	void setFieldReadOnly(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Property Editor Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Property Editor Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Property Editor Class</em>' reference.
-	 * @see #setPropertyEditorClass(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_PropertyEditorClass()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getPropertyEditorClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Property Editor Class</em>' reference.
-	 * @see #getPropertyEditorClass()
-	 * @generated
-	 */
-	void setPropertyEditorClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Read Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Read Method</em>' reference.
-	 * @see #isSetReadMethod()
-	 * @see #unsetReadMethod()
-	 * @see #setReadMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_ReadMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getReadMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Method</em>' reference.
-	 * @see #isSetReadMethod()
-	 * @see #unsetReadMethod()
-	 * @see #getReadMethod()
-	 * @generated
-	 */
-	void setReadMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetReadMethod()
-	 * @see #getReadMethod()
-	 * @see #setReadMethod(Method)
-	 * @generated
-	 */
-	void unsetReadMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Read Method</em>' reference is set.
-	 * @see #unsetReadMethod()
-	 * @see #getReadMethod()
-	 * @see #setReadMethod(Method)
-	 * @generated
-	 */
-	boolean isSetReadMethod();
-
-	/**
-	 * Returns the value of the '<em><b>Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Write Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Write Method</em>' reference.
-	 * @see #isSetWriteMethod()
-	 * @see #unsetWriteMethod()
-	 * @see #setWriteMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_WriteMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getWriteMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Write Method</em>' reference.
-	 * @see #isSetWriteMethod()
-	 * @see #unsetWriteMethod()
-	 * @see #getWriteMethod()
-	 * @generated
-	 */
-	void setWriteMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetWriteMethod()
-	 * @see #getWriteMethod()
-	 * @see #setWriteMethod(Method)
-	 * @generated
-	 */
-	void unsetWriteMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Write Method</em>' reference is set.
-	 * @see #unsetWriteMethod()
-	 * @see #getWriteMethod()
-	 * @see #setWriteMethod(Method)
-	 * @generated
-	 */
-	boolean isSetWriteMethod();
-
-	/**
-	 * Returns the value of the '<em><b>Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If this is set, then this property is a field and not a getter/setter property. This is an extension that the Visual Editor uses to the BeanInfo model.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field</em>' reference.
-	 * @see #isSetField()
-	 * @see #unsetField()
-	 * @see #setField(Field)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Field()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Field getField();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field</em>' reference.
-	 * @see #isSetField()
-	 * @see #unsetField()
-	 * @see #getField()
-	 * @generated
-	 */
-	void setField(Field value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetField()
-	 * @see #getField()
-	 * @see #setField(Field)
-	 * @generated
-	 */
-	void unsetField();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Field</em>' reference is set.
-	 * @see #unsetField()
-	 * @see #getField()
-	 * @see #setField(Field)
-	 * @generated
-	 */
-	boolean isSetField();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Get the property type.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EClassifier getPropertyType();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * This property type is not persisted if this class is serialized into an XMI file. Nor is 
-	 * it a property that can be set from an XMI file. It is an operation. It is used by
-	 * clients which want a PropertyDecorator that is not part of a BeanInfo model.
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Set the property type.
-	 * <!-- end-model-doc -->
-	 * @model
-	 * @generated
-	 */
-	void setPropertyType(EClassifier propertyType);
-
-	/**
-	 * @return boolean for whether this property is writeable or not
-	 * It could have a write method or it could have a field (e.g. java.awt.Insets.top)
-	 */
-	boolean isWriteable();
-
-	/**
-	 * @return boolean for whether this property is readable or not
-	 * It could have a read method or it could have a field (e.g. java.awt.Insets.top)
-	 */
-	boolean isReadable();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java
deleted file mode 100644
index 2b49711d4..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class BeanInfoAdapterMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.beaninfo.adapters.messages";//$NON-NLS-1$
-
-	private BeanInfoAdapterMessages() {
-		// Do not instantiate
-	}
-
-	public static String INTROSPECT_FAILED_EXC_;
-	public static String BeaninfoClassAdapter_ClassNotFound;
-	public static String BeaninfoNature_InvalidProject;
-	public static String UICreateRegistryJobHandler_StartBeaninfoRegistry;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, BeanInfoAdapterMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java
deleted file mode 100644
index 85d65f9cc..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java
+++ /dev/null
@@ -1,1457 +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.adapters;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.change.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.*;
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
-import org.eclipse.jem.internal.beaninfo.core.Utilities;
-import org.eclipse.jem.internal.beaninfo.impl.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-
-/**
- * This is a utility class for handling the BeanInfo decorators with respect to the overrides (explicit settings) vs. introspected/reflected (implicit
- * settings) It handles the transmission of data from the VM for introspection.
- * @since 1.1.0
- */
-public class BeanInfoDecoratorUtility {
-
-	/**
-	 * Clear out the implicit settings for FeatureDecorator.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(FeatureDecorator decor) {
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT) != 0)
-			decor.unsetDisplayName();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT) != 0)
-			decor.unsetShortDescription();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category());
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT) != 0)
-			decor.unsetExpert();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT) != 0)
-			decor.unsetHidden();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT) != 0)
-			decor.unsetPreferred();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT) != 0) {
-			for (Iterator itr = decor.getAttributes().listIterator(); itr.hasNext();) {
-				FeatureAttributeMapEntryImpl entry = (FeatureAttributeMapEntryImpl)itr.next();
-				if (entry.getTypedValue().isImplicitValue()) {
-					itr.remove();
-				}
-			}
-		}	
-		decor
-				.setImplicitlySetBits(implicitSettings
-						& ~(FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT | FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT
-								| FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT | FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT
-								| FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT | FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT | FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT));
-	}
-
-	/**
-	 * Clear out the implicit settings for BeanDecorator
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(BeanDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass());
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT) != 0)
-			decor.unsetMergeSuperProperties();
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT) != 0)
-			decor.unsetMergeSuperMethods();
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT) != 0)
-			decor.unsetMergeSuperEvents();
-		if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames()))
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames()); // Just clear them. This is our attribute. It should
-																							   // not be set overrides.
-		if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames()))
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames()); // Just clear them. This is our attribute. It should
-																							   // not be set overrides.
-		if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames()))
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames()); // Just clear them. This is our attribute. It should not
-																							// be set overrides.
-
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT | BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT
-						| BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT | BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT));
-	}
-
-	/**
-	 * Clear out the implicit settings of the PropertyDecorator.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(PropertyDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass());
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT) != 0)
-			decor.unsetReadMethod();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT) != 0)
-			decor.unsetWriteMethod();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT) != 0) {
-			decor.unsetField();		
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getPropertyDecorator_Field());
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT) != 0)
-			decor.unsetBound();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT) != 0)
-			decor.unsetConstrained();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT) != 0)
-			decor.unsetDesignTime();
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT | PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT
-						| PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT | PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT
-						| PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT | PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT));
-	}
-
-	/**
-	 * Clear out the implicit settings of the IndexedPropertyDecorator.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(IndexedPropertyDecorator decor) {
-		clear((PropertyDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT) != 0)
-			decor.unsetIndexedReadMethod();
-		if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT) != 0)
-			decor.unsetIndexedWriteMethod();
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT | IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT));
-	}
-
-	/**
-	 * Clear the method decorator of any implicit settings.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(MethodDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & (MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT | MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT)) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc());
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT | MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT));
-	}
-
-	/**
-	 * Clear the event set decorator of any implicit settings.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(EventSetDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod());
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass());
-		if ((implicitSettings & (EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT)) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd());
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod());
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT) != 0)
-			decor.unsetInDefaultEventSet();
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT) != 0)
-			decor.unsetUnicast();
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType());
-
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT | EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT
-						| EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT
-						| EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT | EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT
-						| EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT));
-
-	}
-
-	public static void introspect(IBeanProxy modelBeaninfoProxy, IntrospectCallBack callback) {
-		ProxyIntrospectCallBack cb = new ProxyIntrospectCallBack(callback);
-		modelBeaninfoProxy.getProxyFactoryRegistry().getCallbackRegistry().registerCallback(modelBeaninfoProxy, cb);
-		try {
-			BeaninfoProxyConstants.getConstants(modelBeaninfoProxy.getProxyFactoryRegistry()).getSendBeanInfoProxy()
-					.invokeCatchThrowableExceptions(modelBeaninfoProxy);
-		} finally {
-			modelBeaninfoProxy.getProxyFactoryRegistry().getCallbackRegistry().deregisterCallback(modelBeaninfoProxy);
-		}
-
-	}
-
-	/**
-	 * This call back is for each requested type of record. It allows the callee to process this record.
-	 * 
-	 * @since 1.1.0
-	 */
-	public interface IntrospectCallBack {
-
-		/**
-		 * Process the BeanDecoratorRecord. The callee can decide what needs to be done with this record. It would return the BeandDecorator that needs
-		 * to have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return BeanDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-		public BeanDecorator process(BeanRecord record);
-
-		/**
-		 * Process the PropertyRecord. The callee can decide what needs to be done with this record. It would return the PropertyDecorator that needs
-		 * to have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return PropertyDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-		public PropertyDecorator process(PropertyRecord record);
-
-		/**
-		 * Process the IndexedPropertyRecord. The callee can decide what needs to be done with this record. It would return the
-		 * IndexedPropertyDecorator that needs to have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * 
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return PropertyDecorator to be applied to, or <code>null</code> if record is to be ignored. There is a possibility that a straight
-		 *         PropertyDecorator can be returned instead (in the case that it was explictly set by overrides as a property but beaninfo thinks it
-		 *         is an index. This can be handled by it will only set the PropertyRecord part. It normally should be an IndexedPropertyDecorator
-		 *         returned.
-		 * 
-		 * @since 1.1.0
-		 */
-		public PropertyDecorator process(IndexedPropertyRecord record);
-
-		/**
-		 * Process the MethodRecord. The callee can decide what needs to be done with this record. It would return the MethodDecorator that needs to
-		 * have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * 
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return MethodDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-
-		public MethodDecorator process(MethodRecord record);
-
-		/**
-		 * Process the EventRecord. The callee can decide what needs to be done with this record. It would return the EventSetDecorator that needs to
-		 * have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * 
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return EventSetDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-
-		public EventSetDecorator process(EventSetRecord record);
-	}
-
-	private static class ProxyIntrospectCallBack implements ICallback {
-
-		private IntrospectCallBack introspectCallback;
-
-		public ProxyIntrospectCallBack(IntrospectCallBack introspectCallback) {
-			this.introspectCallback = introspectCallback;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, org.eclipse.jem.internal.proxy.core.IBeanProxy)
-		 */
-		public Object calledBack(int msgID, IBeanProxy parm) {
-			return null; // Not used.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, java.lang.Object)
-		 */
-		public Object calledBack(int msgID, Object parm) {
-			return null; // Not used.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, java.lang.Object[])
-		 */
-		public Object calledBack(int msgID, Object[] parms) {
-			return null; // Not used.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, java.io.InputStream)
-		 */
-		public void calledBackStream(int msgID, InputStream is) {
-			ObjectInputStream ois;
-			try {
-				ois = new ObjectInputStream(is);
-				while (true) {
-					int cmdId = ois.readInt();
-					switch (cmdId) {
-						case IBeanInfoIntrospectionConstants.BEAN_DECORATOR_SENT:
-							try {
-								BeanRecord br = (BeanRecord) ois.readObject();
-								BeanDecorator bd = introspectCallback.process(br);
-								if (bd != null) {
-									clear(bd);
-									applyRecord(bd, br);
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							}
-							break;
-						case IBeanInfoIntrospectionConstants.PROPERTY_DECORATORS_SENT:
-							try {
-								int propCount = ois.readInt();
-								for (int i = 0; i < propCount; i++) {
-									PropertyRecord pr = (PropertyRecord) ois.readObject();
-									if (pr.getClass() == IndexedPropertyRecord.class) {
-										IndexedPropertyRecord ipr = (IndexedPropertyRecord) pr;
-										PropertyDecorator ip = introspectCallback.process(ipr);
-										if (ip != null) {
-											// It actually could be either a property decorator or an indexed property decorator. This could happen
-											// because the overrides file has explicitly declared a PropertyDecorator, so we can't change it to an
-											// Indexed.
-											// So in that case we can only fill the property part.
-											if (ip.eClass().getClassifierID() == BeaninfoPackage.INDEXED_PROPERTY_DECORATOR)
-												applyRecord((IndexedPropertyDecorator) ip, ipr);
-											else
-												applyRecord(ip, pr); // It was forced to be a property and not indexed.
-										}
-									} else {
-										PropertyDecorator p = introspectCallback.process(pr);
-										if (p != null) {
-											// It actually could be either a property decorator or an indexed property decorator. This could happen
-											// because the overrides file has explicitly declared an IndexedPropertyDecorator, so we can't change it
-											// to an
-											// Property.
-											// So in that case we can only fill the property part.
-											applyRecord(p, pr);
-										}
-									}
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								// In case we got bad data sent in.
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} finally {
-							}
-							break;
-
-						case IBeanInfoIntrospectionConstants.METHOD_DECORATORS_SENT:
-							try {
-								int opCount = ois.readInt();
-								for (int i = 0; i < opCount; i++) {
-									MethodRecord mr = (MethodRecord) ois.readObject();
-									MethodDecorator m = introspectCallback.process(mr);
-									if (m != null)
-										applyRecord(m, mr);
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								// In case we got bad data sent in.
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							}
-							break;
-
-						case IBeanInfoIntrospectionConstants.EVENT_DECORATORS_SENT:
-							try {
-								int opCount = ois.readInt();
-								for (int i = 0; i < opCount; i++) {
-									EventSetRecord evr = (EventSetRecord) ois.readObject();
-									EventSetDecorator e = introspectCallback.process(evr);
-									if (e != null)
-										applyRecord(e, evr);
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								// In case we got bad data sent in.
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							}
-							break;
-
-						case IBeanInfoIntrospectionConstants.DONE:
-							return;	// Good. This is a good stop.
-							
-						default:
-							return;	// This is invalid. Should of gotton something.
-					}
-				}
-			} catch (IOException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			}
-		}
-	}
-
-	/**
-	 * Apply the feature record to the feature decorator. This is protected because this is an abstract and should never be called by itself.
-	 * <p>
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void applyRecord(FeatureDecorator decor, FeatureRecord record) {
-		// Subclasses will clear their decor, which will automatically clear the FeatureDecor part for us.
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.displayName != null && !decor.isSetDisplayName()) {
-			decor.setDisplayName(record.displayName);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT;
-		}
-		if (record.shortDescription != null && !decor.isSetShortDescription()) {
-			decor.setShortDescription(record.shortDescription);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT;
-		}
-		if (record.category != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category())) {
-			decor.setCategory(record.category);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT;
-		}
-		if (!decor.isSetExpert()) {
-			if (decor.isExpert() != record.expert)
-				decor.setExpert(record.expert); // Don't want to explicitly set it if it is equal to default (this will put less out to the cache file
-												// and so will parse and apply faster).
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT;
-		}
-		if (!decor.isSetHidden()) {
-			if (decor.isHidden() != record.hidden)
-				decor.setHidden(record.hidden);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT;
-		}
-		if (!decor.isSetPreferred()) {
-			if (decor.isPreferred() != record.preferred)
-				decor.setPreferred(record.preferred);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT;
-		}
-		if (record.attributeNames != null && !decor.isAttributesExplicitEmpty()) {
-			// This is a list, so we need to read an fill in.
-			EMap attrs = decor.getAttributes();
-			for (int i = 0; i < record.attributeNames.length; i++) {
-				FeatureAttributeMapEntryImpl entry = (FeatureAttributeMapEntryImpl) ((BeaninfoFactoryImpl) BeaninfoFactory.eINSTANCE)
-						.createFeatureAttributeMapEntry();
-				entry.setTypedKey(record.attributeNames[i]);
-				FeatureAttributeValue fv = record.attributeValues[i];
-				fv.setImplicitValue(true);
-				entry.setTypedValue(fv);
-				attrs.add(entry);
-			}
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT;
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the bean record to the bean decorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(BeanDecorator decor, BeanRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.customizerClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass())) {
-			decor.setCustomizerClass(createJavaClassProxy(record.customizerClassName));
-			implicitSettings |= BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT;
-		}
-		if (!decor.isSetMergeSuperProperties()) {
-			if (decor.isMergeSuperProperties() != record.mergeInheritedProperties)
-				decor.setMergeSuperProperties(record.mergeInheritedProperties);
-			implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT;
-		}
-		if (!decor.isSetMergeSuperMethods()) {
-			if (decor.isMergeSuperMethods() != record.mergeInheritedOperations)
-				decor.setMergeSuperMethods(record.mergeInheritedOperations);
-			implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT;
-		}
-		if (!decor.isSetMergeSuperEvents()) {
-			if (decor.isMergeSuperEvents() != record.mergeInheritedEvents)
-				decor.setMergeSuperEvents(record.mergeInheritedEvents);
-			implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT;
-		}
-		if (record.notInheritedPropertyNames != null) {
-			// This is always applied. This isn't a client override so we can just slam it.
-			decor.getNotInheritedPropertyNames().addAll(Arrays.asList(record.notInheritedPropertyNames));
-		}
-		if (record.notInheritedOperationNames != null) {
-			// This is always applied. This isn't a client override so we can just slam it.
-			decor.getNotInheritedMethodNames().addAll(Arrays.asList(record.notInheritedOperationNames));
-		}
-		if (record.notInheritedEventNames != null) {
-			// This is always applied. This isn't a client override so we can just slam it.
-			decor.getNotInheritedEventNames().addAll(Arrays.asList(record.notInheritedEventNames));
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the PropertyRecord to the PropertyDecorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(PropertyDecorator decor, PropertyRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		applyOnly(decor, record);
-	}
-
-	/*
-	 * Apply only to property decorator part. Allows IndexedProperty to apply just the Property part and not do duplicate work
-	 */
-	private static void applyOnly(PropertyDecorator decor, PropertyRecord record) {
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.propertyEditorClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass())) {
-			decor.setPropertyEditorClass(createJavaClassProxy(record.propertyEditorClassName));
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT;
-		}
-		if (record.readMethod != null && !decor.isSetReadMethod()) {
-			decor.setReadMethod(createJavaMethodProxy(record.readMethod));
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT;
-		}
-		if (record.writeMethod != null && !decor.isSetWriteMethod()) {
-			decor.setWriteMethod(createJavaMethodProxy(record.writeMethod));
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT;
-		}
-		if (record.field != null && !decor.isSetField()) {
-			decor.setField(createJavaFieldProxy(record.field));
-			if (decor.isFieldReadOnly() != record.field.readOnly)
-				decor.setFieldReadOnly(record.field.readOnly);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT;
-		}		
-		if (!decor.isSetBound()) {
-			if (decor.isBound() != record.bound)
-				decor.setBound(record.bound);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
-		}
-		if (!decor.isSetConstrained()) {
-			if (decor.isConstrained() != record.constrained)
-				decor.setConstrained(record.constrained);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT;
-		}
-		if (record.designTime != null && !decor.isSetDesignTime()) {
-			// Design time is slightly different than the other booleans because
-			// explicitly set to true/false is important versus not explicitly set at all (which is false).
-			decor.setDesignTime(record.designTime.booleanValue());
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT;
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-
-	}
-
-	public static void applyRecord(IndexedPropertyDecorator decor, IndexedPropertyRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-		applyOnly(decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.indexedReadMethod != null && !decor.isSetIndexedReadMethod()) {
-			decor.setIndexedReadMethod(createJavaMethodProxy(record.indexedReadMethod));
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT;
-		}
-		if (record.indexedWriteMethod != null && !decor.isSetIndexedWriteMethod()) {
-			decor.setIndexedWriteMethod(createJavaMethodProxy(record.indexedWriteMethod));
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT;
-		}
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the method record to the method decorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(MethodDecorator decor, MethodRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.parameters != null && !decor.isParmsExplicitEmpty()
-				&& !decor.eIsSet(BeaninfoPackage.eINSTANCE.getMethodDecorator_ParameterDescriptors())) {
-			// This is a list, so we need to read an fill in.
-			List parms = decor.getSerParmDesc(); // So as not to have it implicitly fill it in, which it would if we called getParameterDescriptors.
-			for (int i = 0; i < record.parameters.length; i++) {
-				ParameterDecorator parm = BeaninfoFactory.eINSTANCE.createParameterDecorator();
-				applyRecord(parm, record.parameters[i]);
-				parms.add(parm);
-			}
-			implicitSettings |= MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT;
-			implicitSettings &= ~MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT; // Should of already been cleared, but be safe.
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	public static void applyRecord(ParameterDecorator decor, ParameterRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.name != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getParameterDecorator_Name())) {
-			decor.setName(record.name);
-			implicitSettings |= ParameterDecoratorImpl.PARAMETER_NAME_IMPLICIT;
-		}
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the event set record to the event set decorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(EventSetDecorator decor, EventSetRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.addListenerMethod != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod())) {
-			decor.setAddListenerMethod(createJavaMethodProxy(record.addListenerMethod));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT;
-		}
-		if (record.eventAdapterClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass())) {
-			decor.setEventAdapterClass(createJavaClassProxy(record.eventAdapterClassName));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT;
-		}
-		if (record.listenerMethodDescriptors != null && !decor.isListenerMethodsExplicitEmpty()
-				&& !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerMethods())) {
-			List methods = decor.getSerListMthd(); // So as not to have it implicitly fill it in, which it would if we called getListenerMethods.
-			for (int i = 0; i < record.listenerMethodDescriptors.length; i++) {
-				BeaninfoFactory bfact = BeaninfoFactory.eINSTANCE;
-				MethodRecord mr = record.listenerMethodDescriptors[i];
-				Method method = createJavaMethodProxy(mr.methodForDescriptor);
-				// We need a method proxy, and a method decorator.
-				MethodProxy mproxy = bfact.createMethodProxy();
-				mproxy.setMethod(method);
-				mproxy.setName(mr.name);
-				MethodDecorator md = bfact.createMethodDecorator();
-				applyRecord(md, mr);
-				mproxy.getEAnnotations().add(md);
-				methods.add(mproxy);
-			}
-			implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT;
-			implicitSettings &= ~EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT; // Should of already been cleared, but be safe.
-		}
-		if (record.listenerTypeName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType())) {
-			decor.setListenerType(createJavaClassProxy(record.listenerTypeName));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT;
-		}
-		if (record.removeListenerMethod != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod())) {
-			decor.setRemoveListenerMethod(createJavaMethodProxy(record.removeListenerMethod));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT;
-		}
-		if (!decor.isSetInDefaultEventSet()) {
-			if (record.inDefaultEventSet != decor.isInDefaultEventSet())
-				decor.setInDefaultEventSet(record.inDefaultEventSet);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT;
-		}
-		if (!decor.isSetUnicast()) {
-			if (record.unicast != decor.isUnicast())
-				decor.setUnicast(record.unicast);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT;
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Create a java class proxy for the given name. By being a proxy we don't need to actually have the resource set. Nor do we need to fluff one up
-	 * until someone actually asks for it.
-	 * <p>
-	 * The jniName must refer to a JavaClass or errors could occur later on.
-	 * 
-	 * @param jniName
-	 *            classname in JNI format.
-	 * @return JavaClass proxy or <code>null</code> if not a java class (it may be a type).
-	 * 
-	 * @since 1.1.0
-	 */
-	public static JavaClass createJavaClassProxy(String jniName) {
-		JavaHelpers jh = createJavaTypeProxy(jniName);
-		return jh instanceof JavaClass ? (JavaClass) jh : null;
-	}
-
-	/**
-	 * Create a JavaHelpers proxy for the given name. By being a proxy we don't need to actually have the resource set. Nor do we need to fluff one up
-	 * until someone actually asks for it.
-	 * 
-	 * @param jniName
-	 *            typename in JNI format.
-	 * @return JavaHelper proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static JavaHelpers createJavaTypeProxy(String jniName) {
-		String formalName = MapJNITypes.getFormalTypeName(jniName);
-
-		URI uri = Utilities.getJavaClassURI(formalName);
-		JavaHelpers jh = null;
-		if (MapJNITypes.isFormalTypePrimitive(formalName))
-			jh = JavaRefFactory.eINSTANCE.createJavaDataType();
-		else
-			jh = JavaRefFactory.eINSTANCE.createJavaClass();
-		((InternalEObject) jh).eSetProxyURI(uri);
-		return jh;
-	}
-
-	public static Method createJavaMethodProxy(ReflectMethodRecord method) {
-		String[] parmTypes = method.parameterTypeNames != null ? new String[method.parameterTypeNames.length] : null;
-		if (parmTypes != null)
-			for (int i = 0; i < method.parameterTypeNames.length; i++) {
-				parmTypes[i] = MapJNITypes.getFormalTypeName(method.parameterTypeNames[i]);
-			}
-		URI uri = Utilities.getMethodURI(MapJNITypes.getFormalTypeName(method.className), method.methodName, parmTypes);
-		Method methodEMF = JavaRefFactory.eINSTANCE.createMethod();
-		((InternalEObject) methodEMF).eSetProxyURI(uri);
-		return methodEMF;
-	}
-	
-	public static Field createJavaFieldProxy(ReflectFieldRecord field) {
-		URI uri = Utilities.getFieldURI(MapJNITypes.getFormalTypeName(field.className), field.fieldName);
-		Field fieldEMF = JavaRefFactory.eINSTANCE.createField();
-		((InternalEObject) fieldEMF).eSetProxyURI(uri);
-		return fieldEMF;
-	}	
-
-	/**
-	 * Set the properties on the PropertyDecorator. These come from reflection. Since this is a private interface between BeaninfoClassAdapter and
-	 * this class, not all possible settings need to be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already
-	 * been done so that there are no old implicit settings. It will check if properties are set already before setting so that don't wipe out
-	 * explicit settings.
-	 * 
-	 * @param prop
-	 * @param bound
-	 * @param constrained
-	 * @param getter
-	 * @param setter
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void setProperties(PropertyDecorator prop, boolean bound, boolean constrained, Method getter, Method setter) {
-		long implicitSettings = prop.getImplicitlySetBits();
-		if (getter != null && !prop.isSetReadMethod()) {
-			prop.setReadMethod(getter);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT;
-		}
-		if (setter != null && !prop.isSetWriteMethod()) {
-			prop.setWriteMethod(setter);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT;
-		}
-		if (!prop.isSetBound()) {
-			if (prop.isBound() != bound)
-				prop.setBound(bound);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
-		}
-		if (!prop.isSetConstrained()) {
-			if (prop.isConstrained() != constrained)
-				prop.setConstrained(constrained);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT;
-		}
-		prop.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Set the properties on the IndexedPropertyDecorator. These come from reflection. It is only the indexed portion. The base property portion
-	 * should have already been set. Since this is a private interface between BeaninfoClassAdapter and this class, not all possible settings need to
-	 * be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already been done so that there are no old implicit
-	 * settings. It will check if properties are set already before setting so that don't wipe out explicit settings.
-	 * 
-	 * @param prop
-	 * @param indexedGetter
-	 * @param indexedSetter
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void setProperties(IndexedPropertyDecorator prop, Method indexedGetter, Method indexedSetter) {
-		long implicitSettings = prop.getImplicitlySetBits();
-		if (indexedGetter != null && !prop.isSetIndexedReadMethod()) {
-			prop.setIndexedReadMethod(indexedGetter);
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT;
-		}
-		if (indexedSetter != null && !prop.isSetIndexedWriteMethod()) {
-			prop.setIndexedWriteMethod(indexedSetter);
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT;
-		}
-		prop.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Set the properties on the EventSetDecorator. These come from reflection. Since this is a private interface between BeaninfoClassAdapter and
-	 * this class, not all possible settings need to be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already
-	 * been done so that there are no old implicit settings. It will check if properties are set already before setting so that don't wipe out
-	 * explicit settings.
-	 * 
-	 * @param event
-	 * @param bound
-	 * @param constrained
-	 * @param getter
-	 * @param setter
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void setProperties(EventSetDecorator event, Method addListenerMethod, Method removeListenerMethod, boolean unicast,
-			JavaClass listenerType) {
-		long implicitSettings = event.getImplicitlySetBits();
-		if (addListenerMethod != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod())) {
-			event.setAddListenerMethod(addListenerMethod);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT;
-		}
-		if (removeListenerMethod != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod())) {
-			event.setRemoveListenerMethod(removeListenerMethod);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT;
-		}
-		if (!event.isSetUnicast()) {
-			if (event.isUnicast() != unicast)
-				event.setUnicast(unicast);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
-		}
-		if (listenerType != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType())) {
-			event.setListenerType(listenerType);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT;
-		}
-
-		event.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Build the appropriate change record for the bean decorator. Either it is an add of a new bean decorator or it is the setting of the implicit
-	 * settings on an non-implicit bean decorator.
-	 * @param cd
-	 * @param bd
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, BeanDecorator bd) {
-		// Only do anything if merge introspection. If no merge introspection, then there is no change needed.
-		if (bd.isMergeIntrospection()) {
-			if (bd.getImplicitDecoratorFlag() != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-				// It is implicit, so do an add to end, new value.
-				doAddToEnd(cd, getFeatureChangeList(cd, bd.getEModelElement()), EcorePackage.eINSTANCE.getEModelElement_EAnnotations(), bd, true);
-			} else {
-				// Just do sets on implicit changed ones
-				buildNonImplicitChange(cd, getFeatureChangeList(cd, bd), bd);
-			}
-		}
-
-	}
-
-	/**
-	 * Build the appropriate change record for the property decorator. Either it is an add of a new property decorator or it is the setting of the implicit
-	 * settings on an non-implicit property decorator. The same is true of the feature that it decorates. It may be new or it may be an existing one.
-	 * @param cd
-	 * @param pd
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, PropertyDecorator pd) {
-		// Only do changes if merge introspection. If not merging, then there are no changes.
-		if (pd.isMergeIntrospection()) {
-			boolean indexed = pd.eClass().getClassifierID() == BeaninfoPackage.INDEXED_PROPERTY_DECORATOR;
-			EStructuralFeature feature = (EStructuralFeature) pd.getEModelElement();
-			switch (pd.getImplicitDecoratorFlag().getValue()) {
-				case ImplicitItem.IMPLICIT_DECORATOR:
-					// The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
-					List fcs = getFeatureChangeList(cd, feature);
-					doAddToEnd(cd, fcs, pd.eContainingFeature(), pd, true);
-					buildNonImplicitChange(cd, fcs, feature, indexed);
-					break;
-				case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
-					// The decorator AND feature are implicit. Just clone them and add to the class.
-					doAddToEnd(cd, getFeatureChangeList(cd, feature.eContainer()), feature.eContainingFeature(), feature, true);
-					break;
-				case ImplicitItem.NOT_IMPLICIT:
-					// Neither the feature nor the decorator are implicit. So need to do applies against them.
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, pd), pd, indexed);
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, feature), feature, indexed);
-					break;
-			}
-		}
-	}
-	
-	/**
-	 * Build the appropriate change record for the event set decorator. Either it is an add of a new event set decorator or it is the setting of the implicit
-	 * settings on an non-implicit event set decorator. The same is true of the feature that it decorates. It may be new or it may be an existing one.
-	 * @param cd
-	 * @param ed
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, EventSetDecorator ed) {
-		// Only build changes if merge introspection. If not merge then there are no changes.
-		if (ed.isMergeIntrospection()) {
-			JavaEvent event = (JavaEvent) ed.getEModelElement();
-			switch (ed.getImplicitDecoratorFlag().getValue()) {
-				case ImplicitItem.IMPLICIT_DECORATOR:
-					// The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
-					List fcs = getFeatureChangeList(cd, event);
-					doAddToEnd(cd, fcs, ed.eContainingFeature(), ed, true);
-					buildNonImplicitChange(cd, fcs, event);
-					break;
-				case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
-					// The decorator AND feature are implicit. Just clone them and add to the class.
-					doAddToEnd(cd, getFeatureChangeList(cd, event.eContainer()), event.eContainingFeature(), event, true);
-					break;
-				case ImplicitItem.NOT_IMPLICIT:
-					// Neither the feature nor the decorator are implicit. So need to do applies against them.
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, ed), ed);
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, event), event);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Build the appropriate change record for the method decorator. Either it is an add of a new method decorator or it is the setting of the implicit
-	 * settings on an non-implicit method decorator. The same is true of the operation that it decorates. It may be new or it may be an existing one.
-	 * @param cd
-	 * @param md
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, MethodDecorator md) {
-		// Only do any builds if merge introspection. If not merge introspection then nothing should be changed.
-		if (md.isMergeIntrospection()) {
-			EOperation oper = (EOperation) md.getEModelElement();
-			switch (md.getImplicitDecoratorFlag().getValue()) {
-				case ImplicitItem.IMPLICIT_DECORATOR:
-					// The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
-					List fcs = getFeatureChangeList(cd, oper);
-					doAddToEnd(cd, fcs, md.eContainingFeature(), md, true);
-					buildNonImplicitChange(cd, fcs, oper);
-					break;
-				case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
-					// The decorator AND feature are implicit. Just clone them and add to the class.
-					doAddToEnd(cd, getFeatureChangeList(cd, oper.eContainer()), oper.eContainingFeature(), oper, true);
-					break;
-				case ImplicitItem.NOT_IMPLICIT:
-					// Neither the feature nor the decorator are implicit. So need to do applies against them.
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, md), md);
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, oper), oper);
-					break;
-			}
-		}
-	}
-	
-	private final static Integer ZERO = new Integer(0);
-	private final static Integer ONE = new Integer(1);
-	private final static Integer MINUS_ONE = new Integer(-1);
-	
-	/**
-	 * Build the non-implicit changes into the feature. This creates changes for the implicit settings
-	 * that always occur for a property decorator.
-	 *  
-	 * @param cd
-	 * @param fcs FeatureChanges list for the feature.
-	 * @param feature
-	 * @param indexed <code>true</code> if this is for an indexed feature.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EStructuralFeature feature, boolean indexed) {
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), feature.getName(), false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Transient(), Boolean.FALSE, false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Volatile(), Boolean.FALSE, false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Changeable(), Boolean.valueOf(feature.isChangeable()), false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_EType(), feature.getEType(), false);
-		if (!indexed) {
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_LowerBound(), ZERO, false);
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_UpperBound(), ONE, false);
-		} else {
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_LowerBound(), ZERO, false);
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_UpperBound(), MINUS_ONE, false);
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_Unique(), Boolean.TRUE, false);
-		}
-	}
-
-	/**
-	 * Build the non-implicit changes into the event. This creates changes for the implicit settings
-	 * that always occur for an event set decorator.
-	 *  
-	 * @param cd
-	 * @param fcs FeatureChanges list for the feature.
-	 * @param event
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, JavaEvent event) {
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), event.getName(), false);
-	}
-
-	/**
-	 * Build the non-implicit changes into the operation. This creates changes for the implicit settings
-	 * that always occur for an method decorator.
-	 *  
-	 * @param cd
-	 * @param fcs FeatureChanges list for the feature.
-	 * @param oper
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EOperation oper) {
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), oper.getName(), false);
-		try {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getMethodProxy_Method(), ((MethodProxy) oper).getMethod(), false);	// This is a method that is not in this resource, so no clone.
-		} catch (ClassCastException e) {
-			// It will be a MethodProxy 99.9% of the time, so save by not doing instanceof.
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit feature decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, FeatureDecorator decor) {
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (implicitSettings != 0)
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_ImplicitlySetBits(), new Long(implicitSettings), false);
-		
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_DisplayName(), decor.getDisplayName(), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_ShortDescription(), decor.getShortDescription(), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category(), decor.getCategory(), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT) != 0 && decor.isSetExpert()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Expert(), Boolean.valueOf(decor.isExpert()), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT) != 0 && decor.isSetHidden()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Hidden(), Boolean.valueOf(decor.isHidden()), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT) != 0 && decor.isSetPreferred()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Preferred(), Boolean.valueOf(decor.isPreferred()), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT) != 0) {
-			for (Iterator itr = decor.getAttributes().listIterator(); itr.hasNext();) {
-				FeatureAttributeMapEntryImpl entry = (FeatureAttributeMapEntryImpl)itr.next();
-				if (entry.getTypedValue().isImplicitValue()) {
-					doAddToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Attributes(), entry, true);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit bean decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, BeanDecorator decor) {
-		buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass(), decor.getCustomizerClass(), false); // Customizer class is
-																															 // not in this resource,
-																															 // so we don't clone it.
-		}
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT) != 0 && decor.isSetMergeSuperProperties()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperProperties(), Boolean.valueOf(decor.isMergeSuperProperties()), false);
-		}
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT) != 0 && decor.isSetMergeSuperMethods()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperMethods(), Boolean.valueOf(decor.isMergeSuperMethods()), false);
-		}
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT) != 0 && decor.isSetMergeSuperEvents()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperEvents(), Boolean.valueOf(decor.isMergeSuperEvents()), false);
-		}
-		if (!decor.getNotInheritedPropertyNames().isEmpty()) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames(), decor.getNotInheritedPropertyNames(), false);
-		}
-		if (!decor.getNotInheritedMethodNames().isEmpty()) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames(), decor.getNotInheritedMethodNames(), false);
-		}
-		if (!decor.getNotInheritedEventNames().isEmpty()) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames(), decor.getNotInheritedEventNames(), false);
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit property decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * @param indexed <code>true</code> if this is an indexed property decorator.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, PropertyDecorator decor, boolean indexed) {
-		buildNonImplicitChange(cd, fcs, decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass(), decor.getPropertyEditorClass(), false); // Property Editor class is
-																															 // not in this resource,
-																															 // so we don't clone it.
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_ReadMethod(), decor.getReadMethod(), false); 
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_WriteMethod(), decor.getWriteMethod(), false); 
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Field(), decor.getField(), false); 
-			if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getPropertyDecorator_FieldReadOnly()))
-				doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_FieldReadOnly(), Boolean.valueOf(decor.isFieldReadOnly()), false);
-		}		
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT) != 0 && decor.isSetBound()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Bound(), Boolean.valueOf(decor.isBound()), false);
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT) != 0 && decor.isSetConstrained()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Constrained(), Boolean.valueOf(decor.isConstrained()), false);
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_DesignTime(), Boolean.valueOf(decor.isDesignTime()), false);
-		}
-		
-		if (indexed) {
-			IndexedPropertyDecorator ipd = (IndexedPropertyDecorator) decor;
-			if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT) != 0) {
-				doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator_IndexedReadMethod(), ipd.getIndexedReadMethod(), false); 
-			}
-			if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT) != 0) {
-				doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator_IndexedWriteMethod(), ipd.getIndexedWriteMethod(), false); 
-			}
-		}
-	}
-	
-	/**
-	 * Build up the changes for a non-implicit event set decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EventSetDecorator decor) {
-		buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod(), decor.getAddListenerMethod(), false); // listener method is
-																															 // not in this resource,
-																															 // so we don't clone it.
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass(), decor.getEventAdapterClass(), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT) != 0) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd(), decor.getSerListMthd(), true);	// These need to be cloned because they are contained here.
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType(), decor.getListenerType(), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod(), decor.getRemoveListenerMethod(), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT) != 0 && decor.isSetInDefaultEventSet()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_InDefaultEventSet(), Boolean.valueOf(decor.isInDefaultEventSet()), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT) != 0 && decor.isSetUnicast()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_Unicast(), Boolean.valueOf(decor.isUnicast()), false);
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit method decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, MethodDecorator decor) {
-		buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT) != 0) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc(), decor.getSerParmDesc(), true); 
-		}
-	}
-
-
-	/**
-	 * Get the feature change list for an object. Create it one if necessary.
-	 * 
-	 * @param cd
-	 * @param object
-	 * @return feature change list.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static List getFeatureChangeList(ChangeDescription cd, EObject object) {
-		List fcs = cd.getObjectChanges().get(object); // Get the feature changes if any.
-		if (fcs == null) {
-			Map.Entry entry = ChangeFactory.eINSTANCE.createEObjectToChangesMapEntry(object);
-			cd.getObjectChanges().add(entry);
-			fcs = (List) entry.getValue();
-		}
-		return fcs;
-	}
-
-	/**
-	 * Return the FeatureChange record for a feature wrt/object. Create one if necessary. If it creates it, it will mark it as "set". All of our
-	 * changes here are set kind of changes, not unset kind.
-	 * 
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 * @return feature change
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static FeatureChange getFeatureChange(List fcs, EStructuralFeature feature) {
-		if (!fcs.isEmpty()) {
-			for (int i = 0; i < fcs.size(); i++) {
-				FeatureChange fc = (FeatureChange) fcs.get(i);
-				if (fc.getFeature() == feature)
-					return fc;
-			}
-		}
-
-		// Either new object changes or no feature change found. Create one.
-		FeatureChange fc = ChangeFactory.eINSTANCE.createFeatureChange(feature, null, true);
-		fcs.add(fc);
-		return fc;
-	}
-
-	/**
-	 * Create a change for add to end of the given feature (must be isMany()). If newObject is true, then this means this is not a pointer to an
-	 * existing object and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known
-	 * about.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 *            the feature being added to.
-	 * @param addedValue
-	 *            the value being added.
-	 * @param newValue
-	 *            <code>true</code> if new object in the resource, a clone will be made. <code>false</code> if an existing object. Must be an
-	 *            EObject for cloning. Best if not true for non-eobjects.
-	 * @return the addedValue or the clone if it was cloned.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static Object doAddToEnd(ChangeDescription cd, List fcs, EStructuralFeature feature, Object addedValue, boolean newValue) {
-		FeatureChange fc = getFeatureChange(fcs, feature);
-		if (newValue) {
-			try {
-				addedValue = EcoreUtil.copy((EObject) addedValue);
-				cd.getObjectsToAttach().add((EObject)addedValue);
-			} catch (ClassCastException e) {
-				// Normally should not occur, but if it does, it means we can't clone, so don't clone.
-			}
-		}
-		List lcs = fc.getListChanges();
-		// Find the one with add and -1, i.e. add to end. There should only be one.
-		ListChange lc = null;
-		for (int i = 0; i < lcs.size(); i++) {
-			ListChange lca = (ListChange) lcs.get(i);
-			if (lca.getKind() == ChangeKind.ADD_LITERAL && lca.getIndex() == -1) {
-				lc = lca;
-				break;
-			}
-		}
-		if (lc == null) {
-			lc = ChangeFactory.eINSTANCE.createListChange();
-			lcs.add(lc);
-		}
-
-		lc.getValues().add(addedValue);
-		return addedValue;
-	}
-
-	/**
-	 * Create a change for add all to end of the given feature (must be isMany()). If newValue is true, then this means this is not a pointer to
-	 * existing objects and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known
-	 * about.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 *            the feature being added to.
-	 * @param addedValues
-	 *            the values being added.
-	 * @param newValue
-	 *            <code>true</code> if new objects in the resource, clones will be made. <code>false</code> if an existing object. Must be EObject
-	 *            for cloning. Best if not true for non-eobjects.
-	 * @return the addedValues or the clones if it was cloned.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static Object doAddAllToEnd(ChangeDescription cd, List fcs, EStructuralFeature feature, Collection addedValues, boolean newValue) {
-		FeatureChange fc = getFeatureChange(fcs, feature);
-		if (newValue) {
-			try {
-				addedValues = EcoreUtil.copyAll(addedValues);
-				cd.getObjectsToAttach().addAll(addedValues);
-			} catch (ClassCastException e) {
-				// Normally should not occur, but if it does, it means we can't clone, so don't clone.
-			}
-		}
-		List lcs = fc.getListChanges();
-		// Find the one with add and -1, i.e. add to end. There should only be one.
-		ListChange lc = null;
-		for (int i = 0; i < lcs.size(); i++) {
-			ListChange lca = (ListChange) lcs.get(i);
-			if (lca.getKind() == ChangeKind.ADD_LITERAL && lca.getIndex() == -1) {
-				lc = lca;
-				break;
-			}
-		}
-		if (lc == null) {
-			lc = ChangeFactory.eINSTANCE.createListChange();
-			lcs.add(lc);
-		}
-
-		lc.getValues().addAll(addedValues);
-		return addedValues;
-	}
-
-	/**
-	 * Create a change for set a given feature (must be !isMany()). If newValue is true, then this means this is not a pointer to an existing object
-	 * and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known about.
-	 * <p>
-	 * Any further sets to this feature will result in the previous setting being lost.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 *            the feature being set to.
-	 * @param setValue
-	 *            the value being set.
-	 * @param newValue
-	 *            <code>true</code> if new object in the resource, a clone will be made. <code>false</code> if an existing object. Must be an
-	 *            EObject for cloning. Best if not true for non-eobjects.
-	 * @return the setValue or the clone if it was cloned.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static Object doSet(ChangeDescription cd, List fcs, EStructuralFeature feature, Object setValue, boolean newValue) {
-
-		FeatureChange fc = getFeatureChange(fcs, feature);
-		if (newValue) {
-			try {
-				setValue = EcoreUtil.copy((EObject) setValue);
-				cd.getObjectsToAttach().add((EObject)setValue);
-			} catch (ClassCastException e) {
-				// Normally should not occur, but if it does, it means we can't clone, so don't clone.
-			}
-		}
-
-		if (setValue instanceof EObject)
-			fc.setReferenceValue((EObject) setValue);
-		else
-			fc.setDataValue(EcoreUtil.convertToString((EDataType) feature.getEType(), setValue));
-		return setValue;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java
deleted file mode 100644
index ef87e8fc6..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java
+++ /dev/null
@@ -1,255 +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.adapters;
-/*
-
-
- */
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.util.*;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-/**
- * BeaninfoAdapterFactory - the factory for 
- * beaninfo introspection to populate the Java Model.
- * Creation date: (11/1/2000 11:52:55 AM)
- * @author: Administrator
- */
-public class BeaninfoAdapterFactory extends AdapterFactoryImpl {
-	protected IBeaninfoSupplier fInfoSupplier;
-
-	// Maintain a mapping of the source objects to the adaptors which have
-	// introspected from them.  This allows a close operation to force those
-	// adapters to clear out the data. It also allows for marking an adapter as stale
-	// so that next time it introspects it will re-get the data.
-	// 
-	// This is a WeakReference so that we don't hold onto adapters that were
-	// explicitly removed in other ways.
-	private Map fIntrospected = new HashMap();	// NOTE: This is to be accessed only under sync(this)!
-	private ReferenceQueue fRefQ = new ReferenceQueue();
-	private static class WeakValue extends WeakReference {
-		private Object key;
-		public WeakValue(Object aKey, Object value, ReferenceQueue que) {
-			super(value, que);
-			key = aKey;
-		}
-
-		public Object getKey() {
-			return key;
-		}
-	};
-
-	public BeaninfoAdapterFactory(IBeaninfoSupplier supplier) {
-		fInfoSupplier = supplier;
-	}
-	
-	public Adapter createAdapter(Notifier target, Object type) {
-		if (type == IIntrospectionAdapter.ADAPTER_KEY) {
-			return !(target instanceof ArrayType) ? new BeaninfoClassAdapter(this) : null;	// Array types don't have beaninfo adapters.
-		} else
-			return new BeaninfoSuperAdapter();
-	}
-	
-	/**
-	 * @see org.eclipse.emf.common.notify.AdapterFactory#isFactoryForType(Object)
-	 */
-	public boolean isFactoryForType(Object type) {
-		return IIntrospectionAdapter.ADAPTER_KEY == type || BeaninfoSuperAdapter.ADAPTER_KEY == type;
-	}	
-
-	public ProxyFactoryRegistry getRegistry() {
-		return fInfoSupplier.getRegistry();
-	}
-	
-	public boolean isRegistryCreated() {
-		return fInfoSupplier.isRegistryCreated();
-	}
-
-	public ProxyFactoryRegistry recycleRegistry() {
-		markAllStale(); // At this point in time we need to mark them all stale because we are recycling. MarkAllStale also closes the registry.
-		return getRegistry();
-	}
-	
-	public IProject getProject() {
-		return fInfoSupplier.getProject();
-	}
-	
-	public ProjectResourceSet getNewResourceSet() {
-		return fInfoSupplier.getNewResourceSet();
-	}
-	
-	public ResourceSet getProjectResourceSet() {
-		return fInfoSupplier.getProjectResourceSet();
-	}
-
-	/**
-	 * Close ALL adapters. Also remove the adapters so that they
-	 * are not being held onto. This means we are closing the project or removing the nature.
-	 */
-	public void closeAll(boolean clearResults) {
-		processQueue();
-		synchronized (this) {
-			// We are going to be removing all of them, so just set introspected to an empty one
-			// and use the real one. This way we won't get concurrent modifications as we remove
-			// it from the notifier removeAdapter.
-			Map intr = fIntrospected;
-			fIntrospected = Collections.EMPTY_MAP;	// Since we are closing we can keep the unmodifiable one here.
-			Iterator i = intr.values().iterator();
-			while (i.hasNext()) {
-				BeaninfoClassAdapter a = (BeaninfoClassAdapter) ((WeakValue) i.next()).get();
-				if (a != null) {
-					if (clearResults)
-						a.clearIntrospection();
-					Notifier notifier = a.getTarget();
-					if (notifier != null)
-						notifier.eAdapters().remove(a);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Mark all stale, but leave the overrides alone. The overrides aren't stale.
-	 * 
-	 * 
-	 * @since 1.1.0.1
-	 */
-	public void markAllStale() {
-		markAllStale(false);
-	}
-	
-	/**
-	 * Mark the package as stale. The overrides are left alone since they are not stale.
-	 * 
-	 * @param packageName name of package ('.' qualified).
-	 * @since 1.2.1
-	 */
-	public void markPackageStale(String packageName) {
-		processQueue();
-		packageName+='.';	// Include the '.' so that can distinguish package from class. 
-		synchronized (this) {
-			Iterator itr = fIntrospected.entrySet().iterator();
-			while (itr.hasNext()) {
-				Map.Entry entry = (Map.Entry) itr.next();
-				String entryName = (String) entry.getKey();
-				if (entryName.startsWith(packageName)) {
-					// It is the item or one of its inner classes.
-					WeakValue ref = (WeakValue) entry.getValue();
-					BeaninfoClassAdapter a = (BeaninfoClassAdapter) ref.get();					
-					if (a != null) {
-						a.markStaleFactory(isRegistryCreated() ? getRegistry() : null); // Mark it stale with the current registry.
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Mark ALL adapters as stale. This occurs because we've recycled the registry.
-	 * 
-	 * @param clearOverrides clear the overrides too. This is full-fledged stale. The overrides are stale too.
-	 */
-	public void markAllStale(boolean clearOverrides) {
-		ProxyFactoryRegistry fact = isRegistryCreated() ? getRegistry() : null;
-		processQueue();
-		synchronized (this) {
-			Iterator i = fIntrospected.values().iterator();
-			while (i.hasNext()) {
-				BeaninfoClassAdapter a = (BeaninfoClassAdapter) ((WeakValue) i.next()).get();
-				if (a != null)
-					a.markStaleFactory(fact, clearOverrides);
-			}
-			fInfoSupplier.closeRegistry();	// Get rid of the registry now since it is not needed. This way we won't accidentily hold onto it when not needed.
-		}
-	}
-	/**
-	 * Mark the introspection as stale for a source object. Also clear results if told to.
-	 * @param sourceName Fully qualified source name, use type for reflection, i.e. "a.b.c.Class1$InnerClass"
-	 * @param clearResults clear out the results. If false, they will be reused if possible on recycle.
-	 */
-	public void markStaleIntrospection(String sourceName, boolean clearResults) {
-		processQueue();
-		synchronized (this) {
-			WeakValue ref = (WeakValue) fIntrospected.get(sourceName);
-			if (ref != null) {
-				BeaninfoClassAdapter a = (BeaninfoClassAdapter) ref.get();
-				if (a != null) {
-					if (clearResults)
-						a.clearIntrospection();
-					a.markStaleFactory(isRegistryCreated() ? getRegistry() : null); // Mark it stale with the current registry.
-				}
-			}
-		}
-	}
-	
-	public void markStaleIntrospectionPlusInner(String sourceName, boolean clearResults) {
-		processQueue();
-		String sourceNameForInner = sourceName + '$';
-		synchronized (this) {
-			Iterator itr = fIntrospected.entrySet().iterator();
-			while (itr.hasNext()) {
-				Map.Entry entry = (Map.Entry) itr.next();
-				String entryName = (String) entry.getKey();
-				if (entryName.equals(sourceName) || entryName.startsWith(sourceNameForInner)) {
-					// It is the item or one of its inner classes.
-					WeakValue ref = (WeakValue) entry.getValue();
-					BeaninfoClassAdapter a = (BeaninfoClassAdapter) ref.get();					
-					if (a != null) {
-						if (clearResults)
-							a.clearIntrospection();
-						a.markStaleFactory(isRegistryCreated() ? getRegistry() : null); // Mark it stale with the current registry.
-					}
-				}
-			}
-		}
-	}	
-
-	/**
-	 * Register an adapter for introspection.
-	 * @param sourceName Fully qualified source name, use type for reflection, i.e. "a.b.c.Class1$InnerClass"
-	 * @param adapter The adapter to register
-	 */
-	public void registerIntrospection(String sourceName, BeaninfoClassAdapter adapter) {
-		// Create it as a weak reference so that it doesn't hold onto the adapter if it is ever removed
-		// and thrown away (or the MOF resource itself is thrown away).
-		processQueue();
-		synchronized (this) {
-			fIntrospected.put(sourceName, new WeakValue(sourceName, adapter, fRefQ));
-		}
-	}
-	
-	/**
-	 * Remove adapter. This happens in the case that adapter is being removed and
-	 * we want to remove it from our list. This is an internal API only for use by
-	 * the adapter itself.
-	 */
-	public synchronized void removeAdapter(BeaninfoClassAdapter a) {
-		fIntrospected.remove(a.getJavaClass().getQualifiedNameForReflection());
-	}
-
-	private synchronized void processQueue() {
-		WeakValue wv;
-		while ((wv = (WeakValue) fRefQ.poll()) != null) {
-			fIntrospected.remove(wv.getKey());
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java
deleted file mode 100644
index c3ab399c0..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java
+++ /dev/null
@@ -1,2678 +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.adapters;
-/*
-
-
- */
-
-import java.io.FileNotFoundException;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.notify.*;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.change.*;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.ESuperAdapter;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.*;
-import org.eclipse.emf.ecore.xmi.PackageNotFoundException;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.*;
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.beaninfo.core.BeanInfoCacheController.ClassEntry;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-import org.eclipse.jem.util.TimerTests;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * Beaninfo adapter for doing introspection on a Java Model class.
- * <p>
- * The first time a introspect request is made, it will use the ClassEntry from the cache controller to determine if it should load from the
- * cache or do a complete introspection. After that it will always do a complete introspection when it is marked as needing introspection.
- * This is because the cache is useless to us then. At that point in time we already know that we or one of our superclasses or one of 
- * outer classes has changed, thereby requiring us to reintrospect, the cache is invalid at that point. Also once we did an introspection we
- * don't want to do a load from cache but instead do a merge because someone may of been holding onto the features and we don't want to
- * throw them away unnecessarily.
- * <p> 
- * TODO Need to re-look into this to see if we can do a merge with the cache file because if it was an external jar and it has now gone
- * valid, why waste time reintrospecting. But this needs to be carefully thought about. 
- * <p> 
- * The resource change listener
- * will automatically mark any subclasses (both the BeaninfoClassAdapter and the ClassEntry) as being stale for us. That way we don't need
- * to waste time checking the ce and superclasses everytime. We will keep the ClassEntry around simply to make the marking of it as stale easier for the
- * resource listener. Finding the ce everytime would be expensive.
- * <p> 
- * This is the process for determining if introspection required:
- * <ol>
- * <li>If needsIntrospection flag is false, then do nothing. Doesn't need introspection.
- * <li>If class is undefined, then just set up for an undefined class and return. (In this case the CE should be thrown away, it should of been deleted).
- * <li>If never introspected (not RETRIEVED_FULL_DOCUMENT), get the CE, get the modification stamp and call isStaleStamp. This determines if this
- * stamp or any super class stamp is stale wrt to current stamp. If it is not stale, then load from cache because the cache is good. 
- * <li>If no cache or cache is stale or has introspected once, then introspect and replace cache.
- * </ol>
- * 
- */
-
-public class BeaninfoClassAdapter extends AdapterImpl implements IIntrospectionAdapter {
-	
-	public static final String REFLECT_PROPERTIES = "Reflect properties";	// Reflect properties in IDE //$NON-NLS-1$
-	public static final String APPLY_EXTENSIONS = "Apply Overrides";	// Apply override files //$NON-NLS-1$
-	public static final String REMOTE_INTROSPECT = "Remote Introspect";	// Introspect on remote //$NON-NLS-1$
-	public static final String INTROSPECT = "Introspect";	// Straight introspection, whether load from cache or introspect. //$NON-NLS-1$
-	public static final String LOAD_FROM_CACHE = "Load from Cache"; //$NON-NLS-1$
-	
-	
-	public static BeaninfoClassAdapter getBeaninfoClassAdapter(EObject jc) {
-		return (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter(jc, IIntrospectionAdapter.ADAPTER_KEY);
-	}
-	
-	/**
-	 * Clear out the introspection because introspection is being closed or removed from the project.
-	 * Don't want anything hanging around that we had done.
-	 */
-	public void clearIntrospection() {
-		// Clear out the beandecorator if implicitly created.
-		Iterator beanItr = getJavaClass().getEAnnotationsInternal().iterator();
-		while (beanItr.hasNext()) {
-			EAnnotation dec = (EAnnotation) beanItr.next();
-			if (dec instanceof BeanDecorator) {
-				BeanDecorator decor = (BeanDecorator) dec;
-				if (decor.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_LITERAL) {
-					beanItr.remove();
-					((InternalEObject) decor).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-				} else {
-					BeanInfoDecoratorUtility.clear((BeanDecorator) dec);
-				}
-				break;
-			}
-		}
-		// Clear out the features that we implicitly created.
-		Iterator propItr = getJavaClass().getEStructuralFeaturesInternal().iterator();
-		while (propItr.hasNext()) {
-			EStructuralFeature prop = (EStructuralFeature) propItr.next();
-			Iterator pdItr = prop.getEAnnotations().iterator();
-			while (pdItr.hasNext()) {
-				EAnnotation dec = (EAnnotation) pdItr.next();
-				if (dec instanceof PropertyDecorator) {
-					PropertyDecorator pd = (PropertyDecorator) dec;
-					if (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
-						BeanInfoDecoratorUtility.clear(pd);
-					else {
-						pdItr.remove(); // Remove it from the property.
-						((InternalEObject) pd).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					if (pd.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-						propItr.remove(); // Remove the feature itself
-						((InternalEObject) prop).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					break;
-				}
-			}
-		}
-		
-		// Clear out the operations that we implicitly created.
-		Iterator operItr = getJavaClass().getEOperationsInternal().iterator();
-		while (operItr.hasNext()) {
-			EOperation oper = (EOperation) operItr.next();
-			Iterator mdItr = oper.getEAnnotations().iterator();
-			while (mdItr.hasNext()) {
-				EAnnotation dec = (EAnnotation) mdItr.next();
-				if (dec instanceof MethodDecorator) {
-					MethodDecorator md = (MethodDecorator) dec;
-					if (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
-						BeanInfoDecoratorUtility.clear(md);
-					else {
-						mdItr.remove(); // Remove it from the operation.
-						((InternalEObject) md).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					if (md.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-						operItr.remove(); // Remove the oepration itself
-						((InternalEObject) oper).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					break;
-				}
-			}
-			
-			// Clear out the events that we implicitly created.
-			Iterator evtItr = getJavaClass().getEventsGen().iterator();
-			while (evtItr.hasNext()) {
-				JavaEvent evt = (JavaEvent) evtItr.next();
-				Iterator edItr = evt.getEAnnotations().iterator();
-				while (edItr.hasNext()) {
-					EAnnotation dec = (EAnnotation) edItr.next();
-					if (dec instanceof EventSetDecorator) {
-						EventSetDecorator ed = (EventSetDecorator) dec;
-						if (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
-							BeanInfoDecoratorUtility.clear(ed);
-						else {
-							edItr.remove(); // Remove it from the event.
-							((InternalEObject) ed).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-						}
-						if (ed.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							evtItr.remove(); // Remove the event itself
-							((InternalEObject) evt).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-						}
-						break;
-					}
-				}
-			}				
-		}
-
-		synchronized(this) {
-			needsIntrospection = true;
-		}
-	}
-	
-	private void clearAll() {
-		clearIntrospection();	// First get rid of the ones we did so that they are marked as proxies.
-		
-		// Clear out the annotations.
-		getJavaClass().getEAnnotationsInternal().clear();
-		// Clear out the attributes.
-		getJavaClass().getEStructuralFeaturesInternal().clear();	
-		// Clear out the operations.
-		getJavaClass().getEOperationsInternal().clear();
-		// Clear out the events.
-		getJavaClass().getEventsGen().clear();
-		
-		retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT;	// Since we cleared everything, go back to no doc applied.
-	}
-	
-
-	/**
-	 * @version 	1.0
-	 * @author
-	 */
-
-	// A URI that will never resolve. Used to mark an object as no longer valid.
-	protected static final URI BAD_URI = URI.createURI("baduri"); //$NON-NLS-1$
-
-	protected boolean needsIntrospection = true;
-	
-	protected BeanInfoCacheController.ClassEntry classEntry;
-	
-	protected boolean isIntrospecting;
-
-	protected boolean isDoingAllProperties;
-
-	protected boolean isDoingAllOperations;
-
-	protected boolean isDoingAllEvents;
-
-	protected final static int
-		NEVER_RETRIEVED_EXTENSION_DOCUMENT = 0,
-		RETRIEVED_ROOT_ONLY = 1,
-		RETRIEVED_FULL_DOCUMENT = 2,
-		CLEAR_EXTENSIONS = 3;
-	protected int retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT;
-
-	protected BeaninfoAdapterFactory adapterFactory;
-
-	private WeakReference staleFactory; // When reference not null, then this factory is a stale factory and 
-	// a new one is needed when the factory returned == this one.
-	// It is a WeakRef so that if the factory goes away on its own
-	// that we don't hold onto it.
-
-	// A temporary hashset of the local properties. Used when creating a new
-	// property to use the old one. It is cleared out at the end of attribute introspection.
-	// It is only built once during attribute introspection so that we have the snapshot
-	// of before the introspection (i.e. the ones that were specifically added by users
-	// and not through introspection). The ones that we are adding do not need to be checked
-	// against each other because there will not be conflicts.
-	//
-	// Also at the end, we will go through the properties and see if it exists in the fPropertiesMap and
-	// it is not the value Boolean.FALSE in the map, and the entry is implicitly created. This means this
-	// was an implicit entry from the previous introspection and was not re-created in this introspection.
-	private HashMap propertiesMap;
-	private List featuresRealList; // Temp pointer to the real list we are building. It is the true list in java class.
-	
-	// A temporary hashmap of the local operations. Used when creating a new
-	// operation to reuse the old one. It is cleared out at the end of operation introspection.
-	// It is only built once during operation introspection so that we have the snapshot
-	// of before the introspection.
-	private HashMap operationsMap;
-	private EList operationsRealList; // Temp pointer to the real list we are building. It is the true list in java class.
-	// A set of operations as we create them so that we which ones we added/kept and which are no longer in use and can be removed.	
-	// If they aren't in this set at the end, then we know it should be removed if it is one we had created in the past.
-	private HashSet newoperations; 
-
-	// A temporary hashset of the local events. Used when creating a new
-	// event to use the old one. It is cleared out at the end of event introspection.
-	// It is only built once during event introspection so that we have the snapshot
-	// of before the introspection (i.e. the ones that were specifically added by users
-	// and not through introspection). The ones that we are adding do not need to be checked
-	// against each other because there will not be conflicts.
-	//
-	// Also at the end, we will go through the events and see if it exists in the fEventsMap and
-	// it is not the value Boolean.FALSE in the map, and the entry is implicitly created. This means this
-	// was an implicit entry from the previous introspection and was not re-created in this introspection.
-	private HashMap eventsMap;
-	private EList eventsRealList; // Temp pointer to the real list we are building. It is the true list in java class.
-
-	private Boolean defaultBound;
-	// Whether this class is default bound or not (i.e. does this class implement add/remove property change listener. If null, then not yet queried.
-
-	public BeaninfoClassAdapter(BeaninfoAdapterFactory factory) {
-		super();
-		adapterFactory = factory;
-	}
-
-	/*
-	 * Answer whether this java class is still connected to a live resource. It happens during unloading
-	 * that we are no longer connected to a resource (because the javapackage has already been processed and
-	 * unloaded) or the resource is in the process of being unloaded, but the unloading process will still 
-	 * call accessors on this java class, which will come over here. In those cases we should treat as
-	 * introspection completed without doing anything.
-	 */
-	protected boolean isResourceConnected() {
-		Resource res = getJavaClass().eResource();
-		return res != null && res.isLoaded();
-	}
-
-	protected final ProxyFactoryRegistry getRegistry() {
-		ProxyFactoryRegistry factory = adapterFactory.getRegistry();
-		if (staleFactory != null && factory == staleFactory.get()) {
-			// We need to recycle the factory. The returned factory is the same factory when it went stale.
-			factory = adapterFactory.recycleRegistry();
-		}
-		staleFactory = null; // Whether we recycled or not, it is no longer stale.
-		return factory;
-	}
-
-	/**
-	 * Return whether this adapter has been marked as stale. Needed
-	 * by the users so that they can recycle if necessary.
-	 */
-	public boolean isStale() {
-		return staleFactory != null;
-	}
-
-	protected BeaninfoAdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-
-	public boolean isAdapterForType(Object key) {
-		return IIntrospectionAdapter.ADAPTER_KEY.equals(key);
-	}
-
-	/**
-	 * This map is keyed by name. It is a snapshot of the properties at the
-	 * time the introspection/reflection of properties was started. It is used
-	 * for quick lookup.
-	 *
-	 * Once a property is used, the entry is replaced with a Boolean.FALSE. This
-	 * is so we know which have already been used and at the end, which need
-	 * to be deleted since they weren't used (i.e. the ones that aren't FALSE).
-	 */
-	protected HashMap getPropertiesMap() {
-		if (propertiesMap == null) {
-			List localFeatures = getJavaClass().getEStructuralFeaturesInternal();
-			propertiesMap = new HashMap(localFeatures.size());
-			Iterator itr = localFeatures.iterator();
-			while (itr.hasNext()) {
-				EStructuralFeature feature = (EStructuralFeature) itr.next();
-				propertiesMap.put(feature.getName(), feature);
-			}
-		}
-		return propertiesMap;
-	}
-
-	/**
-	 * Get it once so that we don't need to keep getting it over and over.
-	 */
-	protected List getFeaturesList() {
-		if (featuresRealList == null)
-			featuresRealList = getJavaClass().getEStructuralFeaturesInternal();
-		return featuresRealList;
-	}
-
-	/**
-	 * The map is keyed by longName. If a Method is passed in, then the
-	 * id of the method is used (this is in reflection), if an IBeanProxy
-	 * is passed in, then an id is created and looked up (this is in introspection).
-	 * The map is used for a quick lookup of behaviors at the time introspection
-	 * of behaviors started.
-	 */
-	protected HashMap getOperationsMap() {
-		if (operationsMap == null) {
-			List locals = getJavaClass().getEOperationsInternal();
-			int l = locals.size();
-			operationsMap = new HashMap(l);
-			for (int i = 0; i < l; i++) {
-				EOperation op = (EOperation) locals.get(i);
-				operationsMap.put(formLongName(op), op);
-			}
-		}
-		return operationsMap;
-	}
-
-	/**
-	 * Get it once so that we don't need to keep getting it over and over.
-	 */
-	protected EList getOperationsList() {
-		if (operationsRealList == null)
-			operationsRealList = getJavaClass().getEOperationsInternal();
-		return operationsRealList;
-	}
-
-	/**
-	 * The map is keyed by name.
-	 * The map is used for a quick lookup of events at the time introspection
-	 * of events started.
-	 *
-	 * Once an event is used, the entry is replaced with a Boolean.FALSE. This
-	 * is so we know which have already been used and at the end, which need
-	 * to be deleted since they weren't used (i.e. the ones that aren't FALSE).
-	 */
-	protected HashMap getEventsMap() {
-		if (eventsMap == null) {
-			List locals = getJavaClass().getEventsGen();
-			eventsMap = new HashMap(locals.size());
-			Iterator itr = locals.iterator();
-			while (itr.hasNext()) {
-				JavaEvent event = (JavaEvent) itr.next();
-				eventsMap.put(event.getName(), event);
-			}
-		}
-		return eventsMap;
-	}
-
-	/**
-	 * Get it once so that we don't need to keep getting it over and over.
-	 */
-	protected EList getEventsList() {
-		if (eventsRealList == null)
-			eventsRealList = getJavaClass().getEventsGen();
-		return eventsRealList;
-	}
-
-	public void introspectIfNecessary() {
-		introspectIfNecessary(false);
-	}
-	
-	protected void introspectIfNecessary(boolean doOperations) {
-		boolean doIntrospection = false;
-		synchronized (this) {
-			doIntrospection = needsIntrospection && !isIntrospecting; 
-			if (doIntrospection)
-				isIntrospecting = true;
-		}
-		if (doIntrospection) {
-			boolean didIntrospection = false;
-			try {				
-				introspect(doOperations);
-				didIntrospection = true;
-			} catch (Exception e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(
-					new Status(
-						IStatus.WARNING,
-						BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(),
-						0,
-						MessageFormat.format(
-							BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, 
-							new Object[] { getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
-						e));
-			} finally {
-				synchronized (this) {
-					isIntrospecting = false;
-					needsIntrospection = !didIntrospection;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get the class entry. 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public BeanInfoCacheController.ClassEntry getClassEntry() {
-		return classEntry;
-	}
-	
-	private boolean canUseCache() {
-		// We check our level, we assume not stale unless CE says stale.
-		synchronized (this) {
-			// We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
-			if (classEntry == null)
-				classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-			if (classEntry != null) {
-				// We have a cache to check.
-				long modStamp = classEntry.getModificationStamp();
-				// A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
-				if (modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP) {
-					classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-					if (classEntry != null)
-						modStamp = classEntry.getModificationStamp();
-				}
-				if (modStamp == IResource.NULL_STAMP || modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP)
-					return false;	// We are stale.
-			} else
-				return false;	// We don't have a cache entry to check against, which means are deleted, or never cached.
-		}
-		
-		// Now try the supers to see if we are out of date to them.
-		// Note: Only if this is an interface could there be more than one eSuperType.
-		List supers = getJavaClass().getESuperTypes();
-		if (!supers.isEmpty()) {
-			BeaninfoClassAdapter bca = getBeaninfoClassAdapter((EObject) supers.get(0));
-			ClassEntry superCE = bca.getClassEntry();
-			// If super is defined and out of date don't use cache. If super is undefined and super modification stamp is not super_undefined,
-			// then that means it was defined at time of cache and now not defined, so don't use cache.
-			if (superCE != null) {
-				if (superCE.getModificationStamp() != classEntry.getSuperModificationStamp())
-					return false; // Out-of-date wrt/super.
-			} else if (classEntry.getSuperModificationStamp() != ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP)
-				return false;	// was previously defined, and now undefined, so out of date.
-			String[] iNames = classEntry.getInterfaceNames();
-			if (iNames != null) {
-				if (iNames.length != supers.size() - 1)
-					return false; // We have a different number of supers, so stale.
-				// Now the interfaces may not be in the same order, but there shouldn't be too many, so we'll use O(n2) lookup. We'll try starting at
-				// the same index just in case. That way if they are the same order it will be linear instead. Most likely will be same order.
-				long[] iStamp = classEntry.getInterfaceModificationStamps();
-				for (int i = 1; i <= iNames.length; i++) {
-					JavaClass javaClass = (JavaClass) supers.get(i);
-					String intName = (javaClass).getQualifiedNameForReflection();
-					// Find it in the names list.
-					int stop = i-1;
-					int indx = stop;	// Start at the stop, when we hit it again we will be done.
-					boolean found = false;
-					do {
-						if (iNames[indx].equals(intName)) {
-							found = true;
-							break;
-						}
-					} while ((++indx)%iNames.length != stop);
-					if (!found)
-						return false;	// Couldn't find it, so we are stale.]
-					
-					superCE = getBeaninfoClassAdapter(javaClass).getClassEntry();
-					if (superCE != null) {
-						if (superCE.getModificationStamp() != iStamp[indx])
-							return false; // Out-of-date wrt/interface.
-					} else if (iStamp[indx] != ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP)
-						return false;	// was previously defined, and now undefined, so out of date.
-				}
-			}
-		}
-		return true;	// If we got here everything is ok.
-	}
-
-	private boolean canUseOverrideCache() {
-		// We check our config stamp.
-		// TODO in future can we listen for config changes and mark classes stale if the config changes?
-		synchronized (this) {
-			// We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
-			if (classEntry == null)
-				classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-			if (classEntry != null) {
-				// We have a cache to check.
-				// A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
-				if (classEntry.isDeleted()) {
-					classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-					if (classEntry != null)
-						if (classEntry.isDeleted())
-							return false;	// We have been deleted. Probably shouldn't of gotton here in this case.
-				}
-			} else
-				return false;	// We don't have a cache entry to check against, which means are deleted, or never cached.
-			return classEntry.getConfigurationModificationStamp() == Platform.getPlatformAdmin().getState(false).getTimeStamp();
-		}
-		
-	}
-
-	/**
-	 * Check if the cache for this entry is stale compared to the modification stamp, or if the modification stamp itself is stale, meaning
-	 * subclass was stale already.
-	 * 
-	 * @param requestStamp the timestamp to compare against. 
-	 * @return <code>true</code> if we can use the incoming cache stamp.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected boolean canUseCache(long requestStamp) {
-		long modStamp;
-		// Now get the current mod stamp for this class so we can compare it.
-		synchronized (this) {
-			// We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
-			if (classEntry == null)
-				classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-			if (classEntry != null) {
-				// We have a cache to check.
-				modStamp = classEntry.getModificationStamp();
-				// A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
-				if (modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP) {
-					classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-					if (classEntry != null)
-						modStamp = classEntry.getModificationStamp();
-				}
-				if (modStamp == IResource.NULL_STAMP && modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP)
-					return false;	// Since we are stale, child asking question must also be stale and can't use the cache.
-			} else
-				return false;	// We don't have a cache entry to check against, so child must be stale too.
-		}
-		// If the requested stamp is not the same as ours, then it is out of date (it couldn't be newer but it could be older).
-		return requestStamp == modStamp;
-	}
-		
-	/*
-	 * This should only be called through introspectIfNecessary so that flags are set correctly.
-	 */
-	private void introspect(boolean doOperations) {
-		IBeanProxy beaninfo = null;
-		try {
-			if (isResourceConnected()) {
-				// See if are valid kind of class.
-				if (getJavaClass().getKind() == TypeKind.UNDEFINED_LITERAL) {
-					// Not valid, don't let any further introspection occur.
-					// Mark that we've done all introspections so as not to waste time until we get notified that it has been added
-					// back in.
-					synchronized(this) {
-						if (classEntry != null) {
-							classEntry.markDeleted();	// mark it deleted in case still sitting in cache (maybe because it was in an external jar, we can't know if deleted when jar changed).
-							classEntry = null;	// Get rid of it since now deleted.
-						}
-						needsIntrospection = false;
-					}
-					
-					if (retrievedExtensionDocument == RETRIEVED_FULL_DOCUMENT || retrievedExtensionDocument == CLEAR_EXTENSIONS) {
-						// We've been defined at one point. Need to clear everything and step back
-						// to never retrieved so that we now get the root added in. If we had been
-						// previously defined, then we didn't have root. We will have to lose
-						// all other updates too. But they can come back when we're defined.
-						// Or we've been asked to clear all.
-						clearAll();
-						retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT;
-					}
-					if (retrievedExtensionDocument == NEVER_RETRIEVED_EXTENSION_DOCUMENT)
-						applyExtensionDocument(true);	// Add in Root stuff so that it will work correctly even though undefined.
-				} else {
-					// TODO For now cause recycle of vm if any super type is stale so that if registry is stale for the super type it will be
-					// recreated. This is needed because reflection requires superProperties, etc. and recreating the registry
-					// currently re-marks everyone as stale, including this subclass. This would mean that
-					// re-introspection would need to be done, even though we just did it. The stale registry business needs to be re-addressed so that it is
-					// a lot smarter. 
-					List supers = getJavaClass().getEAllSuperTypes();
-					for (int i = 0; i < supers.size(); i++) {
-						BeaninfoClassAdapter bca = (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter((EObject) supers.get(i),
-								IIntrospectionAdapter.ADAPTER_KEY);
-						if (bca != null && bca.isStale())
-							bca.getRegistry();
-					}
-					// Now we need to force introspection, if needed, of all parents because we need them to be up-to-date for the
-					// class entry.
-					// TODO see if we can come up with a better way that we KNOW the CE is correct, even if any supers are stale.
-					supers = getJavaClass().getESuperTypes();
-					for (int i = 0; i < supers.size(); i++) {
-						BeaninfoClassAdapter bca = (BeaninfoClassAdapter) EcoreUtil.getRegisteredAdapter((EObject) supers.get(i),
-								IIntrospectionAdapter.ADAPTER_KEY);
-						bca.introspectIfNecessary();
-					}
-
-					TimerTests.basicTest.startCumulativeStep(INTROSPECT);
-					if (retrievedExtensionDocument == RETRIEVED_ROOT_ONLY || retrievedExtensionDocument == CLEAR_EXTENSIONS) {
-						// We need to clear out EVERYTHING because we are coming from an undefined to a defined.
-						// Nothing previous is now valid. (Particularly the root stuff).
-						// Or we had a Clean requested and need to clear the extensions too.
-						clearAll();
-					}
-					boolean firstTime = false;
-					if (retrievedExtensionDocument != RETRIEVED_FULL_DOCUMENT) {
-						firstTime = true;	// If we need to apply the extension doc, then this is the first time.
-						applyExtensionDocument(false); // Apply the extension doc before we do anything.
-					}
-
-					// Now check to see if we can use the cache.
-					boolean doIntrospection = true;
-					if (firstTime) {
-						// Check if we can use the cache. Use Max value so that first level test (ourself) will always pass and go on to the supers.
-						if (canUseCache()) {
-							TimerTests.basicTest.startCumulativeStep(LOAD_FROM_CACHE);
-							// We can use the cache.
-							Resource cres = BeanInfoCacheController.INSTANCE.getCache(getJavaClass(), classEntry, true);
-							if (cres != null) {
-								try {
-									// Got a cache to use, now apply it.
-									for (Iterator cds = cres.getContents().iterator(); cds.hasNext();) {
-										ChangeDescription cacheCD = (ChangeDescription) cds.next();
-										cacheCD.apply();
-									}
-									// We need to walk through and create the appropriate ID's for events/actions/properties because by
-									// default from the change descriptions these don't get reflected back. And if some one doesn't
-									// use an ID to get them, they won't have an id set.
-									doIDs();
-									doIntrospection = false;
-								} catch (RuntimeException e) {
-									BeaninfoPlugin.getPlugin().getLogger().log(
-										MessageFormat.format(
-												BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, 
-												new Object[] { getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
-										Level.WARNING);
-									BeaninfoPlugin.getPlugin().getLogger().log(e);
-								} finally {
-									// Remove the cres since it is now invalid. The applies cause them to be invalid.
-									cres.getResourceSet().getResources().remove(cres);
-									if (doIntrospection) {
-										// Apply had failed. We don't know how far it went. We need to wipe out and reget EVERYTHING.
-										clearAll();
-										applyExtensionDocument(false); // Re-apply the extension doc before we do anything else.
-									}
-								}
-							}
-							TimerTests.basicTest.stopCumulativeStep(LOAD_FROM_CACHE);
-						}
-					}
-					
-					if (doIntrospection) {
-						// Finally we can get to handling ourselves.
-						TimerTests.basicTest.startCumulativeStep(REMOTE_INTROSPECT);
-						BeanDecorator decor = Utilities.getBeanDecorator(getJavaClass());
-						if (decor == null) {
-							decor = BeaninfoFactory.eINSTANCE.createBeanDecorator();
-							decor.setImplicitDecoratorFlag(ImplicitItem.IMPLICIT_DECORATOR_LITERAL);
-							getJavaClass().getEAnnotations().add(decor);
-						} else
-							BeanInfoDecoratorUtility.clear(decor);	// Clear out previous results.
-						
-						boolean doReflection = true;
-						if (doOperations)
-							newoperations = new HashSet(50);
-						if (decor.isDoBeaninfo()) {
-							int doFlags = 0;
-							if (decor == null || decor.isMergeIntrospection())
-								doFlags |= IBeanInfoIntrospectionConstants.DO_BEAN_DECOR;
-							if (decor == null || decor.isIntrospectEvents())
-								doFlags |= IBeanInfoIntrospectionConstants.DO_EVENTS;
-							if (decor == null || decor.isIntrospectProperties())
-								doFlags |= IBeanInfoIntrospectionConstants.DO_PROPERTIES;
-							if (doOperations && (decor == null || decor.isIntrospectMethods()))
-								doFlags |= IBeanInfoIntrospectionConstants.DO_METHODS;
-							
-							if (doFlags != 0) {
-								// There was something remote to do.
-								IBeanTypeProxy targetType = null;
-								ProxyFactoryRegistry registry = getRegistry();
-								if (registry != null && registry.isValid())
-									targetType = registry.getBeanTypeProxyFactory().getBeanTypeProxy(getJavaClass().getQualifiedNameForReflection());
-								if (targetType != null) {
-									if (targetType.getInitializationError() == null) {
-										// If an exception is thrown, treat this as no proxy, however log it because we
-										// shouldn't have exceptions during introspection, but if we do it should be logged
-										// so it can be corrected.
-										try {
-											BeaninfoProxyConstants proxyConstants = getProxyConstants();
-											if (proxyConstants != null) {
-												beaninfo = proxyConstants.getIntrospectProxy().invoke(
-														null,
-														new IBeanProxy[] { targetType,
-																getRegistry().getBeanProxyFactory().createBeanProxyWith(false),
-																getRegistry().getBeanProxyFactory().createBeanProxyWith(doFlags)});
-											}											
-										} catch (ThrowableProxy e) {
-											BeaninfoPlugin.getPlugin().getLogger().log(
-													new Status(IStatus.WARNING, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0,
-															MessageFormat.format(BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] { //$NON-NLS-1$
-																	getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
-																	e));
-										}
-									} else {
-										// The class itself couldn't be initialized. Just log it, but treat as no proxy.
-										BeaninfoPlugin.getPlugin().getLogger()
-										.log(
-												new Status(IStatus.WARNING, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0,
-														MessageFormat.format(BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] { //$NON-NLS-1$
-																getJavaClass().getJavaName(), targetType.getInitializationError()}), null));
-									}
-								} else {
-									// The class itself could not be found. Just log it, but treat as no proxy.
-									BeaninfoPlugin.getPlugin().getLogger().log(
-											new Status(IStatus.INFO, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0, MessageFormat.format(
-													BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] { 
-															getJavaClass().getJavaName(),
-															BeanInfoAdapterMessages.BeaninfoClassAdapter_ClassNotFound}), 
-															null));
-								}
-								
-								if (beaninfo != null) {
-									doReflection = false;	// We have a beaninfo, so we are doing introspection.
-									final BeanDecorator bdecor = decor;
-									// We have a beaninfo to process.
-									BeanInfoDecoratorUtility.introspect(beaninfo, new BeanInfoDecoratorUtility.IntrospectCallBack() {
-
-										/*; (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.BeanRecord)
-										 */
-										public BeanDecorator process(BeanRecord record) {
-											return bdecor;
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.PropertyRecord)
-										 */
-										public PropertyDecorator process(PropertyRecord record) {
-											return calculateProperty(record, false);
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.IndexedPropertyRecord)
-										 */
-										public PropertyDecorator process(IndexedPropertyRecord record) {
-											return calculateProperty(record, true);
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.MethodRecord)
-										 */
-										public MethodDecorator process(MethodRecord record) {
-											return calculateOperation(record);
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.EventSetRecord)
-										 */
-										public EventSetDecorator process(EventSetRecord record) {
-											return calculateEvent(record);
-										}
-									});
-								} 
-							}
-						}
-						
-						if (doReflection) {
-							// Need to do reflection stuff.
-							if (decor.isIntrospectProperties())
-								reflectProperties();
-							if (doOperations && decor.isIntrospectMethods())
-								reflectOperations();
-							if (decor.isIntrospectEvents())
-								reflectEvents();
-						}
-						ChangeDescription cd = ChangeFactory.eINSTANCE.createChangeDescription();						
-						BeanInfoDecoratorUtility.buildChange(cd, decor);
-						finalizeProperties(cd);
-						if (doOperations)
-							finalizeOperations(cd);
-						finalizeEvents(cd);
-
-						classEntry = BeanInfoCacheController.INSTANCE.newCache(getJavaClass(), cd, doOperations ? BeanInfoCacheController.REFLECTION_OPERATIONS_CACHE : BeanInfoCacheController.REFLECTION_CACHE);
-						TimerTests.basicTest.stopCumulativeStep(REMOTE_INTROSPECT); 
-					}
-					TimerTests.basicTest.stopCumulativeStep(INTROSPECT);
-				}
-				getAdapterFactory().registerIntrospection(getJavaClass().getQualifiedNameForReflection(), this);
-			}
-		} finally {
-			if (beaninfo != null) {
-				beaninfo.getProxyFactoryRegistry().releaseProxy(beaninfo); // Dispose of the beaninfo since we now have everything.
-			}
-			eventsMap = null; // Clear out the temp lists.
-			eventsRealList = null;
-			operationsMap = null; // Clear out the temp lists.
-			operationsRealList = null;
-			newoperations = null;
-			propertiesMap = null; // Get rid of accumulated map.
-			featuresRealList = null; // Release the real list.
-		}
-	}
-
-	private void doIDs() {
-		// Do properties.
-		if (getJavaClass().eIsSet(EcorePackage.eINSTANCE.getEClass_EStructuralFeatures())) {
-			List features = getFeaturesList();
-			int len = features.size();
-			for (int i = 0; i < len; i++) {
-				EStructuralFeature f = (EStructuralFeature) features.get(i);
-				PropertyDecorator pd = Utilities.getPropertyDecorator(f);
-				if (pd == null || !pd.isMergeIntrospection())
-					continue; // Not a property for us to give an ID to.
-				setPropertyID(f.getName(), f);
-			}
-		}
-		
-		// Do events.
-		if (getJavaClass().eIsSet(JavaRefPackage.eINSTANCE.getJavaClass_Events())) {
-			List events = getEventsList();
-			int len = events.size();
-			for (int i = 0; i < len; i++) {
-				BeanEvent e = (BeanEvent) events.get(i);
-				EventSetDecorator ed = Utilities.getEventSetDecorator(e);
-				if (ed == null || !ed.isMergeIntrospection())
-					continue; // Not an event for us to give an ID to.
-				setEventID(e.getName(), e);
-			}
-		}
-
-		// Do Operations.
-		if (getJavaClass().eIsSet(EcorePackage.eINSTANCE.getEClass_EOperations())) {
-			List ops = getOperationsList();
-			int len = ops.size();
-			for (int i = 0; i < len; i++) {
-				EOperation o = (EOperation) ops.get(i);
-				MethodDecorator md = Utilities.getMethodDecorator(o);
-				if (md == null || !md.isMergeIntrospection())
-					continue; // Not an event for us to give an ID to.
-				setMethodID(o.getName(), o);
-			}
-		}
-	}
-
-	private static final String ROOT_OVERRIDE = BeaninfoPlugin.ROOT+'.'+BeaninfoPlugin.OVERRIDE_EXTENSION;	 //$NON-NLS-1$
-	
-	protected void applyExtensionDocument(boolean rootOnly) {
-		try {
-			TimerTests.basicTest.startCumulativeStep(APPLY_EXTENSIONS);
-			boolean canUseCache = !rootOnly && canUseOverrideCache();
-			boolean alreadyRetrievedRoot = retrievedExtensionDocument == RETRIEVED_ROOT_ONLY;
-			retrievedExtensionDocument = rootOnly ? RETRIEVED_ROOT_ONLY : RETRIEVED_FULL_DOCUMENT;
-			JavaClass jc = getJavaClass();
-			Resource mergeIntoResource = jc.eResource();
-			ResourceSet rset = mergeIntoResource.getResourceSet();
-			String className = jc.getName();
-			if (canUseCache) {
-				// We can use the cache, see if we actually have one.
-				if (getClassEntry().overrideCacheExists()) {
-					// Get the cache and apply it before anything else.
-					Resource cacheRes = BeanInfoCacheController.INSTANCE.getCache(jc, getClassEntry(), false);
-					if (cacheRes != null) {
-						try {
-							new ExtensionDocApplies(null, rset, jc, null).run(cacheRes);
-						} catch (WrappedException e) {
-							BeaninfoPlugin.getPlugin().getLogger().log(
-									new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0,
-											"Error processing file\"" + cacheRes.getURI() + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-						} finally {
-							cacheRes.getResourceSet().getResources().remove(cacheRes); // We don't need it around once we do the merge. Normal merge would of gotton rid of it, but in case of error we do it here.
-						}
-					} else
-						canUseCache = false; // Need to rebuild the cache.
-				}
-			}
-			List overrideCache = null;
-			if (!alreadyRetrievedRoot && (rootOnly || jc.getSupertype() == null)) {
-				// It is a root class. Need to merge in root stuff.
-				if (!canUseCache) {
-					overrideCache = createOverrideCache(overrideCache, getAdapterFactory().getProject(), BeaninfoPlugin.ROOT, ROOT_OVERRIDE, rset, jc);
-				}
-				applyExtensionDocTo(rset, jc, ROOT_OVERRIDE, BeaninfoPlugin.ROOT, BeaninfoPlugin.ROOT);
-				if (rootOnly)
-					return;
-			}
-
-			String baseOverridefile = className + '.' + BeaninfoPlugin.OVERRIDE_EXTENSION; // getName() returns inner classes with "$" notation, which is good. //$NON-NLS-1$
-			String packageName = jc.getJavaPackage().getPackageName();
-			if (!canUseCache) {
-				overrideCache = createOverrideCache(overrideCache, getAdapterFactory().getProject(), packageName, baseOverridefile, rset, jc);
-			}
-			applyExtensionDocTo(rset, jc, baseOverridefile, packageName, className);
-			
-			if (!canUseCache) {
-				// We have an override cache to store. If the cache is null, this will flag that there is no override cache for the current configuration. That way we won't bother trying again until config changes.
-				BeanInfoCacheController.INSTANCE.newCache(jc, overrideCache, BeanInfoCacheController.OVERRIDES_CACHE);
-			}
-			
-		} finally {
-			TimerTests.basicTest.stopCumulativeStep(APPLY_EXTENSIONS);	
-		}
-	}
-	
-	/*
-	 * Build up the fixed overrides into the cache, and apply as we gather them.
-	 * Return the cache or null if the cache is empty at the end.
-	 */
-	private List createOverrideCache(List cache, IProject project, String packageName, String overrideFile, ResourceSet rset, JavaClass mergeIntoJavaClass) {
-		// Now get the overrides paths
-		String[] paths = BeaninfoPlugin.getPlugin().getOverridePaths(project, packageName);
-		if (paths.length == 0)
-			return cache;
-		
-		// Now apply the overrides.
-		if (cache == null)
-			cache = new ArrayList();
-		BeaninfoPlugin.IOverrideRunnable runnable = new ExtensionDocApplies(overrideFile, rset, mergeIntoJavaClass, cache);
-		for (int i = 0; i < paths.length; i++) {
-			runnable.run(paths[i]);
-		}
-		return !cache.isEmpty() ? cache : null;
-	}
-	
-	private static final URI ROOT_URI = URI.createGenericURI(BeaninfoPlugin.ROOT_SCHEMA, BeaninfoPlugin.ROOT_OPAQUE, null);
-	private static final String ROOT_FRAGMENT = "//@root"; //$NON-NLS-1$
-	private static final Pattern FRAGMENT_SPLITTER = Pattern.compile("/"); //$NON-NLS-1$
-	
-	// TODO This is to make event util optional. This should be removed entirely with 1.3 when event util goes away.
-	private static boolean RETRIEVED_EVENT_METHODS;
-	private static Object EVENT_FACTORY_INSTANCE;
-	private static java.lang.reflect.Method CREATE_EVENT_UTIL_METHOD;
-	private static java.lang.reflect.Method DO_FORWARD_EVENTS_METHOD;
-	
-	private static boolean isEventUtilLoaded() {
-		if (!RETRIEVED_EVENT_METHODS) {
-			try {
-				Class eventFactoryClass = Class.forName("com.ibm.etools.emf.event.EventFactory");
-				Field eventFactoryField = eventFactoryClass.getField("eINSTANCE");
-				Object eventFactoryInstance = eventFactoryField.get(null);
-				java.lang.reflect.Method createEventMethod = eventFactoryClass.getMethod("createEventUtil", new Class[] {Notifier.class, ResourceSet.class});
-				Class eventUtilClass = createEventMethod.getReturnType();
-				java.lang.reflect.Method doForwardEventsMethod = eventUtilClass.getMethod("doForwardEvents", new Class[] {List.class});
-				EVENT_FACTORY_INSTANCE = eventFactoryInstance;
-				CREATE_EVENT_UTIL_METHOD = createEventMethod;
-				DO_FORWARD_EVENTS_METHOD = doForwardEventsMethod;
-			} catch (ClassNotFoundException e) {
-			} catch (SecurityException e) {
-			} catch (NoSuchFieldException e) {
-			} catch (IllegalArgumentException e) {
-			} catch (IllegalAccessException e) {
-			} catch (NoSuchMethodException e) {
-			}
-			RETRIEVED_EVENT_METHODS = true;
-		} 
-		return EVENT_FACTORY_INSTANCE != null;
-		
-	}
-	private class ExtensionDocApplies implements BeaninfoPlugin.IOverrideRunnable {
-		
-		private final String overrideFile;
-		private final ResourceSet rset;
-		private final JavaClass mergeIntoJavaClass;
-		private final List overridesCache;
-
-		public ExtensionDocApplies(String overrideFile, ResourceSet rset, JavaClass mergeIntoJavaClass, List overridesCache) {
-			this.overrideFile = overrideFile;
-			this.rset = rset;
-			this.mergeIntoJavaClass = mergeIntoJavaClass;
-			this.overridesCache = overridesCache;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IOverrideRunnable#run(java.lang.String)
-		 */
-		public void run(String overridePath) {
-			Resource overrideRes = null;
-			URI uri = URI.createURI(overridePath+overrideFile);
-			try {
-				overrideRes = rset.getResource(uri, true);
-				run(overrideRes);
-			} catch (WrappedException e) {
-				// FileNotFoundException is ok
-				if (!(e.exception() instanceof FileNotFoundException)) {
-					if (e.exception() instanceof CoreException
-						&& ((CoreException) e.exception()).getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND) {
-						// This is ok. Means uri_mapping not set so couldn't find in Workspace, also ok.
-					} else if (e.exception() instanceof PackageNotFoundException && ((PackageNotFoundException) e.exception()).getMessage().indexOf("event.xmi") != -1) {
-						if (!RETRIEVED_EVENT_METHODS) {
-							BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "An old style override file using the com.ibm.event format was found, but com.ibm.event was not installed. The first such file is "+uri, null)); //$NON-NLS-1$
-							RETRIEVED_EVENT_METHODS = true;	// Mark we've retrieved. This is ok because if event is missing here, it will be missing for retrieve too.
-						}
-					} else {
-						BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-					}
-				}
-				// In case it happened after creating resource but during load. Need to get rid of it in the finally.	
-				overrideRes = rset.getResource(uri, false);				
-			} catch (Exception e) {
-				// Couldn't load it for some reason.
-				BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
-				overrideRes = rset.getResource(uri, false); // In case it happened after creating resource but during load so that we can get rid of it.
-			} finally {
-				if (overrideRes != null)
-					rset.getResources().remove(overrideRes); // We don't need it around once we do the merge. Normal merge would of gotton rid of it, but in case of error we do it here.
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IOverrideRunnable#run(org.eclipse.emf.ecore.resource.Resource)
-		 */
-		public void run(Resource overrideRes) {
-			try {
-				EList contents = overrideRes.getContents();
-				if (overridesCache != null) {
-					// TODO Until https://bugs.eclipse.org/bugs/show_bug.cgi?id=109169 is fixed, we need our own Copier.
-					EcoreUtil.Copier copier = new EcoreUtil.Copier() {
-
-						private static final long serialVersionUID = 1L;
-
-						protected void copyReference(EReference eReference, EObject eObject, EObject copyEObject) {
-							if (eObject.eIsSet(eReference)) {
-								if (eReference.isMany()) {
-									List source = (List) eObject.eGet(eReference);
-									InternalEList target = (InternalEList) copyEObject.eGet(getTarget(eReference));
-									if (source.isEmpty()) {
-										target.clear();
-									} else {
-										boolean isBidirectional = eReference.getEOpposite() != null;
-										int index = 0;
-										for (Iterator k = ((EcoreEList) source).basicIterator(); k.hasNext();) {
-											Object referencedEObject = k.next();
-											Object copyReferencedEObject = get(referencedEObject);
-											if (copyReferencedEObject == null) {
-												if (!isBidirectional) {
-													target.addUnique(index, referencedEObject);
-													++index;
-												}
-											} else {
-												if (isBidirectional) {
-													int position = target.indexOf(copyReferencedEObject);
-													if (position == -1) {
-														target.addUnique(index, copyReferencedEObject);
-													} else if (index != position) {
-														target.move(index, copyReferencedEObject);
-													}
-												} else {
-													target.addUnique(index, copyReferencedEObject);
-												}
-												++index;
-											}
-										}
-									}
-								} else {
-									Object referencedEObject = eObject.eGet(eReference, false);
-									if (referencedEObject == null) {
-										copyEObject.eSet(getTarget(eReference), null);
-									} else {
-										Object copyReferencedEObject = get(referencedEObject);
-										if (copyReferencedEObject == null) {
-											if (eReference.getEOpposite() == null) {
-												copyEObject.eSet(getTarget(eReference), referencedEObject);
-											}
-										} else {
-											copyEObject.eSet(getTarget(eReference), copyReferencedEObject);
-										}
-									}
-								}
-							}
-						}
-					};
-					
-					// We fixup the CD first so that when serialized it will be to the correct object already. Simplifies apply later.
-					Iterator itr = contents.iterator();
-					while (itr.hasNext()) {
-						Object o = itr.next();
-						if (o instanceof ChangeDescription) {
-							fixupCD((ChangeDescription) o);
-						}
-					}
-
-				    Collection result = copier.copyAll(contents);
-				    copier.copyReferences();
-					overridesCache.addAll(result);	// Make a copy for the override cache to be used next time needed.
-				}
-				
-				if (!contents.isEmpty()) {
-					// TODO It could be either the old event model or the new ChangeDescription. When we remove Event Model we need to remove
-					// the test. This could be the override cache too, so we must apply the contents in the order they are in the resource.
-					try {
-						List events = null;
-						Object[] eventsParm = null;
-						Iterator itr = contents.iterator();
-						while (itr.hasNext()) {
-							Object o = itr.next();
-							if (o instanceof ChangeDescription) {
-								ChangeDescription cd = (ChangeDescription) o;
-								fixupCD(cd);
-								cd.apply();
-							} else if (isEventUtilLoaded()) {
-								if (events == null) {
-									events = new ArrayList(1);
-									events.add(null); // EventUtil needs a list, but we will be calling one by one. So just reuse this list.
-									eventsParm = new Object[] { events};
-								}								
-								// It is the old format.
-								events.set(0, o);
-								try {
-									Object util = CREATE_EVENT_UTIL_METHOD.invoke(EVENT_FACTORY_INSTANCE, new Object[] {mergeIntoJavaClass, rset});
-									DO_FORWARD_EVENTS_METHOD.invoke(util, eventsParm);
-								} catch (IllegalArgumentException e) {
-								} catch (IllegalAccessException e) {
-								} catch (InvocationTargetException e) {
-									BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error processing file\"" + overrideRes.getURI() + "\"", e.getCause())); //$NON-NLS-1$ //$NON-NLS-2$
-								}
-							}
-						}
-					} finally {
-						uninstallRootResource();
-					}						
-				}
-			} catch (WrappedException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error processing file\"" + overrideRes.getURI() + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-			}
-		}
-		
-		/*
-		 * fix it up so that references to "X:ROOT#//@root" are replaced with reference to the javaclass.
-		 */
-		private void fixupCD(ChangeDescription cd) {
-			EStructuralFeature keyFeature = ChangePackage.eINSTANCE.getEObjectToChangesMapEntry_Key();
-			Iterator changes = cd.getObjectChanges().iterator();
-			while (changes.hasNext()) {
-				EObject entry = (EObject) changes.next();
-				EObject key = (EObject) entry.eGet(keyFeature, false);
-				if (key != null && key.eIsProxy()) {
-					// See if it is our special.
-					URI uri = ((InternalEObject) key).eProxyURI();
-					String rootFrag = uri.fragment();
-					if (BeaninfoPlugin.ROOT_SCHEMA.equals(uri.scheme()) && BeaninfoPlugin.ROOT_OPAQUE.equals(uri.opaquePart()) && (rootFrag != null && rootFrag.startsWith(ROOT_FRAGMENT))) {
-						// It is one of ours. Get the fragment, remove the leading //root and append to the end of the
-						// uri from the java class itself.
-						if (rootFrag.length() <= ROOT_FRAGMENT.length())
-							entry.eSet(keyFeature, mergeIntoJavaClass);	// No sub-path, so just the java class.
-						else {
-							// There is a sub-path below the java class that is needed. Need to walk down the path.
-							String[] path = FRAGMENT_SPLITTER.split(rootFrag.substring(ROOT_FRAGMENT.length()+1));
-							InternalEObject newKey = (InternalEObject) mergeIntoJavaClass;
-							for (int i = 0; newKey != null && i < path.length; i++) {
-								newKey = (InternalEObject) newKey.eObjectForURIFragmentSegment(path[i]);
-							}
-							if (newKey != null)
-								entry.eSet(keyFeature, newKey);
-						}
-					}
-				}
-			}
-		}
-		
-		/*
-		 * Uninstall the fake root resource. This must be called after installRootResource has been called. So must use try/finally. 
-		 * 
-		 * 
-		 * @since 1.2.0
-		 */
-		private void uninstallRootResource() {
-			Resource root = rset.getResource(ROOT_URI, false);
-			if (root != null)
-				rset.getResources().remove(root);
-		}
-	}
-	protected void applyExtensionDocTo(ResourceSet rset, JavaClass mergeIntoJavaClass, String overrideFile, String packageName, String className) {
-		BeaninfoPlugin.getPlugin().applyOverrides(getAdapterFactory().getProject(), packageName, className, mergeIntoJavaClass, rset, 
-			new ExtensionDocApplies(overrideFile, rset, mergeIntoJavaClass, null));
-	}
-
-	/**
-	 * Return the target as a JavaClass 
-	 */
-	protected JavaClassImpl getJavaClass() {
-		return (JavaClassImpl) getTarget();
-	}
-
-	/**
-	 * Answer the beaninfo constants record
-	 */
-	protected BeaninfoProxyConstants getProxyConstants() {
-		return BeaninfoProxyConstants.getConstants(getRegistry());
-	}
-
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEStructuralFeatures()
-	 */
-	public EList getEStructuralFeatures() {
-		introspectIfNecessary();
-		return getJavaClass().getEStructuralFeaturesInternal();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getAllProperties()
-	 */
-	public EList getAllProperties() {
-		return allProperties();
-	}	
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEOperations()
-	 */
-	public EList getEOperations() {
-		if (getClassEntry() != null && getClassEntry().isOperationsStored())
-			introspectIfNecessary();	// Already stored, just do if necessary.
-		else {
-			synchronized (this) {
-				needsIntrospection = true;	// Force reintrospection because we either aren't storing operations, or have never loaded.
-			}
-			introspectIfNecessary(true);	// But force the operations now.
-		}
-		return getJavaClass().getEOperationsInternal();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEAllOperations()
-	 */
-	public BasicEList getEAllOperations() {
-		return allOperations();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEvents()
-	 */
-	public EList getEvents() {
-		introspectIfNecessary();
-		return getJavaClass().getEventsGen();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getAllEvents()
-	 */
-	public EList getAllEvents() {
-		return allEvents();
-	}					
-
-	private void finalizeProperties(ChangeDescription cd) {
-		// Now go through the list and remove those that should be removed, and set the etype for those that don't have it set.
-		Map oldLocals = getPropertiesMap();
-		Iterator itr = getFeaturesList().iterator();
-		while (itr.hasNext()) {
-			EStructuralFeature a = (EStructuralFeature) itr.next();
-			PropertyDecorator p = Utilities.getPropertyDecorator(a);
-			Object aOld = oldLocals.get(a.getName());
-			if (aOld != null && aOld != Boolean.FALSE) {
-				// A candidate for removal. It was in the old list and it was not processed.
-				if (p != null) {
-					ImplicitItem implicit = p.getImplicitDecoratorFlag();
-					if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-						p.setEModelElement(null); // Remove from the feature;
-						((InternalEObject) p).eSetProxyURI(BAD_URI);
-						// Mark it as bad proxy so we know it is no longer any use.
-						p = null;
-						if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							itr.remove(); // Remove it, this was implicitly created and not processed this time.
-							((InternalEObject) a).eSetProxyURI(BAD_URI);	// Mark it as bad proxy so we know it is no longer any use.
-							continue;
-						}
-						// Need to go on because we need to check the eType to make sure it is set. At this point we have no decorator but we still have a feature.
-					}
-				}
-			}
-			
-			// [79083] Also check for eType not set, and if it is, set it to EObject type. That way it will be valid, but not valid as 
-			// a bean setting.
-			if (a.getEType() == null) {
-				// Set it to EObject type. If it becomes valid later (through the class being changed), then the introspect/reflect
-				// will set it to the correct type.
-				a.setEType(EcorePackage.eINSTANCE.getEObject());
-				Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-				if (logger.isLoggingLevel(Level.WARNING))
-					logger.logWarning("Feature \""+getJavaClass().getQualifiedName()+"->"+a.getName()+"\" did not have a type set. Typically due to override file creating feature but property not found on introspection/reflection."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-			
-			if (p != null && cd != null) {
-				// Now create the appropriate cache entry for this property.
-				BeanInfoDecoratorUtility.buildChange(cd, p);
-			}
-		}
-	}
-
-	/**
-	 * merge all  the Properties (i.e. supertypes) (properties)
-	 */
-	protected EList allProperties() {
-		
-		EList jcAllProperties = getJavaClass().getAllPropertiesGen();
-		BeaninfoSuperAdapter superAdapter =
-			(BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
-		if (jcAllProperties != null) {
-			// See if new one required.
-			if (superAdapter == null || !superAdapter.isAllPropertiesCollectionModified())
-				return jcAllProperties;
-			// Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.       		
-		}
-		
-		UniqueEList.FastCompare allProperties = new UniqueEList.FastCompare() {
-			/**
-			 * Comment for <code>serialVersionUID</code>
-			 * 
-			 * @since 1.1.0
-			 */
-			private static final long serialVersionUID = 1L;
-
-			protected Object[] newData(int capacity) {
-				return new EStructuralFeature[capacity];
-			}
-		};
-		boolean doAllProperties = false;
-		synchronized(this) {
-			// If we are introspecting, don't do all properties because it is an invalid list. Just return empty without reseting the all modified flag.
-			doAllProperties = !isDoingAllProperties && !isIntrospecting && isResourceConnected();
-			if (doAllProperties)
-				isDoingAllProperties = true;
-		}
-		if (doAllProperties) {
-			try {
-				EList localProperties = getJavaClass().getProperties();
-				// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-				// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-				// the truth is most people want these. So we will add them in. But since there could be more than one it
-				// gets confusing. We need to look for dups from the super types and still keep order.
-				//
-				// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-				List superTypes = getJavaClass().getESuperTypes();
-				if (!superTypes.isEmpty()) {
-					// Now we need to merge in the supers.
-					BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-					// If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
-					// we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
-					// because IB would contribute IC's too).
-					Collection workingAllProperties = superTypes.size() == 1 ? (Collection) allProperties : new LinkedHashSet(); 
-					// We will now merge as directed.
-					boolean mergeAll = bd == null || bd.isMergeSuperProperties();
-					if (!mergeAll) {
-						// we don't to want to merge super properties, but we still need super non-properties or explict ones.
-						int lenST = superTypes.size();
-						for (int i=0; i<lenST; i++) {
-							List supers = ((JavaClass) superTypes.get(i)).getAllProperties();
-							int len = supers.size();
-							for (int i1 = 0; i1 < len; i1++) {
-								EStructuralFeature p = (EStructuralFeature) supers.get(i1);
-								PropertyDecorator pd = Utilities.getPropertyDecorator(p);
-								if ( pd == null || (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !pd.isMergeIntrospection()))
-									workingAllProperties.add(p);
-							}
-						}
-					} else {
-						// We want to merge all.					
-						// BeanInfo could of given us the not merge list. If the list is empty, then we accept all.
-						if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames())) {
-							// We were given a list of names.
-							// Get the names into a set to create a quick lookup.
-							HashSet superSet = new HashSet(bd.getNotInheritedPropertyNames());
-							
-							// Now walk and add in non-bean properties (and bean properties that were explicitly added and not mergeable (i.e. didn't come thru beaninfo)) 
-							// and add those not specifically called out by BeanInfo in the not inherited list.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								List supers = ((JavaClass) superTypes.get(i)).getAllProperties();
-								int len = supers.size();
-								for (int i1 = 0; i1 < len; i1++) {
-									EStructuralFeature p = (EStructuralFeature) supers.get(i1);
-									PropertyDecorator pd = Utilities.getPropertyDecorator(p);
-									if (pd == null || (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !pd.isMergeIntrospection()) || !superSet.contains(pd.getName()))
-										workingAllProperties.add(p);
-								}
-							}
-						} else {
-							// BeanInfo (or reflection always does this) called out that all super properties are good
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								workingAllProperties.addAll(((JavaClass) superTypes.get(i)).getAllProperties());
-							}
-						}
-					}
-					if (workingAllProperties != allProperties)
-						allProperties.addAll(workingAllProperties);	// Now copy over the ordered super properties.
-				}
-				allProperties.addAll(localProperties);				
-				superAdapter.setAllPropertiesCollectionModified(false); // Now built, so reset to not changed.
-			} finally {
-				synchronized(this) {
-					isDoingAllProperties = false;
-				}
-			}
-		}
-
-		if (!allProperties.isEmpty()) {
-			allProperties.shrink();
-			return new EcoreEList.UnmodifiableEList.FastCompare(
-				getJavaClass(),
-				null,
-				allProperties.size(),
-				allProperties.data());
-		} else
-			return ECollections.EMPTY_ELIST;
-	}
-
-	/*
-	 * Fill in the property using the prop record. If this one that should have merging done, then
-	 * return the PropertyDecorator so that it can have the PropertyRecord merged into it. Else
-	 * return null if no merging.
-	 */
-	protected PropertyDecorator calculateProperty(PropertyRecord pr, boolean indexed) {
-		// If this is an indexed property, then a few fields will not be set in here, but
-		// will instead be set by the calculateIndexedProperty, which will be called.
-		JavaHelpers type = pr.propertyTypeName != null ? Utilities.getJavaType(MapJNITypes.getFormalTypeName(pr.propertyTypeName), getJavaClass().eResource().getResourceSet()) : null;
-
-		if (indexed) {
-			// If no array write method found, then see if there is an indexed write method. If there is, then it is changable.
-			if (type == null) {
-				// If no array type from above, create one from the indexed type proxy. Add '[]' to turn it into an array.
-				type = Utilities.getJavaType(MapJNITypes.getFormalTypeName(((IndexedPropertyRecord) pr).indexedPropertyTypeName)+"[]", getJavaClass().eResource().getResourceSet()); //$NON-NLS-1$
-			}
-		}
-
-		if (type != null)
-			return createProperty(pr.name, indexed, type); // A valid property descriptor.
-		else
-			return null;
-	}
-
-	/**
-	 * Fill in the property and its decorator using the passed in information.
-	 */
-	protected PropertyDecorator createProperty(String name, boolean indexed, EClassifier type) {
-		// First find if there is already a property of this name, and if there is, is the PropertyDecorator
-		// marked to not allow merging in of introspection results.		
-		HashMap existingLocals = getPropertiesMap();
-		EStructuralFeature prop = null;
-		PropertyDecorator pd = null;
-		Object p = existingLocals.get(name);
-		if (Boolean.FALSE == p)
-			return null; // We've already processed this name, can't process it again.
-		if (p != null) {
-			// We've found one of the same name. Whether we modify it or use it as is, we put in a
-			// special dummy in its place. That marks that we've already processed it and accepted it.
-			existingLocals.put(name, Boolean.FALSE);
-
-			// If the decorator for this entry says not to merge then return.
-			// If there is no PropertyDecorator, then we will merge. If they
-			// didn't want to merge then should of created of property decorator and said no merge.
-			pd = Utilities.getPropertyDecorator((EStructuralFeature) p);
-			if (pd != null && !pd.isMergeIntrospection())
-				return null;
-			prop = (EStructuralFeature) p;
-		}
-
-		// Need to test if this is an implicit decorator and it is not of the 
-		// same type (i.e. is indexed now but wasn't or visa-versa, then we need
-		// to get rid of the decorator and recreate it. If it is not implicit, then
-		// we have to use it as is because the user specified, so it won't become
-		// an indexed if the user did not created it as an index, and visa-versa.
-		// Also if it is implicit, then we need to unset certain features that may of
-		// been set by a previous reflection which has now become introspected.
-		// When reflected we set the actual fields instead of the letting proxy determine them.
-		if (pd != null) {
-			if (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL) {
-				// We can't change the type for explicit.
-				indexed = pd instanceof IndexedPropertyDecorator;
-			} else {
-				if ((indexed && !(pd instanceof IndexedPropertyDecorator)) || (!indexed && pd instanceof IndexedPropertyDecorator)) {
-					// It is implicit and of a different type, so just get rid of it and let it be recreated correctly.
-					prop.getEAnnotations().remove(pd);
-					pd = null;
-				}
-			}
-			if (pd != null)
-				if (indexed)
-					BeanInfoDecoratorUtility.clear((IndexedPropertyDecorator) pd);
-				else
-					BeanInfoDecoratorUtility.clear(pd);
-		}
-
-		ImplicitItem implicit = pd == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : pd.getImplicitDecoratorFlag();
-		if (prop == null) {
-			// We will create a new property.
-			// We can't have an implicit feature, but an explicit decorator.
-			getFeaturesList().add(prop = EcoreFactory.eINSTANCE.createEReference());
-			implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL;
-		}
-
-		setPropertyID(name, prop);
-		prop.setName(name);
-		prop.setTransient(false);
-		prop.setVolatile(false);
-
-		// Containment and Unsettable is tricky for EReferences. There is no way to know whether it has been explicitly set to false, or it defaulted to
-		// false because ECore has not made containment/unsettable an unsettable feature. So we need to instead use the algorithm of if we here 
-		// created the feature, then we will by default set it to containment/unsettable. If it was created through diff merge, then
-		// we will leave it alone. It is the responsibility of the merge file writer to set containment/unsettable correctly.
-		if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-			prop.setUnsettable(true);
-		}
-		prop.setEType(type);
-		if (!indexed) {
-			prop.setLowerBound(0);
-			prop.setUpperBound(1);
-		} else {
-			prop.setLowerBound(0);
-			prop.setUpperBound(-1);
-			prop.setUnique(true);
-		}
-
-		// Now create/fill in the property descriptor for it.
-		// If there already is one then we
-		// will use it. This allows merging with beanfinfo.		
-		if (pd == null) {
-			pd =
-				(!indexed)
-					? BeaninfoFactory.eINSTANCE.createPropertyDecorator()
-					: BeaninfoFactory.eINSTANCE.createIndexedPropertyDecorator();
-			pd.setImplicitDecoratorFlag(implicit);
-			prop.getEAnnotations().add(pd);
-		}
-		return pd;
-	}
-
-	/**
-	 * @param name
-	 * @param prop
-	 * 
-	 * @since 1.1.0
-	 */
-	private void setPropertyID(String name, EStructuralFeature prop) {
-		// Now fill it in. Normal id for an attribute is "classname.attributename" but we can't use that
-		// for us because that format is used by Java Core for a field and there would be confusion.
-		// So we will use '/' instead.
-		((XMIResource) prop.eResource()).setID(prop, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.FEATURE + name);
-	}
-
-	/*
-	 * Reflect the properties. This requires going through local methods and matching them up to
-	 * see if they are properties.
-	 */
-	private void reflectProperties() {
-		// If we are set to mergeSuperTypeProperties, then we need to get the super properties.
-		// This is so that duplicate any from super that we find here. When reflecting we don't
-		// allow discovered duplicates unless they are different types.
-		//
-		// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-		// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-		// the truth is most people want these. So we will add them in. But since there could be more than one it
-		// gets confusing. We need to look for dups from the super types.
-		//
-		// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-		TimerTests.basicTest.startCumulativeStep(REFLECT_PROPERTIES);		
-		Set supers = new HashSet(50);
-		BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-		if (bd == null || bd.isMergeSuperProperties()) {
-			List superTypes = getJavaClass().getESuperTypes();
-			if (!superTypes.isEmpty()) {
-				int lenST = superTypes.size();
-				for (int i=0; i<lenST; i++) {
-					List superAll = ((JavaClass) superTypes.get(i)).getAllProperties();
-					int len = superAll.size();
-					for (int i1=0; i1<len; i1++) {
-						EStructuralFeature sf = (EStructuralFeature) superAll.get(i1);
-						supers.add(sf.getName());
-					}
-				}
-			}
-		}
-
-		// If any of the classes in the hierarchy are bound, then all reflected properties are considered bound.
-		boolean isBound = isDefaultBound();
-		if (!isBound) {
-			List superTypes = getJavaClass().getEAllSuperTypes();
-			// Start from end because that will be first class above the this one.
-			for (int i=superTypes.size()-1; !isBound && i>=0; i--) {
-				JavaClass spr = (JavaClass) superTypes.get(i);
-				BeaninfoClassAdapter bi = (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter(spr, IIntrospectionAdapter.ADAPTER_KEY);
-				// They should all be reflected, but be on safe side, check if null.
-				if (bi != null)
-					isBound = bi.isDefaultBound();
-			}
-		}
-
-		HashMap props = new HashMap();
-
-		Iterator itr = getJavaClass().getPublicMethods().iterator();
-		while (itr.hasNext()) {
-			Method mthd = (Method) itr.next();
-			if (mthd.isStatic() || mthd.isConstructor())
-				continue; // Statics/constructors don't participate as properties
-			if (mthd.getName().startsWith("get")) { //$NON-NLS-1$
-				String name = java.beans.Introspector.decapitalize(mthd.getName().substring(3));
-				if (name.length() == 0 || supers.contains(name))
-					continue;	// Had get(...) and not getXXX(...) so not a getter. Or this is the same name as a super, either way ignore it.
-				PropertyInfo propInfo = (PropertyInfo) props.get(name);
-				if (propInfo == null) {
-					propInfo = new PropertyInfo();
-					if (propInfo.setGetter(mthd, false))
-						props.put(name, propInfo);
-				} else
-					propInfo.setGetter(mthd, false);
-			} else if (mthd.getName().startsWith("is")) { //$NON-NLS-1$
-				String name = java.beans.Introspector.decapitalize(mthd.getName().substring(2));
-				if (name.length() == 0 || supers.contains(name))
-					continue;	// Had is(...) and not isXXX(...) so not a getter. Or this is the same name as a super, either way ignore it.
-				PropertyInfo propInfo = (PropertyInfo) props.get(name);
-				if (propInfo == null) {
-					propInfo = new PropertyInfo();
-					if (propInfo.setGetter(mthd, true))
-						props.put(name, propInfo);
-				} else
-					propInfo.setGetter(mthd, true);
-			} else if (mthd.getName().startsWith("set")) { //$NON-NLS-1$
-				String name = java.beans.Introspector.decapitalize(mthd.getName().substring(3));
-				if (name.length() == 0 || supers.contains(name))
-					continue;	// Had set(...) and not setXXX(...) so not a setter. Or this is the same name as a super, either way ignore it.				
-				PropertyInfo propInfo = (PropertyInfo) props.get(name);
-				if (propInfo == null) {
-					propInfo = new PropertyInfo();
-					if (propInfo.setSetter(mthd))
-						props.put(name, propInfo);
-				} else
-					propInfo.setSetter(mthd);
-			}
-		}
-
-		// Now go through the hash map and create the properties.
-		itr = props.entrySet().iterator();
-		while (itr.hasNext()) {
-			Map.Entry entry = (Map.Entry) itr.next();
-			((PropertyInfo) entry.getValue()).createProperty((String) entry.getKey(), isBound);
-		}
-		TimerTests.basicTest.stopCumulativeStep(REFLECT_PROPERTIES);		
-	}
-
-	private class PropertyInfo {
-		
-		public EClassifier type, indexedType;
-		public boolean constrained;
-		public Method getter, setter, indexedGetter, indexedSetter;
-
-		public boolean setGetter(Method get, boolean mustBeBoolean) {
-			List parms = get.getParameters();
-			if (parms.size() > 1)
-				return false; // Invalid - improper number of parms.
-			boolean indexed = parms.size() == 1;
-			if (indexed && !((JavaParameter) parms.get(0)).getEType().getName().equals("int")) //$NON-NLS-1$
-				return false; // Invalid - a parm that is not an int is invalid for indexed.
-			EClassifier retType = get.getReturnType();
-			if (retType == null || retType.getName().equals("void")) //$NON-NLS-1$
-				return false; // Invalid - must have a return type
-			if (mustBeBoolean && !retType.getName().equals("boolean")) //$NON-NLS-1$
-				return false; // Invalid - it must be a boolean.
-			if (indexed) {
-				if (indexedType != null) {
-					if (indexedType != retType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (type != null && !(((JavaHelpers) type).isArray() && ((ArrayType) type).getComponentType() == retType))
-					return false; // Invalid - indexed type doesn't match component type of base type.
-			} else {
-				if (type != null) {
-					if (type != retType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (indexedType != null && !(((JavaHelpers) retType).isArray() && ((ArrayType) retType).getComponentType() == indexedType))
-					if (type == null) {
-						// We had a potential indexed and had not yet found the regular type. We've now found
-						// the regular type, and it is not indexed. So it takes priority and will wipe out
-						// the indexed type.
-						indexedGetter = null;
-						indexedSetter = null;
-						indexedType = null;
-					} else
-						return false; // Invalid - indexed type doesn't match component type of base type we already have
-			}
-
-			if (indexed) {
-				if (indexedGetter != null)
-					return false; // Already have an indexed getter.
-				indexedGetter = get;
-				indexedType = retType;
-			} else {
-				if (getter != null)
-					return false; // Already have a getter
-				getter = get;
-				type = retType;
-			}
-			return true;
-		}
-
-		public boolean setSetter(Method set) {
-			List parms = set.getParameters();
-			if (parms.size() > 2 || parms.size() < 1)
-				return false; // Invalid - improper number of parms.
-			boolean indexed = parms.size() == 2;
-			if (indexed && !((JavaParameter) parms.get(0)).getEType().getName().equals("int")) //$NON-NLS-1$
-				return false; // Invalid - a parm that is not an int is invalid for indexed.
-			EClassifier retType = set.getReturnType();
-			if (retType != null && !retType.getName().equals("void")) //$NON-NLS-1$
-				return false; // Invalid - must not have a return type
-			EClassifier propType = null;
-			if (indexed) {
-				propType = ((JavaParameter) parms.get(1)).getEType();
-				if (indexedType != null) {
-					if (indexedType != propType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (type != null && !(((JavaHelpers) type).isArray() && ((ArrayType) type).getComponentType() == propType))
-					return false; // Invalid - indexed type doesn't match component type of base type, or base type not an array
-			} else {
-				propType = ((JavaParameter) parms.get(0)).getEType();
-				if (type != null) {
-					if (type != propType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (indexedType != null
-					&& !(((JavaHelpers) propType).isArray() && ((ArrayType) propType).getComponentType() == indexedType))
-					if (type == null) {
-						// We had a potential indexed and had not yet found the regular type. We've now found
-						// the regular type, and it is not indexed of the correct type. So it takes priority and will wipe out
-						// the indexed type.
-						indexedGetter = null;
-						indexedSetter = null;
-						indexedType = null;
-					} else
-						return false; // Invalid - indexed type doesn't match component type of base type from this setter.
-			}
-
-			if (indexed) {
-				if (indexedSetter != null)
-					return false; // Already have an indexed getter.
-				indexedSetter = set;
-				indexedType = propType;
-			} else {
-				if (setter != null)
-					return false; // Already have a getter
-				setter = set;
-				type = propType;
-			}
-
-			if (set.getJavaExceptions().contains(Utilities.getJavaClass("java.beans.PropertyVetoException", getJavaClass().eResource().getResourceSet()))) //$NON-NLS-1$
-				constrained = true;
-			return true;
-		}
-
-		public void createProperty(String name, boolean isBound) {
-			boolean indexed = indexedType != null;
-			if (indexed && type == null)
-				return; // A potential indexed, but never found the getter/setter of the regular type.
-
-			PropertyDecorator prop =
-				BeaninfoClassAdapter.this.createProperty(
-					name,
-					indexed,
-					type);
-			if (prop == null)
-				return; // Reflection not wanted.
-
-			indexed = prop instanceof IndexedPropertyDecorator; // It could of been forced back to not indexed if explicitly set.
-
-			// At this point in time all implicit settings have been cleared. This is done back in createProperty() method above.
-			// So now apply reflected settings on the property decorator. 
-			BeanInfoDecoratorUtility.setProperties(prop, isBound, constrained, getter, setter);
-			if (indexed)
-				BeanInfoDecoratorUtility.setProperties((IndexedPropertyDecorator) prop, indexedGetter, indexedSetter);
-
-		}
-	};
-
-	/*
-	 * Should only be called from introspect so that flags are correct.
-	 */
-	private void finalizeOperations(ChangeDescription cd) {
-		// Now go through the list and remove those that should be removed.
-		Iterator itr = getOperationsList().iterator();
-		while (itr.hasNext()) {
-			EOperation a = (EOperation) itr.next();
-			MethodDecorator m = Utilities.getMethodDecorator(a);
-			if (!newoperations.contains(a)) {
-				// A candidate for removal. It is in the list but we didn't add it. Check to see if it one we had created in the past.
-				// If no methoddecorator, then keep it, not one ours.
-				if (m != null) {
-					ImplicitItem implicit = m.getImplicitDecoratorFlag();
-					if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-						m.setEModelElement(null); // Remove it because it was implicit.
-						 ((InternalEObject) m).eSetProxyURI(BAD_URI);
-						if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							itr.remove(); // The operation was implicit too.
-							 ((InternalEObject) a).eSetProxyURI(BAD_URI);
-						}
-						continue;	// At this point we no longer have a method decorator, so go to next.
-					}
-				}
-			}
-			
-			if (m != null && cd != null) {
-				// Now create the appropriate cache entry for this method.
-				BeanInfoDecoratorUtility.buildChange(cd, m);
-			}
-		}
-	}
-
-	/**
-	 * Fill in the behavior and its decorator using the mthdDesc.
-	 */
-	protected MethodDecorator calculateOperation(MethodRecord record) {
-		return createOperation(record.name, formLongName(record), null, record);
-	}
-
-	/**
-	 * Fill in the behavior and its decorator using the passed in information.
-	 */
-	protected MethodDecorator createOperation(String name, String longName, Method method, MethodRecord record) {
-		// First find if there is already a behavior of this name and method signature , and if there is, is the MethodDecorator
-		// marked to not allow merging in of introspection results.
-		HashMap existingLocals = getOperationsMap();
-		EOperation oper = null;
-		MethodDecorator md = null;
-		Object b = null;
-		if (name != null)
-			b = existingLocals.get(longName);
-		else
-			b = existingLocals.get(longName);
-			
-		if (b != null) {
-			// If the decorator for this entry says not to merge then return.
-			// If there is no decorator, then we will merge. If they didn't want to
-			// merge, then they should of created a decorator with no merge on it.
-			md = Utilities.getMethodDecorator((EOperation) b);
-			if (md != null && !md.isMergeIntrospection())
-				return null;
-			oper = (EOperation) b;
-		}
-
-		// Need to find the method and method id.
-		if (method == null) {
-			// No method sent, create a proxy to it from the record.
-			method = BeanInfoDecoratorUtility.createJavaMethodProxy(record.methodForDescriptor);
-		}
-
-		ImplicitItem implicit = md == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : ImplicitItem.NOT_IMPLICIT_LITERAL;
-		if (oper == null) {
-			// We will create a new MethodProxy.
-			oper = BeaninfoFactory.eINSTANCE.createMethodProxy();
-			getOperationsList().add(oper);
-			implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL; 
-		}		
-		if (name == null)
-			name = method.getName();		
-
-		// Now fill it in.
-		if (oper instanceof MethodProxy)
-			 ((MethodProxy) oper).setMethod(method);
-		setMethodID(name, oper);
-		oper.setName(name);
-		newoperations.add(oper);
-
-		// Now create/fill in the method decorator for it.
-		// If there already is one then we
-		// will use it. This allows merging with beaninfo.		
-		if (md == null) {
-			md = BeaninfoFactory.eINSTANCE.createMethodDecorator();
-			md.setImplicitDecoratorFlag(implicit);
-			oper.getEAnnotations().add(md);
-		} else
-			BeanInfoDecoratorUtility.clear(md);
-		return md;
-	}
-
-	/**
-	 * @param name
-	 * @param oper
-	 * 
-	 * @since 1.1.0
-	 */
-	private void setMethodID(String name, EOperation oper) {
-		((XMIResource) oper.eResource()).setID(oper, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.BEHAVIOR + name);
-	}
-
-	private void reflectOperations() {
-		// If we are set to mergeSuperTypeBehaviors, then we need to get the super behaviors.
-		// This is so that duplicate any from super that we find here. When reflecting we don't
-		// allow discovered duplicates unless they are different signatures. So all super operations
-		// will be allowed and we will not override them.
-		//
-		// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-		// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-		// the truth is most people want these. So we will add them in. But since there could be more than one it
-		// gets confusing. We need to look for dups from the super types.
-		//
-		// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-		Set supers = new HashSet(50);
-		BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-		if (bd == null || bd.isMergeSuperMethods()) {
-			List superTypes = getJavaClass().getESuperTypes();
-			if (!superTypes.isEmpty()) {
-				int lenST = superTypes.size();
-				for (int i=0; i<lenST; i++) {
-					List superAll = ((JavaClass) superTypes.get(i)).getEAllOperations();
-					int len = superAll.size();
-					for (int i1=0; i1<len; i1++) {
-						EOperation op = (EOperation) superAll.get(i1);
-						supers.add(formLongName(op));
-					}
-				}
-			}
-		}
-
-		Iterator itr = getJavaClass().getPublicMethods().iterator();
-		while (itr.hasNext()) {
-			Method mthd = (Method) itr.next();
-			if (mthd.isStatic() || mthd.isConstructor())
-				continue; // Statics/constructors don't participate as behaviors	
-			String longName = formLongName(mthd);
-			// Add if super not already contain it.
-			if (!supers.contains(longName))
-				createOperation(null, longName, mthd, null);	// Don't pass a name, try to create it by name, only use ID if there is more than one of the same name.
-		}
-	}
-
-	/*
-	 * merge all  the Behaviors(i.e. supertypes)
-	 */
-	protected BasicEList allOperations() {
-		BasicEList jcAllOperations = (BasicEList) getJavaClass().primGetEAllOperations();
-		BeaninfoSuperAdapter superAdapter =
-			(BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
-		if (jcAllOperations != null) {
-			// See if new one required.
-			if (superAdapter == null || !superAdapter.isAllOperationsCollectionModified())
-				return jcAllOperations;
-			// Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.       		
-		}
-
-		UniqueEList.FastCompare allOperations = new UniqueEList.FastCompare() {
-			/**
-			 * Comment for <code>serialVersionUID</code>
-			 * 
-			 * @since 1.1.0
-			 */
-			private static final long serialVersionUID = 1L;
-
-			protected Object[] newData(int capacity) {
-				return new EOperation[capacity];
-			}
-		};
-		boolean doAllOperations = false;
-		synchronized(this) {
-			// If we are introspecting, don't do all operatoins because it is an invalid list. Just return empty without reseting the all modified flag.
-			doAllOperations = !isDoingAllOperations && !isIntrospecting && isResourceConnected();
-			if (doAllOperations)
-				isDoingAllOperations = true;
-		}
-
-		if (doAllOperations) {
-			try {
-				EList localOperations = getJavaClass().getEOperations();
-				// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-				// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-				// the truth is most people want these. So we will add them in. But since there could be more than one it
-				// gets confusing. We need to look for dups from the super types and still keep order.
-				//
-				// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-				List superTypes = getJavaClass().getESuperTypes();
-				if (!superTypes.isEmpty()) {
-					// Now we need to merge in the supers.
-					BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-					// If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
-					// we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
-					// because IB would contribute IC's too).
-					Collection workingAllOperations = superTypes.size() == 1 ? (Collection) allOperations : new LinkedHashSet(); 
-					// We will now merge as directed.
-					boolean mergeAll = bd == null || bd.isMergeSuperMethods();
-					if (!mergeAll) {
-						// we don't to want to merge super operations, but we still need super non-operations.
-						int lenST = superTypes.size();
-						for (int i=0; i<lenST; i++) {
-							List supers = ((JavaClass) superTypes.get(i)).getEAllOperations();
-							int len = supers.size();
-							for (int i1 = 0; i1 < len; i1++) {
-								EOperation o = (EOperation) supers.get(i1);
-								MethodDecorator md = Utilities.getMethodDecorator(o);
-								if (md == null || (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !md.isMergeIntrospection()))
-									workingAllOperations.add(o);
-							}
-						}
-					} else {
-						// We want to merge all.
-						// BeanInfo could of given us the don't merge list. If the list is empty, then we accept all.
-						if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames())) {
-							// We were given a list of names.
-							// Get the names into a set to create a quick lookup.
-							HashSet superSet = new HashSet(bd.getNotInheritedMethodNames());
-							
-							// Now walk and add in non-bean operations (and bean operations that were explicitly added and not mergeable (i.e. didn't come thru beaninfo)) 
-							// and add those not specifically called out by BeanInfo not merge list.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								List supers = ((JavaClass) superTypes.get(i)).getEAllOperations();
-								int len = supers.size();
-								for (int i1 = 0; i1 < len; i1++) {
-									EOperation o = (EOperation) supers.get(i1);
-									MethodDecorator md = Utilities.getMethodDecorator(o);
-									if (md == null || (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !md.isMergeIntrospection()))
-										workingAllOperations.add(o);
-									else {
-										String longName = formLongName(o);
-										if (longName == null || !superSet.contains(longName))
-											workingAllOperations.add(o);
-									}
-								}
-							}
-						} else {
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								workingAllOperations.addAll(((JavaClass) superTypes.get(i)).getEAllOperations());
-							}
-						}
-					}
-					if (workingAllOperations != allOperations)
-						allOperations.addAll(workingAllOperations);	// Now copy over the ordered super operations.					
-				}
-				allOperations.addAll(localOperations);				
-				ESuperAdapter sa = getJavaClass().getESuperAdapter();
-				sa.setAllOperationsCollectionModified(false); // Now built, so reset to not changed.
-			} finally {
-				synchronized(this) {
-					isDoingAllOperations = false;
-				}
-			}
-		}
-
-		allOperations.shrink();
-		return new EcoreEList.UnmodifiableEList.FastCompare(
-			getJavaClass(),
-			EcorePackage.eINSTANCE.getEClass_EAllOperations(),
-			allOperations.size(),
-			allOperations.data());
-
-	}
-
-	/*
-	 * Should only be called from introspect so that flags are correct.
-	 */
-	private void finalizeEvents(ChangeDescription cd) {
-		// Now go through the list and remove those that should be removed.
-		Map oldLocals = getEventsMap();
-		Iterator itr = getEventsList().iterator();
-		while (itr.hasNext()) {
-			JavaEvent a = (JavaEvent) itr.next();
-			EventSetDecorator e = Utilities.getEventSetDecorator(a);
-			Object aOld = oldLocals.get(a.getName());
-			if (aOld != null && aOld != Boolean.FALSE) {
-				// A candidate for removal. It was in the old list and it was not processed.
-				if (e != null) {
-					ImplicitItem implicit = e.getImplicitDecoratorFlag();
-					if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-						e.setEModelElement(null); // Remove it because it was implicit.
-						((InternalEObject) e).eSetProxyURI(BAD_URI);
-						if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							itr.remove(); // The feature was implicit too.
-							((InternalEObject) a).eSetProxyURI(BAD_URI);
-						}
-						continue;	// At this point we don't have a decorator any more, so don't bother going on.
-					}
-				}
-			}
-			
-			if (e != null && cd != null) {
-				// Now create the appropriate cache entry for this event.
-				BeanInfoDecoratorUtility.buildChange(cd, e);
-			}
-		}
-	}
-
-	/**
-	 * Fill in the event and its decorator using the eventDesc.
-	 */
-	protected EventSetDecorator calculateEvent(EventSetRecord record) {
-		return createEvent(record.name);
-	}
-
-	/**
-	 * Fill in the event and its decorator using the passed in information.
-	 */
-	protected EventSetDecorator createEvent(String name) {
-		// First find if there is already an event of this name, and if there is, is the EventSetDecorator
-		// marked to not allow merging in of introspection results.
-		HashMap existingLocals = getEventsMap();
-		JavaEvent event = null;
-		EventSetDecorator ed = null;
-		Object b = existingLocals.get(name);
-		if (Boolean.FALSE == b)
-			return null; // We've already processed this event, can't process it again.			
-		if (b != null) {
-			// We've found one of the same event. Whether we modify it or use it as is, we put in a
-			// special dummy in its place. That marks that we've already processed it and accepted it.
-			existingLocals.put(name, Boolean.FALSE);
-
-			// If the decorator for this entry says not to merge then return.
-			// If there is no decorator, then we will merge. If they didn't want to
-			// merge, then they should of created a decorator with no merge on it.
-			ed = Utilities.getEventSetDecorator((JavaEvent) b);
-			if (ed != null && !ed.isMergeIntrospection())
-				return null;
-			event = (JavaEvent) b;
-		}
-		
-		ImplicitItem implicit = ed == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : ImplicitItem.NOT_IMPLICIT_LITERAL;
-		if (event == null) {
-			// We will create a new Event.
-			event = BeaninfoFactory.eINSTANCE.createBeanEvent();
-			getEventsList().add(event);
-			implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL; // Can't have an implicit feature but explicit decorator.
-		}
-
-		setEventID(name, event);
-		event.setName(name);
-
-		// Now create in the event decorator for it.
-		// If there already is one then we
-		// will use it. This allows merging with beaninfo.		
-		if (ed == null) {
-			ed = BeaninfoFactory.eINSTANCE.createEventSetDecorator();
-			ed.setImplicitDecoratorFlag(implicit);
-			event.getEAnnotations().add(ed);
-		} else
-			BeanInfoDecoratorUtility.clear(ed);
-		return ed;
-	}
-
-	/**
-	 * @param name
-	 * @param event
-	 * 
-	 * @since 1.1.0
-	 */
-	private void setEventID(String name, JavaEvent event) {
-		// Now fill it in.
-		((XMIResource) event.eResource()).setID(event, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.EVENT + name);
-	}
-
-	/**
-	 * Reflect the events. This requires going through local public methods and creating an 
-	 * event for the discovered events.
-	 */
-	protected void reflectEvents() {
-		// If we are set to mergeSuperTypeEvents, then we need to get the super events.
-		// This is so that duplicate any from super that we find here. When reflecting we don't
-		// allow discovered duplicates.
-		//
-		// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-		// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-		// the truth is most people want these. So we will add them in. But since there could be more than one it
-		// gets confusing. We need to look for dups from the super types.
-		//
-		// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-		Set supers = new HashSet(50);
-		BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-		if (bd == null || bd.isMergeSuperEvents()) {
-			List superTypes = getJavaClass().getESuperTypes();
-			if (!superTypes.isEmpty()) {
-				int lenST = superTypes.size();
-				for (int i=0; i<lenST; i++) {
-					List superAll = ((JavaClass) superTypes.get(i)).getAllEvents();
-					int len = superAll.size();
-					for (int i1=0; i1<len; i1++) {
-						JavaEvent se = (JavaEvent) superAll.get(i1);
-						supers.add(se.getName());
-					}
-				}
-			}
-		}
-
-		HashMap events = new HashMap();
-		eventListenerClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.EventListener", getJavaClass()); // Initialize, needed for building eventinfos. //$NON-NLS-1$
-		tooManyExceptionClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.TooManyListenersException", getJavaClass()); // Initialize, needed for building eventinfos. //$NON-NLS-1$
-		Iterator itr = getJavaClass().getPublicMethods().iterator();
-		while (itr.hasNext()) {
-			Method mthd = (Method) itr.next();
-			if (mthd.isStatic() || mthd.isConstructor())
-				continue; // Statics/constructors don't participate in events.
-			String key = validEventAdder(mthd);
-			if (key != null) {
-				EventInfo eventInfo = (EventInfo) events.get(key);
-				if (eventInfo == null) {
-					eventInfo = new EventInfo();
-					eventInfo.setAdder(mthd);
-					events.put(key, eventInfo);
-				} else
-					eventInfo.setAdder(mthd);
-			} else {
-				key = validEventRemove(mthd);
-				if (key != null) {
-					EventInfo eventInfo = (EventInfo) events.get(key);
-					if (eventInfo == null) {
-						eventInfo = new EventInfo();
-						eventInfo.setRemover(mthd);
-						events.put(key, eventInfo);
-					} else
-						eventInfo.setRemover(mthd);
-				}
-			}
-		}
-
-		eventListenerClass = null; // No longer need it.
-
-		// Now actually create the events.
-		HashSet eventNames = new HashSet(events.size()); // Set of found event names, to prevent duplicates
-		Iterator evtItr = events.entrySet().iterator();
-		while (evtItr.hasNext()) {
-			Map.Entry eventMap = (Map.Entry) evtItr.next();
-			EventInfo ei = (EventInfo) eventMap.getValue();
-			if (ei.isValidInfo()) {
-				String eventName = getEventName((String) eventMap.getKey());
-				if (eventNames.contains(eventName))
-					continue;	// Aleady created it. (Note: Introspector actually takes last one over previous dups, but the order is totally undefined, so choosing first is just as good or bad.
-
-				if (supers.contains(eventName))
-					continue; // Don't override a super event.
-
-				if (ei.createEvent(eventName))
-					eventNames.add(eventName); // It was validly created.
-			}
-		}
-
-		tooManyExceptionClass = null; // No longer need it.
-	}
-
-	/**
-	 * merge all the Events (i.e. supertypes)
-	 */
-	protected EList allEvents() {
-
-		EList jcAllEvents = getJavaClass().getAllEventsGen();
-		BeaninfoSuperAdapter superAdapter =
-			(BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
-		if (jcAllEvents != null) {
-			// See if new one required.
-			if (superAdapter == null || !superAdapter.isAllEventsCollectionModified())
-				return jcAllEvents;
-			// Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.       		
-		}
-
-		UniqueEList.FastCompare allEvents = new UniqueEList.FastCompare() {
-			/**
-			 * Comment for <code>serialVersionUID</code>
-			 * 
-			 * @since 1.1.0
-			 */
-			private static final long serialVersionUID = 1L;
-
-			protected Object[] newData(int capacity) {
-				return new JavaEvent[capacity];
-			}
-		};
-		
-		boolean doAllEvents = false;
-		synchronized(this) {
-			// If we are introspecting, don't do all properties because it is an invalid list. Just return empty without reseting the all modified flag.
-			doAllEvents = !isDoingAllEvents && !isIntrospecting && isResourceConnected();
-			if (doAllEvents)
-				isDoingAllEvents = true;
-		}
-
-		if (doAllEvents) {
-			try {
-				EList localEvents = getJavaClass().getEvents();
-				// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-				// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-				// the truth is most people want these. So we will add them in. But since there could be more than one it
-				// gets confusing. We need to look for dups from the super types and still keep order.
-				//
-				// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-				List superTypes = getJavaClass().getESuperTypes();
-				if (!superTypes.isEmpty()) {
-					// Now we need to merge in the supers.
-					BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-					// If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
-					// we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
-					// because IB would contribute IC's too).
-					Collection workingAllEvents = superTypes.size() == 1 ? (Collection) allEvents : new LinkedHashSet(); 
-					// We will now merge as directed.
-					boolean mergeAll = bd == null || bd.isMergeSuperEvents();
-					if (!mergeAll) {
-						// we don't to want to merge super events, but we still need super non-events or explicit ones.
-						int lenST = superTypes.size();
-						for (int i=0; i<lenST; i++) {
-							List supers = ((JavaClass) superTypes.get(i)).getAllEvents();
-							int len = supers.size();
-							for (int i1 = 0; i1 < len; i1++) {
-								JavaEvent e = (JavaEvent) supers.get(i1);
-								EventSetDecorator ed = Utilities.getEventSetDecorator(e);
-								if (ed == null || (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !ed.isMergeIntrospection()))
-									workingAllEvents.add(e);
-							}
-						}
-					} else {
-						// We want to merge all.					
-						// BeanInfo has given us the not merge list. If the list is empty, then we accept all.
-						if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames())) {
-							// We were given a list of names.
-							// Get the names into a set to create a quick lookup.
-							HashSet superSet = new HashSet(bd.getNotInheritedEventNames());
-							
-							// Now walk and add in non-bean events (and bean events that were explicitly added and not mergeable (i.e. didn't come thru beaninfo)) 
-							// and add those not specifically called out by BeanInfo.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								List supers = ((JavaClass) superTypes.get(i)).getAllEvents();
-								int len = supers.size();
-								for (int i1 = 0; i1 < len; i1++) {
-									JavaEvent e = (JavaEvent) supers.get(i1);
-									EventSetDecorator ed = Utilities.getEventSetDecorator(e);
-									if (ed == null || (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !ed.isMergeIntrospection()) || !superSet.contains(ed.getName()))
-										workingAllEvents.add(e);
-								}
-							}
-						} else {
-							// BeanInfo called out that all super events should be added, or no beaninfo.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								workingAllEvents.addAll(((JavaClass) superTypes.get(i)).getAllEvents());
-							}
-						}
-					}
-					if (workingAllEvents != allEvents)
-						allEvents.addAll(workingAllEvents);	// Now copy over the ordered super events.
-				}
-				allEvents.addAll(localEvents);				
-				superAdapter.setAllEventsCollectionModified(false); // Now built, so reset to not changed.
-			} finally {
-				synchronized (this) {
-					isDoingAllEvents = false;
-				}
-			}
-		}
-
-		if (allEvents.isEmpty())
-			return ECollections.EMPTY_ELIST;
-		else {
-			allEvents.shrink();
-			return new EcoreEList.UnmodifiableEList.FastCompare(
-				getJavaClass(),
-				JavaRefPackage.eINSTANCE.getJavaClass_AllEvents(),
-				allEvents.size(),
-				allEvents.data());
-		}
-
-	}
-
-	private JavaClass eventListenerClass, // Event Listener class. Needed for validation.
-	tooManyExceptionClass; // Too many listeners exception.
-
-	/*
-	 * Pass in the key, it will be used to form the name.
-	 */
-	protected String getEventName(String key) {
-		return key.substring(0, key.indexOf(':'));
-	}
-
-	/*	
-	 * Answers event key if valid, null if not valid.
-	 */
-	protected String validEventAdder(Method method) {
-		String name = method.getName();
-		if (!name.startsWith("add") || !name.endsWith("Listener")) //$NON-NLS-1$ //$NON-NLS-2$
-			return null; // Not valid format for an add listener name.
-		// Note. The Bean specs only state that it should be "add<ListenerType>" but the
-		// introspector implicitly adds an additional constraint in that the listener type
-		// should end with "Listener". If it doesn't the introspector would actually throw
-		// an index out of bounds. We'll just ignore such methods.
-
-		List parms = method.getParameters();
-		if (parms.size() != 1)
-			return null; // Invalid - improper number of parms.
-
-		EClassifier returnType = method.getReturnType();
-		if (returnType == null || !returnType.getName().equals("void")) //$NON-NLS-1$
-			return null; // Invalid - must be void return type.
-
-		EClassifier parmType = ((JavaParameter) parms.get(0)).getEType();
-		if (!BeaninfoClassAdapter.this.eventListenerClass.isAssignableFrom(parmType))
-			return null; // Parm must be inherit from EventListener
-
-		// Beans introspector also requires that the "listener" part of the name be a
-		// suffix of the type name. So if the type name was "ISomeListener" then
-		// the method name must be "addSomeListener" (actually "addomeListener"
-		// would also be valid according to the introspector!).
-		// This allows the type to be an interface using the "I" convention while not
-		// requiring the "I" to be in the name of the event.		
-		if (!parmType.getName().endsWith(name.substring(3)))
-			return null;	// It is not "add{ListenerType}".
-
-		// This is a unique containing event name and listener type
-		// This is so we can have a unique key for two events with the same
-		// name but different listener type. (This matches Introspector so that we aren't
-		// coming up with different results.
-		return java.beans.Introspector.decapitalize(name.substring(3, name.length() - 8))
-			+ ':'
-			+ ((JavaHelpers) parmType).getQualifiedName();
-	}
-
-	/*
-	 * Answers event key if valid, null if not valid.
-	 */
-	protected String validEventRemove(Method method) {
-		String name = method.getName();
-		if (!name.startsWith("remove") || !name.endsWith("Listener")) //$NON-NLS-1$ //$NON-NLS-2$
-			return null; // Not valid format for a remove listener name.
-		// Note. The Bean specs only state that it should be "add<ListenerType>" but the
-		// introspector implicitly adds an additional constraint in that the listener type name
-		// should end with "Listener". If it doesn't the introspector would actually throw
-		// an index out of bounds. We'll just ignore such methods.
-		
-
-		List parms = method.getParameters();
-		if (parms.size() != 1)
-			return null; // Invalid - improper number of parms.
-
-		EClassifier returnType = method.getReturnType();
-		if (returnType == null || !returnType.getName().equals("void")) //$NON-NLS-1$
-			return null; // Invalid - must be void return type.
-
-		EClassifier parmType = ((JavaParameter) parms.get(0)).getEType();
-		if (!BeaninfoClassAdapter.this.eventListenerClass.isAssignableFrom(parmType))
-			return null; // Parm must be inherit from EventListener
-
-		// Beans introspector also requires that the "listener" part of the name be a
-		// suffix of the type name. So if the type name was "ISomeListener" then
-		// the method name must be "removeSomeListener" (actually "removeomeListener"
-		// would also be valid according to the introspector!).
-		// This allows the type to be an interface using the "I" convention while not
-		// requiring the "I" to be in the name of the event.
-		if (!parmType.getName().endsWith(name.substring(6)))
-			return null;	// It is not "add{ListenerType}".
-
-		// This is a unique containing event name and listener type
-		// This is so we can have a unique key for two events with the same
-		// name but different listener type. (This matches Introspector so that we aren't
-		// coming up with different results).
-		return java.beans.Introspector.decapitalize(name.substring(6, name.length() - 8))
-			+ ':'
-			+ ((JavaHelpers) parmType).getQualifiedName();
-	}
-
-	public boolean isDefaultBound() {
-		if (defaultBound == null) {
-			// Haven't yet decided on it.
-			Iterator methods = getJavaClass().getPublicMethods().iterator();
-			boolean foundAdd = false, foundRemove = false;
-			while (methods.hasNext() && (!foundAdd || !foundRemove)) {
-				Method method = (Method) methods.next();
-				if ("addPropertyChangeListener".equals(method.getName())) { //$NON-NLS-1$
-					List parms = method.getParameters();
-					if (parms.size() == 1) {
-						JavaParameter parm = (JavaParameter) parms.get(0);
-						if ("java.beans.PropertyChangeListener".equals(((JavaHelpers) parm.getEType()).getQualifiedName())) { //$NON-NLS-1$
-							foundAdd = true;
-							continue;
-						}
-					}
-				} else if ("removePropertyChangeListener".equals(method.getName())) { //$NON-NLS-1$
-					List parms = method.getParameters();
-					if (parms.size() == 1) {
-						JavaParameter parm = (JavaParameter) parms.get(0);
-						if ("java.beans.PropertyChangeListener".equals(((JavaHelpers) parm.getEType()).getQualifiedName())) { //$NON-NLS-1$
-							foundRemove = true;
-							continue;
-						}
-					}
-				}
-			}
-
-			defaultBound = (foundAdd && foundRemove) ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return defaultBound.booleanValue();
-	}
-
-	private class EventInfo {
-		
-		public Method addListenerMethod;
-		public Method removeListenerMethod;
-
-		public void setAdder(Method addMethod) {
-			addListenerMethod = addMethod;
-		}
-
-		public void setRemover(Method removeMethod) {
-			removeListenerMethod = removeMethod;
-		}
-
-		// Answer whether this is a valid event info.
-		public boolean isValidInfo() {
-			return (addListenerMethod != null && removeListenerMethod != null);
-		}
-
-		public boolean createEvent(String name) {
-			EventSetDecorator ed = BeaninfoClassAdapter.this.createEvent(name);
-			if (ed == null)
-				return false; // Reflection not wanted.
-
-
-			// See if unicast.
-			boolean unicast = false;
-			List exceptions = addListenerMethod.getJavaExceptions();
-			int len = exceptions.size();
-			for(int i=0; i<len; i++) {
-				if (exceptions.get(i) == BeaninfoClassAdapter.this.tooManyExceptionClass) {
-					unicast = true;
-					break;
-				}
-			}
-			// We'll let listener methods get retrieved dynamically when needed.
-			BeanInfoDecoratorUtility.setProperties(ed, addListenerMethod, removeListenerMethod, unicast, (JavaClass) ((JavaParameter) addListenerMethod.getParameters().get(0)).getEType());
-			return true;
-		}
-
-	}
-
-	/**
-	 * Marh the factory as stale, but leave the overrides alone. They are not stale.
-	 * @param stale
-	 * 
-	 * @since 1.1.0.1
-	 */
-	public void markStaleFactory(ProxyFactoryRegistry stale) {
-		markStaleFactory(stale, false);
-	}
-	
-	/**
-	 * Mark this factory as the stale factory.
-	 * 
-	 * @param clearOverriddes clear the overrides too. They are stale.
-	 */
-	public void markStaleFactory(ProxyFactoryRegistry stale, boolean clearOverriddes) {
-		if (staleFactory == null) {
-			// It's not stale so make it stale.
-			// So that next access will re-introspect
-			defaultBound = null; // So query on next request.
-			staleFactory = new WeakReference(stale);
-
-			// Need to mark the esuperadapter that things have changed so that any 
-			// subtype will know to reuse the parent for anything that requires knowing parent info.
-			Adapter a = EcoreUtil.getExistingAdapter(getTarget(), ESuperAdapter.class);
-			// Simulate that this objects super has changed. This will make all subclasses
-			// think about the super has changed and next retrieving anything that involves the
-			// super will cause a rebuild to occur.
-			Notification note =
-				new ENotificationImpl((InternalEObject) getTarget(), Notification.SET, EcorePackage.ECLASS__ESUPER_TYPES, null, null);
-			if (a != null)
-				a.notifyChanged(note);
-			// Do the same with BeaninfoSuperAdapter so that events also will be rebuilt.
-			a = EcoreUtil.getExistingAdapter(getTarget(), BeaninfoSuperAdapter.ADAPTER_KEY);
-			if (a != null)
-				a.notifyChanged(note);
-			synchronized (this) {
-				needsIntrospection = true;
-				if (clearOverriddes) {
-					retrievedExtensionDocument = CLEAR_EXTENSIONS;
-					if (classEntry != null) {
-						classEntry.markDeleted();
-						classEntry = null; // Get a new one next time.
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Form a longname for the addkey function.
-	 */
-	private String formLongName(EOperation feature) {
-		Method mthd = null;
-		if (feature instanceof Method)
-			mthd = (Method) feature;
-		else if (feature instanceof MethodProxy)
-			mthd = ((MethodProxy) feature).getMethod();
-		else
-			return null; // Don't know what it is.
-
-		StringBuffer longName = new StringBuffer(100);
-		longName.append(feature.getName()); // Feature Name
-		longName.append(':');
-		longName.append(mthd.getName()); // Method Name
-		longName.append('(');
-		List p = mthd.getParameters();
-		for (int i = 0; i < p.size(); i++) {
-			JavaParameter parm = (JavaParameter) p.get(i);
-			if (i>0)
-				longName.append(',');
-			longName.append(parm.getJavaType().getQualifiedName());
-		}
-
-		return longName.toString();
-	}
-	
-	/*
-	 * More than one operation can have the same name. To identify them uniquely, the long name is created,
-	 * which is formed from the name and the method signature.
-	 */
-	private String formLongName(MethodRecord record) {
-		StringBuffer longName = new StringBuffer(100);
-		longName.append(record.name); // Feature Name
-		longName.append(':');
-		longName.append(record.methodForDescriptor.methodName); // Method Name
-		longName.append('(');
-		String[] p = record.methodForDescriptor.parameterTypeNames;
-		if (p != null)
-			for (int i = 0; i < p.length; i++) {
-				if (i>0)
-					longName.append(',');
-				longName.append(MapJNITypes.getFormalTypeName(p[i]));
-			}
-
-		return longName.toString();
-	}
-	/**
-	 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(Notification)
-	 */
-	public void notifyChanged(Notification msg) {
-		// In case of removing adapter, make sure we are first removed from the factory so it doesn't know about us anymore.
-		if (msg.getEventType() == Notification.REMOVING_ADAPTER)
-			getAdapterFactory().removeAdapter(this);
-	}
-
-	/**
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return super.toString() + '(' + (getJavaClass() != null ? getJavaClass().getQualifiedName() : "?") + ')'; //$NON-NLS-1$
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java
deleted file mode 100644
index 604306bf1..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java
+++ /dev/null
@@ -1,133 +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.adapters;
-/*
-
-
- */
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.adapters.IJavaReflectionKey;
-import org.eclipse.jem.java.adapters.IJavaReflectionKeyExtension;
-
-/**
- * Java Reflection Key extension to retrieve keys for beaninfo creations.
- * 
- * Handles attributes and behaviors.
- * 
- * @version 	1.0
- * @author R. L. Kulp  
- */
-public class BeaninfoJavaReflectionKeyExtension implements IJavaReflectionKeyExtension {
-	
-	// The format of the keys are:
-	// behaviors:  "classname/behavior/behaviorname"
-	// structural features: "classname/featurename"
-	public static final String 
-		BEHAVIOR = "/operation/",	// Piece in key that indicates this is a behavior. //$NON-NLS-1$
-		EVENT = "/event/",		// Piece in key that indicates this is an event. //$NON-NLS-1$
-		FEATURE = "/";			// Piece in key that indicates this is an attribute. //$NON-NLS-1$
-	
-	/**
-	 * Get the object for this key.
-	 */
-	public Object getObject(String key, IJavaReflectionKey reflectionKey) {
-		if (key != null) {
-			int ibehave = key.indexOf(BEHAVIOR);
-			if (ibehave > -1) {
-				// We have a possible behavior.
-				String classname = key.substring(0, ibehave);
-				int ibehaveName = ibehave+BEHAVIOR.length();
-				if (ibehaveName < key.length()) {
-					JavaClass javaclass = getJavaClass(reflectionKey, classname);
-					if (javaclass != null) {
-						javaclass.getEOperations();	// Get the list introspected and populated if not already.
-						return reflectionKey.primGet(key);	// It should now be there, 
-					}
-				}
-			} else {
-				int ievent = key.indexOf(EVENT);
-				if (ievent > -1) {
-					// We have a possible event.
-					String classname = key.substring(0, ievent);
-					int ieventName = ievent+EVENT.length();
-					if (ieventName < key.length()) {
-						JavaClass javaclass = getJavaClass(reflectionKey, classname);
-						if (javaclass != null) {
-							javaclass.getEvents();	// Get the list introspected and populated if not already.
-							return reflectionKey.primGet(key);	// It should now be there, 
-						}
-					}
-				} else {
-					int ifeature = key.indexOf(FEATURE);
-					if (ifeature > -1) {
-						// We have a possible feature.
-						String classname = key.substring(0, ifeature);
-						int ifeatureName = ifeature+FEATURE.length();
-						if (ifeatureName < key.length()) {
-							String feature = key.substring(ifeatureName);
-							JavaClass javaclass = getJavaClass(reflectionKey, classname);
-							if (javaclass != null) {
-								// This is just a hack until we can get ID situation straightened out.
-								// Need to cause introspection of the attributes and references.
-								javaclass.getEStructuralFeatures();
-								Object result = reflectionKey.primGet(key);	// See if it now got added as an id.
-								if (result == null) {
-									// Well, it could of been added by the diff merge, which as of now can't handle ids.
-									// So we will find it within the attributes/references.
-									result = findFeature(feature, javaclass.getEReferences());
-									if (result == null)
-										result = findFeature(feature, javaclass.getEAttributes());									
-									if (result instanceof EStructuralFeature) {
-										// Need to add it as an id so next time won't come through here.
-										((XMIResource) javaclass.eResource()).setID((EObject) result, key);	// So next time it will find it directly.
-									}
-								}
-								return result;
-							}
-						}
-					}
-				}
-			}
-		}
-						
-		return null;
-	}
-
-	private EStructuralFeature findFeature(String featureName, List featureList) {
-		Iterator itr = featureList.iterator();		
-		while (itr.hasNext()) {
-			EStructuralFeature feature = (EStructuralFeature) itr.next();
-			if (featureName.equals(feature.getName())) {
-				return feature;
-			}
-		}
-		return null;
-	}
-
-	protected JavaClass getJavaClass(IJavaReflectionKey reflectionKey, String classname) {
-		Object eclass = reflectionKey.primGet(classname);
-		if (eclass == null) 
-			eclass = reflectionKey.getJavaType(classname);	// Let it create it.
-		if (eclass instanceof JavaClass)
-			return (JavaClass) eclass;
-		else
-			return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java
deleted file mode 100644
index 9b9013275..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java
+++ /dev/null
@@ -1,198 +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.adapters;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.workbench.utility.JavaModelListener;
-/**
- * This class listens for changes to the java model and flushs the
- * appropriate class introspection.
- */
-
-public class BeaninfoModelSynchronizer extends JavaModelListener {
-	protected BeaninfoAdapterFactory fAdapterFactory;
-	protected IJavaProject fProject; // The project this listener is opened on.
-	private static final IPath BEANINFOCONFIG_PATH = new Path(BeaninfoNature.P_BEANINFO_SEARCH_PATH);	//$NON-NLS-1$	
-
-	public BeaninfoModelSynchronizer(BeaninfoAdapterFactory aFactory, IJavaProject aProject) {
-		super(ElementChangedEvent.POST_CHANGE);
-		fAdapterFactory = aFactory;
-		fProject = aProject;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#getJavaProject()
-	 */
-	protected IJavaProject getJavaProject() {
-		return fProject;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#isAlsoClasspathChange(org.eclipse.core.runtime.IPath)
-	 */
-	protected boolean isAlsoClasspathChange(IPath path) {
-		return path.equals(BEANINFOCONFIG_PATH);
-	}
-	
-	/**
-	 * Stop the synchronizer from listening to any more changes.
-	 */
-	public void stopSynchronizer(boolean clearResults) {
-		JavaCore.removeElementChangedListener(this);
-		getAdapterFactory().closeAll(clearResults);
-	}
-
-	public BeaninfoAdapterFactory getAdapterFactory() {
-		return fAdapterFactory;
-	}
-
-	protected void processJavaElementChanged(IJavaProject element, IJavaElementDelta delta) {
-		if (isInClasspath(element)) {
-			if (delta.getKind() == IJavaElementDelta.REMOVED || delta.getKind() == IJavaElementDelta.ADDED) {
-				// Don't need to do anything for delete/close/add/open of main project because there is much more that needs to
-				// be done by BeaninfoNature on project close/delete, so nature listens for this and does the appropriate cleanup.			
-				if (!element.equals(fProject)) {
-					// However, all other projects are required projects and if they are deleted/closed/added/opened when need to do
-					// a full flush because we don't know any of the state, whether they are still there or not.
-					getAdapterFactory().markAllStale();
-				}
-				return;
-			} else if (isClasspathResourceChange(delta)) {
-				getAdapterFactory().markAllStale(); // The .classpath file (or .beaninfoconfig) itself in SOME DEPENDENT PROJECT has changed. 
-				return;
-			}
-			processChildren(element, delta);
-		}
-	}
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 * If a working copy, then ignore it because we don't care about changes until
-	 * they are committed. Else, if the CU has changed content then mark all of the
-	 * types in this CU (such as inner classes) as stale.
-	 * If it is not a content change then process the children.
-	 */
-	protected void processJavaElementChanged(ICompilationUnit element, IJavaElementDelta delta) {
-		switch (delta.getKind()) {
-			case IJavaElementDelta.CHANGED :
-				// A file save had occurred. It doesn't matter if currently working copy or not.
-				// It means something has changed to the file on disk, but don't know what.
-				if ((delta.getFlags() & IJavaElementDelta.F_PRIMARY_RESOURCE) != 0) {
-					getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), false);	// Flush everything, including inner classes.
-				}						
-				
-				break;
-			case IJavaElementDelta.ADDED:
-			case IJavaElementDelta.REMOVED:
-				// Need to know for add because we optimize the beaninfo such that once found as undefined, it won't
-				// introspect again until we mark it stale. So we need to mark it stale to refresh it.
-				
-				// It doesn't matter if totally removed or just moved somewhere else, we will clear out
-				// adapter because there could be a rename which would be a different class.
-				// Currently the element is already deleted or added and there is no way to find the types in the unit to flush.
-				// So instead we ask factory to flush all it any that start with it plus for inner classes.				
-				getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), true);	// Flush everything, including inner classes.
-				break;
-		}
-	}
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-		 */
-	protected void processJavaElementChanged(IClassFile element, IJavaElementDelta delta) {
-		if (delta.getKind() == IJavaElementDelta.REMOVED) {
-			// It doesn't matter if totally removed or just moved somewhere else, we will clear out and remove the
-			// adapter because there could be a rename which would be a different class.
-			// Currently the element is already deleted and there is no way to find the types in the unit to remove.
-			// So instead we ask factory to remove all it any that start with it plus for inner classes.
-			getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), true);
-			return; // Since the classfile was removed we don't need to process the children (actually the children list will be empty
-		}
-		IJavaElementDelta[] children = delta.getAffectedChildren();
-		for (int ii = 0; ii < children.length; ii++) {
-			processDelta(children[ii]);
-		}
-	}
-
-	protected String getFullNameFromElement(IJavaElement element) {
-		String name = element.getElementName();		
-		if (!(element instanceof ICompilationUnit || element instanceof IClassFile))
-			return name;	// Shouldn't be here
-		
-		// remove extension.
-		int periodNdx = name.lastIndexOf('.');
-		if (periodNdx == -1)
-			return name;	// Shouldn't be here. There should be an extension
-					
-		String typeName = null;
-		String parentName = element.getParent().getElementName();
-		if (parentName == null || parentName.length() == 0)
-			typeName = name.substring(0, periodNdx); // In default package
-		else
-			typeName = parentName + "." + name.substring(0, periodNdx); //$NON-NLS-1$
-								
-		return typeName;
-	}
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 * If the classpath has changed, mark all as stale because we don't know what
-	 * has changed. Things that were in the path may no longer be in the path, or
-	 * the order was changed, which could affect the introspection.
-	 */
-	protected void processJavaElementChanged(IPackageFragmentRoot element, IJavaElementDelta delta) {
-		if (isClassPathChange(delta))
-			fAdapterFactory.markAllStale();
-		else
-			super.processJavaElementChanged(element, delta);
-	}
-	
-	protected void processJavaElementChanged(IPackageFragment element, IJavaElementDelta delta) {
-		switch (delta.getKind()) {
-			case IJavaElementDelta.ADDED:
-				// Even though added there is possibility that package exists in other root but this
-				// one may now take priority, so we will clear the package anyway.
-			case IJavaElementDelta.REMOVED:
-				fAdapterFactory.markPackageStale(element.getElementName());
-				break;
-			default :
-				super.processJavaElementChanged(element, delta);
-		}
-	}
-	
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 * Something about the type has changed. If it was removed (not a move), then close the
-	 * adapter too.
-	 */
-	protected void processJavaElementChanged(IType element, IJavaElementDelta delta) {
-		if (delta.getKind() == IJavaElementDelta.REMOVED) {
-			// Close it out. Doesn't matter if moved_to, that would be a rename which requires brand new class.
-			// We can't actually get rid of the beaninfo adapter because it may be asked for again
-			// just to see if not defined. It may also come back later and we want to know about
-			// it to recycle the vm.
-			getAdapterFactory().markStaleIntrospection(element.getFullyQualifiedName(), true);	
-		} else
-			getAdapterFactory().markStaleIntrospection(element.getFullyQualifiedName(), false); // Just mark it stale
-		processChildren(element, delta);
-	}
-
-	public String toString() {
-		return super.toString()+" "+fProject.getElementName(); //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
deleted file mode 100644
index 49e1959e0..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
+++ /dev/null
@@ -1,1026 +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.adapters;
-/*
-
-
- */
-
-import java.io.*;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.jdt.core.*;
-import org.osgi.framework.Bundle;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.java.init.JavaInit;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo.ContainerPaths;
-import org.eclipse.jem.java.adapters.JavaXMIFactory;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.emf.workbench.ResourceHandler;
-
-
-/**
- * The beaninfo nature. It is created for a project and holds the
- * necessary info for beaninfo to be performed on a project.
- */
-
-public class BeaninfoNature implements IProjectNature {
-
-	public static final String NATURE_ID = BeaninfoPlugin.PI_BEANINFO_PLUGINID + ".BeanInfoNature"; //$NON-NLS-1$
-	public static final String P_BEANINFO_SEARCH_PATH = ".beaninfoConfig"; //$NON-NLS-1$
-	
-	public static final QualifiedName CONFIG_INFO_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "CONFIG_INFO"); //$NON-NLS-1$
-	public static final QualifiedName BEANINFO_CONTRIBUTORS_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "BEANINFO_CONTRIBUTORS"); //$NON-NLS-1$
-
-	private ProxyFactoryRegistry.IRegistryListener registryListener = new ProxyFactoryRegistry.IRegistryListener() {
-		/**
-		 * @see org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry.IRegistryListener#registryTerminated(ProxyFactoryRegistry)
-		 */
-		public void registryTerminated(ProxyFactoryRegistry registry) {
-			prematureRegistryTerminate();
-			markAllStale();
-		};
-	};
-
-	/**
-	 * Get the runtime nature for the project, create it if necessary.
-	 */
-	public static BeaninfoNature getRuntime(IProject project) throws CoreException {
-		JavaEMFNature.createRuntime(project);	// Must force JAVAEMFNature creation first before we try to get ours. There is a chicken/egg problem if we let our nature try to get JavaEMFNature during setProject.
-		if (project.hasNature(NATURE_ID))
-			return (BeaninfoNature) project.getNature(NATURE_ID);
-		else
-			return createRuntime(project);
-	}
-	
-	/**
-	 * Return whether this project has a BeanInfo runtime turned on.
-	 * 
-	 * @param project
-	 * @return <code>true</code> if it has the a BeanInfo runtime.
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static boolean hasRuntime(IProject project) throws CoreException {
-		return project.hasNature(NATURE_ID);
-	}
-
-	/**
-	 * Test if this is a valid project for a Beaninfo Nature. It must be
-	 * a JavaProject.
-	 */
-	public static boolean isValidProject(IProject project) {
-		try {
-			return project.hasNature(JavaCore.NATURE_ID);
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Create the runtime.
-	 */
-	private static BeaninfoNature createRuntime(IProject project) throws CoreException {
-		if (!isValidProject(project))
-			throw new CoreException(
-				new Status(
-					IStatus.ERROR,
-					BeaninfoPlugin.PI_BEANINFO_PLUGINID,
-					0,
-					MessageFormat.format(
-						BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, 
-						new Object[] { project.getName(), BeanInfoAdapterMessages.BeaninfoNature_InvalidProject}), 
-					null));
-
-		addNatureToProject(project, NATURE_ID);
-		return (BeaninfoNature) project.getNature(NATURE_ID);
-	}
-
-	private static void addNatureToProject(IProject proj, String natureId) 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, null);
-	}
-
-	private IProject fProject;
-	protected ProxyFactoryRegistry fRegistry;
-	protected ResourceSet javaRSet;
-	protected BeaninfoModelSynchronizer fSynchronizer;
-	protected static BeaninfoJavaReflectionKeyExtension fReflectionKeyExtension;
-
-	/** 
-	 * Configures the project with this nature.
-	 * This is called by <code>IProject.getNature</code> and should not
-	 * be called directly by clients.
-	 * The nature extension id is added to the list of natures on the project by
-	 * <code>IProject.getNature</code>, and need not be added here.
-	 *
-	 * @exception CoreException if this method fails.
-	 */
-	public void configure() throws CoreException {
-	}
-
-	/** 
-	 * Removes this nature from the project, performing any required deconfiguration.
-	 * This is called by <code>IProject.removeNature</code> and should not
-	 * be called directly by clients.
-	 * The nature id is removed from the list of natures on the project by
-	 * <code>IProject.removeNature</code>, and need not be removed here.
-	 *
-	 * @exception CoreException if this method fails. 
-	 */
-	public void deconfigure() throws CoreException {
-		removeSharedProperty(P_BEANINFO_SEARCH_PATH, null);
-		cleanup(true, true);
-	}
-	
-	/**
-	 * Shutdown the nature. Called by BeanInfoPlugin to tell the nature that the plugin is being shutdown.
-	 * It needs to cleanup.
-	 * TODO <package-protected> because only BeanInfoPlugin should call it. (public for now but when we make
-	 * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
-	 * 
-	 * @since 1.0.0
-	 */
-	public void shutdown() {
-		cleanup(true, false);
-	}
-
-
-	/**
-	 * Return a new ResourceSet that is linked correctly to this Beaninfo Nature.
-	 * <p>
-	 * This links up a ResourceSet so that it will work correctly with this nature.
-	 * It makes sure that going through the ResourceSet that any "java:/..."
-	 * classes can be found and it makes sure that any new classes are placed into the
-	 * nature's resource set and not resource set doing the calling.
-	 * <p>
-	 * This should be used any time a resource set is needed that is not the
-	 * project wide resource set associated with beaninfos, but will reference
-	 * Java Model classes or instantiate.
-	 * <p>
-	 * An additional change is made too. The ResourceFactoryRegistry's extensionToResourceFactory map is modified
-	 * to have an "java"->XMIResourceFactory entry added to it if EMF Examples is loaded. EMF Examples add
-	 * the "java" extension and sets it to their own special JavaResourceFactory. 
-	 * If EMF Examples is not loaded, then it falls back to the default "*" mapping, which is to XMIResourceFactory.
-	 * This normally causes problems for many
-	 * customers. If users of this resource set really want the EMF examples entry instead, after they retrieve the
-	 * new resource set they can do this:
-	 * <p>
-	 * <pre><code>
-	 * 	rset = beaninfoNature.newResourceSet();
-	 * 	rset.getResourceFactoryRegistry().getExtensionToFactoryMap().remove("java");
-	 * </code></pre>
-	 * 
-	 * @return a ResourceSet that is specially connected to the JEM java model.
-	 * 
-	 * @since 1.0.0
-	 */
-	public ProjectResourceSet newResourceSet() {
-		SpecialResourceSet rset = new SpecialResourceSet();
-		rset.add(new ResourceHandler() {
-			public EObject getEObjectFailed(ResourceSet originatingResourceSet, URI uri, boolean loadOnDemand) {
-				return null; // We don't have any special things we can do in this case.
-			}
-
-			public Resource getResource(ResourceSet originatingResourceSet, URI uri) {
-				// Always try to get it out of the nature's resource set because it may of been loaded there either as 
-				// the "java:..." type or it could of been an override extra file (such as an override EMF package, for
-				// example jcf has a side package containing the definition of the new attribute type. That file
-				// will also be loaded into this resourceset. So to find it we need to go in here and try.
-				//
-				// However, if not found we won't go and try to load the resource. That could load in the wrong place.
-				// Kludge: Because of a bug (feature :-)) in XMLHandler.getPackageFromURI(), it doesn't use getResource(...,true) and it tries instead
-				// to use uri inputstream to load the package when not found. This bypasses our special create resource and so
-				// packages are not automatically created. So we need to do load on demand here instead if it is a java protocol.
-				// EMF will not be fixing this. It is working as designed.
-				return getResourceSet().getResource(uri, JavaXMIFactory.SCHEME.equals(uri.scheme()));
-			}
-
-			public Resource createResource(ResourceSet originatingResourceSet, URI uri) {
-				// This is the one. It has got here because it couldn't find a resource already loaded.
-				// If it is a "java:/..." protocol resource, then we want to make sure it is loaded at the BeaninfoNature context
-				// instead of the lower one.
-				if (JavaXMIFactory.SCHEME.equals(uri.scheme()))
-					return getResourceSet().getResource(uri, true);
-				else
-					return null;
-			}
-		});
-		// [71473] Restore "*.java" to be an XMIResource. If EMF Examples are loaded they overload this and load their special resource for "*.java" which we don't want.
-		// If some user really wants that, they grab the resource resource set and remove our override.
-		if (Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("java")) { //$NON-NLS-1$
-			// Need to add an override to go to XMI instead.
-			rset.getResourceFactoryRegistry().getExtensionToFactoryMap().put("java", new XMIResourceFactoryImpl()); //$NON-NLS-1$
-		}
-		return rset;
-	}
-	/**
-	 * Clean up, this means either the project is being closed, deleted, or it means that
-	 * the nature is being removed from the project. Either way that means to
-	 * terminate the VM and remove what we added to the context if the flag says clear it.
-	 * <p>
-	 * This should be called ONLY when this instance of the nature is no longer needed. It
-	 * will be recreated for any new uses. That is because we will be removing ourselves
-	 * from the list of active natures in the BeanInfoPlugin.
-	 * <p>
-	 * <b>Note:</b> This will be called from the BeanInfoCacheController. It knows when the project is
-	 * being closed or deleted.
-	 * 
-	 * @param clearResults clear the results such that any JEM model objects have no BeanInfo
-	 * adapters attached to them. This allows BeanInfo to be GC'd without being hung onto.
-	 *  
-	 * @param deregister Deregister from the BeanInfoPlugin. Normally this will always be true, but it
-	 * will be called with false when BeanInfoPlugin is calling back to shutdown.
-	 */
-	public synchronized void cleanup(boolean clearResults, boolean deregister) {
-		if (deregister)
-			BeaninfoPlugin.getPlugin().removeBeanInfoNature(this);
-		fSynchronizer.stopSynchronizer(clearResults);
-		Init.cleanup(javaRSet, clearResults);
-		if (fRegistry != null)
-			fRegistry.terminateRegistry(true);
-
-		projectCleaned();
-		javaRSet = null;
-		fRegistry = null;
-		fProject = null;
-		fSynchronizer = null;
-	}
-
-	/** 
-	 * Returns the project to which this project nature applies.
-	 *
-	 * @return the project handle
-	 */
-	public IProject getProject() {
-		return fProject;
-	}
-
-	/**
-	 * Sets the project to which this nature applies.
-	 * Used when instantiating this project nature runtime.
-	 * This is called by <code>IProject.addNature</code>
-	 * and should not be called directly by clients.
-	 *
-	 * @param project the project to which this nature applies
-	 */
-	public void setProject(IProject project) {
-//		BeanInfoCacheController.INSTANCE.getClass();	// Instantiates the controller if not already started.
-		fProject = project;
-		BeaninfoPlugin.getPlugin().addBeanInfoNature(this);
-
-		try {
-			// The nature has been started for this project, need to setup the introspection process now.
-			JavaEMFNature javaNature = JavaEMFNature.createRuntime(fProject);
-			JavaInit.init();
-			if (fReflectionKeyExtension == null) {
-				// Register the reflection key extension.
-				fReflectionKeyExtension = new BeaninfoJavaReflectionKeyExtension();
-				JavaXMIFactory.INSTANCE.registerReflectionKeyExtension(fReflectionKeyExtension);
-			}
-
-			javaRSet = javaNature.getResourceSet();
-			Init.initialize(javaRSet, new IBeaninfoSupplier() {
-				public ProxyFactoryRegistry getRegistry() {
-					return BeaninfoNature.this.getRegistry();
-				}
-
-				public boolean isRegistryCreated() {
-					return BeaninfoNature.this.isRegistryCreated();
-				}
-				
-				public void closeRegistry() {
-					BeaninfoNature.this.closeRegistry();
-				}
-				
-				public IProject getProject() {
-					return BeaninfoNature.this.getProject();
-				}
-
-				public ProjectResourceSet getNewResourceSet() {
-					return BeaninfoNature.this.newResourceSet();
-				}
-
-				public ResourceSet getProjectResourceSet() {
-					return getResourceSet();
-				}
-			});
-			fSynchronizer =
-				new BeaninfoModelSynchronizer(
-					(BeaninfoAdapterFactory) EcoreUtil.getAdapterFactory(javaRSet.getAdapterFactories(), IIntrospectionAdapter.ADAPTER_KEY),
-					JavaCore.create(javaNature.getProject()));
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		}
-	}
-
-	/**
-	 * Close the registry. It needs to be recycled because a class has changed
-	 * and now the new class needs to be accessed.
-	 */
-	protected void closeRegistry() {
-		ProxyFactoryRegistry reg = null;
-		synchronized (this) {
-			reg = fRegistry;
-			fRegistry = null;
-			try {
-				// Wipe out the Session properties so that they are recomputed.
-				getProject().setSessionProperty(CONFIG_INFO_SESSION_KEY, null);
-				getProject().setSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY, null);			
-			} catch (CoreException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
-			}
-		}
-		if (reg != null) {
-			reg.removeRegistryListener(registryListener);
-			reg.terminateRegistry();
-		}
-	}
-
-	private static final String PI_CLASS = "class"; //$NON-NLS-1$
-	
-	/**
-	 * Using the given configuration info, compute the BeanInfo config info needed. This sets the
-	 * session properties BEANINFO_CONTRIBUTORS_SESSION_KEY and CONFIG_INFO_SESSION_KEY.
-	 * 
-	 * @param info
-	 * @throws CoreException
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void computeBeanInfoConfigInfo(IConfigurationContributionInfo info) throws CoreException {
-		// First time for this nature, or first time after registry reset. Need to compute the info.
-		// It is possible for this to be called BEFORE the first usage of BeanInfo. The editor usually
-		// brings up the editor's registry before it gets anything from BeanInfo.
-		List contributorsList = new ArrayList(10);
-		if (!info.getContainerIds().isEmpty()) {
-			// Run through all of the visible container ids that are applicable and get BeanInfo contributors.
-			Iterator containerIdItr = info.getContainerIds().values().iterator();
-			while (containerIdItr.hasNext()) {
-				ContainerPaths containerPaths = (ContainerPaths) containerIdItr.next();
-				IConfigurationElement[] contributors = BeaninfoPlugin.getPlugin().getContainerIdContributors(containerPaths.getContainerId(), containerPaths.getVisibleContainerPaths());
-				for (int i = 0; i < contributors.length; i++) {
-					try {
-						Object contributor = contributors[i].createExecutableExtension(PI_CLASS);
-						if (contributor instanceof IBeanInfoContributor)
-							contributorsList.add(contributor);
-					} catch (CoreException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-					}
-				}
-			}						
-		}
-		
-		if (!info.getPluginIds().isEmpty()) {
-			// Run through all of the visible plugin ids that are applicable and get BeanInfo contributors.
-				Iterator pluginIdItr = info.getPluginIds().entrySet().iterator();
-				while (pluginIdItr.hasNext()) {
-					Map.Entry entry = (Map.Entry) pluginIdItr.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						IConfigurationElement[] contributors = BeaninfoPlugin.getPlugin().getPluginContributors(
-								(String) entry.getKey());
-						if (contributors != null) {
-							for (int i = 0; i < contributors.length; i++) {
-							try {
-								Object contributor = contributors[i].createExecutableExtension(PI_CLASS);
-								if (contributor instanceof IBeanInfoContributor)
-									contributorsList.add(contributor);
-							} catch (CoreException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-							}
-						}
-					}
-				}
-			}
-		}
-			
-			// Save it for all beaninfo processing (and configuration processing if they implement proxy configuration contributor).
-		IBeanInfoContributor[] explicitContributors = (IBeanInfoContributor[]) contributorsList.toArray(new IBeanInfoContributor[contributorsList.size()]);
-		info.getJavaProject().getProject().setSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY, explicitContributors);
-		// Save it for override processing. That happens over and over later after all config processing is done.
-		// Do it last so that if there is a race condition, since this property is a flag to indicate we have data,
-		// we need to make sure the Beaninfo data is already set at the point we set this.
-		// We could actually set it twice because of this, but it is the same data, so, so what.
-		info.getJavaProject().getProject().setSessionProperty(CONFIG_INFO_SESSION_KEY, info);
-	}
-
-	/**
-	 * Get registry, creating it if necessary.
-	 * @return the registry.
-	 * 
-	 * @since 1.0.0
-	 */
-	public ProxyFactoryRegistry getRegistry() {
-		synchronized (this) {
-			if (fRegistry != null)
-				return fRegistry;
-		}
-		// Now need to start the appropriate job. In another class so that it can handle dynamically checking if 
-		// UI is available to even do this (it maybe not in a UI mode, so then just do it.
-		CreateRegistryJobHandler.createRegistry(this);
-		return fRegistry;
-	}
-	
-	private static final long NO_PREMATURE_TERMINATE_TIME = -1;
-	private int registryPrematureTerminateCount;
-	private long registryLastPrematureTerminateTime = NO_PREMATURE_TERMINATE_TIME;
-	
-	/*
-	 * This is <package-protected> so that only the appropriate create job in this
-	 * package can call it. This is because this must be controlled to only be
-	 * done when build not in progress and serial access.
-	 */
-	void createRegistry(IProgressMonitor pm) {
-		pm.beginTask(BeanInfoAdapterMessages.UICreateRegistryJobHandler_StartBeaninfoRegistry, 100); 
-		if (isRegistryCreated()) {
-			pm.done();
-			return; // It had already been created. Could of been because threads were racing to do the creation, and one got there first.
-		}
-
-		// Test to see if we have terminated too many times within the last 10 minutes. If we have then don't try again.
-		synchronized(this) {
-			if (registryLastPrematureTerminateTime != NO_PREMATURE_TERMINATE_TIME) {
-				long lastPrematureTerminateInterval = System.currentTimeMillis() - registryLastPrematureTerminateTime;
-				// Don't try again within 1 sec of last premature terminate. It will still be bad.
-				// Of if there have been more than 3 and it has been 10 mins since the last try.
-				if (lastPrematureTerminateInterval < 3*1000 || (registryPrematureTerminateCount > 3 && lastPrematureTerminateInterval < 10 * 60 * 1000))
-					return;
-			}			
-		}
-		
-		ProxyFactoryRegistry registry = null;
-		try {
-			ConfigurationContributor configurationContributor = (ConfigurationContributor) getConfigurationContributor();
-			configurationContributor.setNature(this);
-			registry = ProxyLaunchSupport.startImplementation(fProject, "Beaninfo", //$NON-NLS-1$
-					new IConfigurationContributor[] { configurationContributor}, false, new SubProgressMonitor(pm, 100));
-			synchronized(this) {
-				if (!isRegistryCreated()) {
-					projectCleaned();
-					registry.addRegistryListener(registryListener);
-					fRegistry = registry;
-				} else {
-					// It was created while we were creating. So use the current one. Terminate the one just created. Not needed.
-					registry.terminateRegistry(false);
-				}
-			}
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		} finally {
-			if (registry == null) {
-				// It didn't create. Treat as premature terminate.
-				prematureRegistryTerminate();
-			}
-			pm.done();
-		}
-	}
-
-	/**
-	 * Called by others in package (BeaninfoCacheController) to let know a clean has occured.
-	 * 
-	 * TODO this should be package-protected but until in same package as cache controller it is public.
-	 * @since 1.2.0
-	 */
-	public synchronized void projectCleaned() {
-		// On a clean we will reset the counters.
-		registryPrematureTerminateCount = 0;
-		registryLastPrematureTerminateTime = NO_PREMATURE_TERMINATE_TIME;
-	}
-	
-	public synchronized boolean isRegistryCreated() {
-		return fRegistry != null;
-	}
-	
-	/**
-	 * Check to see if the nature is still valid. If the project has been
-	 * renamed, the nature is still around, but the project has been closed.
-	 * So the nature is now invalid.
-	 * 
-	 * @return Is this a valid nature. I.e. is the project still open.
-	 */
-	public boolean isValidNature() {
-		return fProject != null;
-	}
-
-	/**
-	 * Set the search path onto the registry.
-	 */
-	protected void setProxySearchPath(ProxyFactoryRegistry registry, List searchPaths) {
-		if (searchPaths != null) {
-			String[] stringSearchPath = (String[]) searchPaths.toArray(new String[searchPaths.size()]);
-			Utilities.setBeanInfoSearchPath(registry, stringSearchPath);
-		} else
-			Utilities.setBeanInfoSearchPath(registry, null);
-	}
-
-	private static final String ENCODING = "UTF-8"; //$NON-NLS-1$
-	static final String sBeaninfos = "beaninfos"; // Root element name //$NON-NLS-1$
-	/**
-	 * Get the persistent search path. It is copy.
-	 */
-	public BeaninfosDoc getSearchPath() {
-		BeaninfosDoc bdoc = null;
-		try {
-			InputStream property = getSharedProperty(P_BEANINFO_SEARCH_PATH);
-			if (property != null) {
-				try {
-					// Need to reconstruct from the XML format.
-					Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new InputStreamReader(property, ENCODING)));
-					Element root = doc.getDocumentElement();
-					if (root != null && root.getNodeName().equalsIgnoreCase(sBeaninfos)) {
-						bdoc = BeaninfosDoc.readEntry(new DOMReader(), root, getProject());
-					}
-				} finally {
-					try {
-						property.close();
-					} catch (IOException e) {
-					}
-				}
-			}
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		} catch (Exception e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "", e)); //$NON-NLS-1$
-		}
-		return bdoc;
-	}
-
-	/**
-	 * Set the persistent search path. No progress monitor.
-	 */
-	public void setSearchPath(BeaninfosDoc searchPath) throws CoreException {
-		setSearchPath(searchPath, null);
-	}
-
-	/**
-	 * Set the persistent search path with a progress monitor
-	 */
-	public void setSearchPath(BeaninfosDoc searchPath, IProgressMonitor monitor) throws CoreException {
-		String property = null;
-		if (searchPath != null && searchPath.getSearchpath().length > 0) {
-			try {
-				Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-				Element root = doc.createElement(sBeaninfos); // Create Root Element
-				IBeaninfosDocEntry[] entries = searchPath.getSearchpath();
-				for (int i = 0; i < entries.length; i++)
-					root.appendChild(entries[i].writeEntry(doc, getProject())); // Add to the search path
-				doc.appendChild(root); // Add Root to Document
-				StringWriter strWriter = new StringWriter();
-
-				Result result = new StreamResult(strWriter);
-				Source source = new DOMSource(doc);
-				Transformer transformer = TransformerFactory.newInstance().newTransformer();
-				transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
-				transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
-				transformer.transform(source, result);
-				property = strWriter.toString();
-			} catch (TransformerConfigurationException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			} catch (TransformerException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			} catch (ParserConfigurationException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			} catch (FactoryConfigurationError e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			}
-		}
-
-		if (property != null) {
-			// If it hasn't changed, don't write it back out. This is so that if the file hasn't
-			// been checked out and it is the same, we don't want to bother the user. This is because
-			// we don't know if the user had simply browsed the search path or had actually changed and
-			// set it back to what it was. In either of those cases it would be a bother to ask the
-			// user to checkout the file.
-			InputStream is = getSharedProperty(P_BEANINFO_SEARCH_PATH);
-			if (is != null) {
-				try {
-					try {
-						InputStreamReader reader = new InputStreamReader(is, ENCODING);
-						char[] chars = new char[1000];
-						StringBuffer oldProperty = new StringBuffer(1000);
-						int read = reader.read(chars);
-						while (read != -1) {
-							oldProperty.append(chars, 0, read);
-							read = reader.read(chars);
-						}
-						if (oldProperty.toString().equals(property))
-							return;
-					} catch (IOException e) {
-					} // Didn't change.
-				} finally {
-					try {
-						is.close();
-					} catch (IOException e) {
-					}
-				}
-			}
-			setSharedProperty(P_BEANINFO_SEARCH_PATH, property, monitor);
-		} else
-			removeSharedProperty(P_BEANINFO_SEARCH_PATH, monitor);
-	}
-
-	/**
-	 * Return the resource set for all java packages in this nature.
-	 */
-	public ResourceSet getResourceSet() {
-		return javaRSet;
-	}
-
-	protected void markAllStale() {
-		// Mark all stale so that the registry will be recycled.
-		if (fRegistry != null) {
-			// We have a registry running, we need to indicate recycle is needed.
-			fSynchronizer.getAdapterFactory().markAllStale();
-			// Mark all stale. Next time we need anything it will be recycled.
-		}
-	}
-
-	/**
-	 * Compute the file name to use for a given shared property
-	 */
-	protected String computeSharedPropertyFileName(QualifiedName qName) {
-		return qName.getLocalName();
-	}
-
-	/**
-	 * Retrieve a shared property on a project. If the property is not defined, answers null.
-	 * Note that it is orthogonal to IResource persistent properties, and client code has to decide
-	 * which form of storage to use appropriately. Shared properties produce real resource files which
-	 * can be shared through a VCM onto a server. Persistent properties are not shareable.
-	 *
-	 */
-	protected InputStream getSharedProperty(String propertyFileName) throws CoreException {
-		IFile rscFile = getProject().getFile(propertyFileName);
-		if (rscFile.exists())
-			return rscFile.getContents(true);
-		else
-			return null;
-	}
-
-	/**
-	 * Record a shared persistent property onto a project.
-	 * Note that it is orthogonal to IResource persistent properties, and client code has to decide
-	 * which form of storage to use appropriately. Shared properties produce real resource files which
-	 * can be shared through a VCM onto a server. Persistent properties are not shareable.
-	 * 
-	 * shared properties end up in resource files, and thus cannot be modified during
-	 * delta notifications (a CoreException would then be thrown).
-	 * 
-	 */
-	protected void setSharedProperty(String propertyName, String value, IProgressMonitor monitor) throws CoreException {
-
-		try {
-			IFile rscFile = getProject().getFile(propertyName);
-			InputStream input = new ByteArrayInputStream(value.getBytes(ENCODING));
-			// update the resource content
-			if (rscFile.exists()) {
-				rscFile.setContents(input, true, false, null);
-			} else {
-				rscFile.create(input, true, monitor);
-			}
-		} catch (UnsupportedEncodingException e) {
-		}
-	}
-
-	/**
-	 * Remove a shared persistent property onto a project.
-	 * Note that it is orthogonal to IResource persistent properties, and client code has to decide
-	 * which form of storage to use appropriately. Shared properties produce real resource files which
-	 * can be shared through a VCM onto a server. Persistent properties are not shareable.
-	 * 
-	 * shared properties end up in resource files, and thus cannot be modified during
-	 * delta notifications (a CoreException would then be thrown).
-	 * 
-	 */
-	protected void removeSharedProperty(String propertyName, IProgressMonitor monitor) throws CoreException {
-
-		IFile rscFile = getProject().getFile(propertyName);
-		rscFile.delete(true, true, monitor);
-	}
-
-	/**
-	 * Return a configuration contributor that sets up a vm to allow
-	 * introspection. This will make sure the appropriate paths
-	 * are in the classpath to allow access to the beaninfos, and
-	 * it will setup the beaninfo search path for this project.
-	 */
-	public IConfigurationContributor getConfigurationContributor() {
-		return new ConfigurationContributor(getSearchPath());
-	}
-
-	private void prematureRegistryTerminate() {
-		synchronized(BeaninfoNature.this) {
-			registryPrematureTerminateCount++;
-			registryLastPrematureTerminateTime = System.currentTimeMillis();
-		}
-	}
-
-	private static class ConfigurationContributor extends ConfigurationContributorAdapter {
-
-		private BeaninfosDoc doc;
-		List computedSearchPath;
-				
-		// The nature. If the nature is not set then this contributor is one
-		// used by some other later proxy registry to get the beaninfo classes into their paths. In that case
-		// we can expect the config info to be in the session variable for our use. Otherwise we will need to
-		// add it here. Also don't set searchpath stuff if not nature because only the beaninfo one will do introspection.
-		private BeaninfoNature nature;	
-		
-		private IConfigurationContributionInfo info;
-		private IBeanInfoContributor[] explicitContributors;
-
-		public ConfigurationContributor(BeaninfosDoc doc) {
-			this.doc = doc;
-		}
-
-		/*
-		 * Set that this is the nature contributor. Not null, means that this is the contributor being
-		 * used to setup the registry for the project's beaninfo nature. null (default) means that this
-		 * is one created to add to some editor's registry.
-		 * 
-		 * Note: This MUST be set before initialize is called or it will not work correctly. If not set, it 
-		 * will be considered not for BeanInfo nature directly.
-		 */
-		public void setNature(BeaninfoNature nature) {
-			this.nature = nature;
-			if (nature != null)
-				computedSearchPath = new ArrayList(3);	// We will be gathering this info.
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#initialize(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
-		 */
-		public void initialize(IConfigurationContributionInfo info) {
-			this.info = info;
-			try {
-				if (info.getJavaProject().getProject().getSessionProperty(CONFIG_INFO_SESSION_KEY) == null) {
-					// TODO For now we will rebuild for each time we open a registry, but it actually is only needed if a classpath
-					// changes for some reason. At that point we can get it out of here.
-					
-					computeBeanInfoConfigInfo(info);					
-				} 
-				explicitContributors = (IBeanInfoContributor[]) info.getJavaProject().getProject().getSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY);
-			} catch (CoreException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			}
-		}
-		
-		public void contributeClasspaths(final IConfigurationContributionController controller) throws CoreException {
-			// Contribute for this project
-			contributeClasspathsForProject(controller, info.getJavaProject().getProject(), doc, true);
-						
-			if (!info.getProjectPaths().isEmpty()) {
-				// Run through all of the visible projects and contribute the classpaths (which come from the BeanInfo docs, if they have any).
-				IWorkspaceRoot root = info.getJavaProject().getProject().getWorkspace().getRoot();
-				Iterator projIter = info.getProjectPaths().entrySet().iterator();
-				while (projIter.hasNext()) {
-					Map.Entry entry = (Map.Entry) projIter.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						IResource res = root.findMember((IPath) entry.getKey());
-						if (res instanceof IProject && ((IProject) res).isOpen() && BeaninfoNature.hasRuntime((IProject) res))
-							contributeClasspathsForProject(controller, (IProject) res, BeaninfoNature.getRuntime((IProject) res)
-									.getSearchPath(), false);
-					}
-				}
-			}			
-			
-			if (!info.getContainerIds().isEmpty()) {
-				// Run through all of the visible container ids that are applicable.
-				Iterator containerIdItr = info.getContainerIds().values().iterator();
-				while (containerIdItr.hasNext()) {
-					ContainerPaths containerPaths = (ContainerPaths) containerIdItr.next();
-					processBeaninfoEntries(BeaninfoPlugin.getPlugin().getContainerIdBeanInfos(containerPaths.getContainerId(), containerPaths.getVisibleContainerPaths()),
-							controller, info.getJavaProject());
-				}
-				
-			}
-			
-			if (!info.getPluginIds().isEmpty()) {
-				// Run through all of the visible plugin ids that are applicable.
-				Iterator pluginIdItr = info.getPluginIds().entrySet().iterator();
-				while (pluginIdItr.hasNext()) {
-					Map.Entry entry = (Map.Entry) pluginIdItr.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						processBeaninfoEntries(BeaninfoPlugin.getPlugin().getPluginBeanInfos((String) entry.getKey()), controller, info.getJavaProject());
-					}
-				}
-				
-			}
-			
-			if (!info.getContainers().isEmpty()) {
-				// Run through all of the visible containers that implement IBeanInfoContributor and ask them for the contributions.
-				Iterator containerItr = info.getContainers().entrySet().iterator();
-				while (containerItr.hasNext()) {
-					Map.Entry entry = (Map.Entry) containerItr.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						if (entry.getKey() instanceof IBeanInfoContributor)
-							processBeaninfoEntries(((IBeanInfoContributor) entry.getKey()).getBeanInfoEntryContributions(info),
-									controller, info.getJavaProject());
-					}
-				}
-				
-			}			
-				
-			// And finally run through the explicit contributors.				
-			for (int i = 0; i < explicitContributors.length; i++) {
-				final IBeanInfoContributor contributor = explicitContributors[i];
-				processBeaninfoEntries(contributor.getBeanInfoEntryContributions(info), controller, info.getJavaProject());
-				if (contributor instanceof IConfigurationContributor) {
-					SafeRunner.run(new ISafeRunnable() {
-						public void handleException(Throwable exception) {
-							// do nothing. by default platform logs.
-						}
-
-						public void run() throws Exception {;
-							if (contributor instanceof IConfigurationContributor)
-								((IConfigurationContributor) contributor).contributeClasspaths(controller);
-						}
-					});
-				}
-			}
-			
-			// Add the common to the end of the classpath. (Since we are now a jarred plugin, the common is not the plugin jar itself).
-			controller.contributeClasspath(BeaninfoPlugin.getPlugin().getBundle(), (IPath) null, IConfigurationContributionController.APPEND_USER_CLASSPATH, false); //$NON-NLS-1$
-			
-			// Add the beaninfovm.jar and any nls to the end of the classpath.
-			controller.contributeClasspath(BeaninfoPlugin.getPlugin().getBundle(), "vm/beaninfovm.jar", IConfigurationContributionController.APPEND_USER_CLASSPATH, true); //$NON-NLS-1$
-		}
-
-		private IClasspathEntry get(IClasspathEntry[] array, SearchpathEntry se) {
-			for (int i = 0; i < array.length; i++) {
-				if (array[i].getEntryKind() == se.getKind() && array[i].getPath().equals(se.getPath()))
-					return array[i];
-			}
-			return null;
-		}
-
-		private static final IBeaninfosDocEntry[] EMPTY_ENTRIES = new IBeaninfosDocEntry[0];
-		
-		/*
-		 * Contribute classpaths for the specified project. If doc is passed in, then this is the top level and
-		 * all should be added. If no doc, then this is pre-req'd project, and then we will handle exported entries only.
-		 */
-		protected void contributeClasspathsForProject(
-			IConfigurationContributionController controller,
-			IProject project,
-			BeaninfosDoc doc,
-			boolean toplevelProject)
-			throws CoreException {
-			
-			IJavaProject jProject = JavaCore.create(project);
-			IClasspathEntry[] rawPath = jProject.getRawClasspath();
-
-			// Search path of this project
-			IBeaninfosDocEntry[] entries = (doc != null) ? doc.getSearchpath() : EMPTY_ENTRIES;
-
-			for (int i = 0; i < entries.length; i++) {
-				IBeaninfosDocEntry entry = entries[i];
-				if (entry instanceof BeaninfoEntry) {
-					BeaninfoEntry be = (BeaninfoEntry) entry;
-					if (toplevelProject || be.isExported()) {
-						// First project or this is an exported beaninfo, so we process it.
-						processBeaninfoEntry(be, controller, jProject);
-					}
-				} else if (nature != null){
-					// Just a search path entry. There is no beaninfo jar to pick up.
-					// We have a nature, so we process search path.
-					SearchpathEntry se = (SearchpathEntry) entry;
-					if (!toplevelProject) {
-						// We are in a nested project, find the raw classpath entry to see
-						// if this entry is exported. Only do it if exported. (Note: exported is only used on non-source. Source are always exported).
-						IClasspathEntry cpe = get(rawPath, se);
-						if (cpe == null || (cpe.getEntryKind() != IClasspathEntry.CPE_SOURCE && !cpe.isExported())) {
-							continue; // Not exist or not exported, so we don't want it here either.
-						}
-					}
-
-					String pkg = se.getPackage();
-					if (pkg != null) {
-						// Explicit search path
-						if (!computedSearchPath.contains(pkg))
-							computedSearchPath.add(pkg);
-					} else {
-						// We no longer allow this, but just to be on safe side we test for it.
-					}
-				}
-			}
-		}
-
-		protected void processBeaninfoEntries(
-			BeaninfoEntry[] entries,
-			IConfigurationContributionController controller,
-			IJavaProject javaProject)
-			throws CoreException {
-			if (entries != null) {
-				for (int i = 0; i < entries.length; i++)
-					processBeaninfoEntry(entries[i], controller, javaProject);
-			}
-		}
-
-		protected void processBeaninfoEntry(
-			BeaninfoEntry entry,
-			IConfigurationContributionController controller,
-			IJavaProject javaProject)
-			throws CoreException {
-			Object[] cps = entry.getClasspath(javaProject);
-			for (int j = 0; j < cps.length; j++) {
-				Object cp = cps[j];
-				if (cp instanceof IProject)
-					controller.contributeProject((IProject) cp);
-				else if (cp instanceof String)
-					controller.contributeClasspath(ProxyLaunchSupport.convertStringPathToURL((String) cp), IConfigurationContributionController.APPEND_USER_CLASSPATH);
-				else if (cp instanceof IPath) {
-					IPath path = (IPath) cp;
-					Bundle bundle = Platform.getBundle(path.segment(0));
-					if (bundle != null)
-						controller.contributeClasspath(bundle, path.removeFirstSegments(1), IConfigurationContributionController.APPEND_USER_CLASSPATH, true);
-				}
-			}
-
-			if (nature != null) {
-				// Now add in the package names.
-				SearchpathEntry[] sees = entry.getSearchPaths();
-				for (int j = 0; j < sees.length; j++) {
-					SearchpathEntry searchpathEntry = sees[j];
-					if (!computedSearchPath.contains(searchpathEntry.getPackage()))
-						computedSearchPath.add(searchpathEntry.getPackage());
-				}
-			}
-		}
-
-		public void contributeToConfiguration(final ILaunchConfigurationWorkingCopy config) {
-			for (int i = 0; i < explicitContributors.length; i++) {
-				final int ii = i;
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// do nothing. by default platform logs.
-					}
-
-					public void run() throws Exception {
-						IBeanInfoContributor contributor = explicitContributors[ii];
-						if (contributor instanceof IConfigurationContributor)
-							((IConfigurationContributor) contributor).contributeToConfiguration(config);
-					}
-				});
-			}			
-		}
-
-		public void contributeToRegistry(final ProxyFactoryRegistry registry) {
-			if (nature != null)
-				nature.setProxySearchPath(registry, computedSearchPath);
-			for (int i = 0; i < explicitContributors.length; i++) {
-				final int ii = i;
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// do nothing. by default platform logs.
-					}
-
-					public void run() throws Exception {
-						IBeanInfoContributor contributor = explicitContributors[ii];
-						if (contributor instanceof IConfigurationContributor)
-							((IConfigurationContributor) contributor).contributeToRegistry(registry);
-					}
-				});
-			}			
-		}
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java
deleted file mode 100644
index a9a0b8114..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java
+++ /dev/null
@@ -1,107 +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.adapters;
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-
-/**
- * This holds the proxy constants for access in beaninfo. It is created on a per-registry basis and stored in the constants section of the registry so
- * that they can be accessed as needed.
- * <p>
- * To gain access to these constants, use the static accessor method "getConstants()" so that the instance is not created until actually needed.
- * 
- * @since 1.0.0
- */
-public final class BeaninfoProxyConstants {
-
-	private static final Object REGISTRY_KEY = new Object();
-
-	private final IMethodProxy introspectProxy;
-
-	private final IMethodProxy getBeanInfoSearchPathProxy;
-
-	private final IMethodProxy setBeanInfoSearchPathProxy;
-
-	private final IMethodProxy sendBeanInfoProxy;
-
-	/**
-	 * Get the constants instance for the specified registry.
-	 */
-	public static BeaninfoProxyConstants getConstants(ProxyFactoryRegistry registry) {
-		if (registry != null && registry.isValid()) {
-			BeaninfoProxyConstants constants = (BeaninfoProxyConstants) registry.getConstants(REGISTRY_KEY);
-			if (constants == null)
-				registry.registerConstants(REGISTRY_KEY, constants = new BeaninfoProxyConstants(registry));
-			return constants;
-		} else
-			return null;
-	}
-
-	private BeaninfoProxyConstants(ProxyFactoryRegistry registry) {
-
-		IStandardBeanTypeProxyFactory typeFactory = registry.getBeanTypeProxyFactory();
-
-		IBeanTypeProxy introspector = typeFactory.getBeanTypeProxy("java.beans.Introspector"); //$NON-NLS-1$
-		getBeanInfoSearchPathProxy = introspector.getMethodProxy("getBeanInfoSearchPath"); //$NON-NLS-1$
-		setBeanInfoSearchPathProxy = introspector.getMethodProxy("setBeanInfoSearchPath", "[Ljava.lang.String;"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IBeanTypeProxy modelingBeaninfo = typeFactory.getBeanTypeProxy("org.eclipse.jem.internal.beaninfo.vm.ModelingBeanInfo");//$NON-NLS-1$
-		introspectProxy = modelingBeaninfo.getMethodProxy("introspect", new String[] { "java.lang.Class", "boolean", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
-		sendBeanInfoProxy = modelingBeaninfo.getMethodProxy("send"); //$NON-NLS-1$
-
-	}
-
-	/**
-	 * Get the sendBeanDecorator method proxy from ModelingBeanInfo.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy getSendBeanInfoProxy() {
-		return sendBeanInfoProxy;
-	}
-	
-	/**
-	 * Get the getBeanInfoSearchPath method proxy from Introspector.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getGetBeanInfoSearchPathProxy() {
-		return getBeanInfoSearchPathProxy;
-	}
-
-	/**
-	 * Get the setBeanInfoSearchPath method proxy from Introspector.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getSetBeanInfoSearchPathProxy() {
-		return setBeanInfoSearchPathProxy;
-	}
-
-	/**
-	 * Get the introspect method proxy from ModelingBeanInfo.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy getIntrospectProxy() {
-		return introspectProxy;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java
deleted file mode 100644
index 0d0493b6e..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java
+++ /dev/null
@@ -1,118 +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.adapters;
-/*
-
-
- */
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.impl.ESuperAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-
-/**
- * Used to know when events or any of the super classes change so
- * that we can re-construct our all events list next time we need it.
- * @version 	1.0
- * @author
- */
-public class BeaninfoSuperAdapter extends AdapterImpl {
-
-	public static final Class ADAPTER_KEY = BeaninfoSuperAdapter.class;
-
-	private boolean allEventsCollectionModified = true;
-	private boolean allPropertiesCollectionModified = true;
-	private boolean allOperationsCollectionModified = true;
-
-	public BeaninfoSuperAdapter() {
-		super();
-	}
-
-	public void notifyChanged(Notification msg) {
-		if (msg.getEventType() != Notification.REMOVING_ADAPTER)
-			setFlags(msg.getFeatureID(JavaClass.class));
-	}
-
-	public boolean isAllEventsCollectionModified() {
-		return allEventsCollectionModified;
-	}
-
-	public void setAllEventsCollectionModified(boolean newEventsModified) {
-		allEventsCollectionModified = newEventsModified;
-	}
-
-	public boolean isAllOperationsCollectionModified() {
-		return allOperationsCollectionModified;
-	}
-
-	public void setAllOperationsCollectionModified(boolean newOperationsModified) {
-		allOperationsCollectionModified = newOperationsModified;
-	}
-	
-	public void setAllPropertiesCollectionModified(boolean allPropertiesCollectionModified) {
-		this.allPropertiesCollectionModified = allPropertiesCollectionModified;
-	}
-
-	public boolean isAllPropertiesCollectionModified() {
-		return allPropertiesCollectionModified;
-	}
-	
-	public Collection getSubclasses() {
-		// Get them from the ESuperAdapter. Easiest to do.
-		ESuperAdapter ea = ((JavaClassImpl) getTarget()).getESuperAdapter();
-		return ea.getSubclasses();
-	}
-
-	public boolean isAdapterForType(Object type) {
-		return ADAPTER_KEY.equals(type);
-	}
-
-	void setFlags(int featureId) {
-		switch (featureId) {
-			case JavaRefPackage.JAVA_CLASS__EVENTS :
-				setAllEventsCollectionModified(true);
-				break;
-				
-			case JavaRefPackage.JAVA_CLASS__EOPERATIONS:
-				setAllOperationsCollectionModified(true);
-				break;
-
-			case JavaRefPackage.JAVA_CLASS__ESUPER_TYPES:
-				setAllEventsCollectionModified(true);
-				setAllPropertiesCollectionModified(true);
-				break;				
-				
-			case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES:
-				setAllPropertiesCollectionModified(true);
-				break;
-				
-			default :
-				break;
-		}
-		Iterator i = getSubclasses().iterator();
-		while (i.hasNext()) {
-			Notifier n = (Notifier) i.next();
-			BeaninfoSuperAdapter a = (BeaninfoSuperAdapter) EcoreUtil.getExistingAdapter(n, ADAPTER_KEY);
-			if (a != null)
-				a.setFlags(featureId);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
deleted file mode 100644
index e7a5c582e..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
+++ /dev/null
@@ -1,165 +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.beaninfo.adapters;
-
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.*;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
- 
-
-/**
- * This class is used by BeaninfoNature to handle the creation of the registry,
- * This class will be a singleton. It is needed to handle if UI active without
- * requiring UI plugin. (So headless will work too). The subclass <code>UICreateRegistryJobHandler</code>
- * will be instantiated in case of UI active.
- * @since 1.0.0
- */
-class CreateRegistryJobHandler {
-	private static CreateRegistryJobHandler jobHandler = null;
-	
-	public static void createRegistry(BeaninfoNature nature) {
-		synchronized (CreateRegistryJobHandler.class) {
-			if (jobHandler == null) {
-				if (Platform.getBundle("org.eclipse.ui") != null) {	//$NON-NLS-1$
-					try {
-						// There is a UI, it may not be active, but bring in UICreateRegistryJobHandler to do the
-						// actual work since it can reference the UI.
-						jobHandler = (CreateRegistryJobHandler) Class.forName("org.eclipse.jem.internal.beaninfo.adapters.UICreateRegistryJobHandler").newInstance(); //$NON-NLS-1$
-					} catch (InstantiationException e) {
-						jobHandler = new CreateRegistryJobHandler();
-					} catch (IllegalAccessException e) {
-						jobHandler = new CreateRegistryJobHandler();
-					} catch (ClassNotFoundException e) {
-						jobHandler = new CreateRegistryJobHandler();
-					}
-				}
-			}
-		}
-		
-		// See if Autobuild sleeping or waiting. This could be a race condition for us. We can't wait for it
-		// because we may already have the build rule locked by our thread. No way of testing this if beginRule was used.
-		// We can test if we are a build job (not an inline build), and if so, just go on.
-		// Maybe we can figure out in future if we find race condition happens significant amount of time.
-		IJobManager jobManager = Job.getJobManager();
-		Job currentJob = jobManager.currentJob();
-		if (currentJob == null || (!currentJob.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD) && !currentJob.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD))) {
-			// See if autojob is waiting or sleeping.
-			// Give it up to a second at .2 second intervals to try (i.e. 5 tries)
-			int tries = 5;
-			while (isAutoWaiting() && --tries>0) {
-				try {
-					Thread.sleep(200);	// Wait just .2 seconds to give build a chance to start. If it is still not started, then just go on.
-				} catch (InterruptedException e) {
-				}
-			}
-			if (tries==0) {
-				Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-				if (logger.isLoggingLevel(Level.WARNING))
-					logger.log("Build job waiting when trying to start beaninfo registry. Possible race.", Level.WARNING);	// $NON-NLS-1$ //$NON-NLS-1$
-			}
-		}
-		
-		jobHandler.processCreateRegistry(nature);
-	}
-
-	private static boolean isAutoWaiting() {
-		Job[] autojobs = Job.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD);
-		for (int i = 0; i < autojobs.length; i++) {
-			int state = autojobs[i].getState();
-			if (state == Job.WAITING || state == Job.SLEEPING) 
-				return true;
-		}
-		return false;
-	}
-
-	
-	/**
-	 * Process the create of the registry. This should be overridden to
-	 * do what the UI needs. The UI implimentation should call doCreateRegistry at the
-	 * appropriate time.
-	 * 
-	 * @param nature
-	 * 
-	 * @since 1.0.0
-	 */
-	protected void processCreateRegistry(final BeaninfoNature nature) {
-		IJobManager jobManager = Job.getJobManager();
-		ISchedulingRule buildRule = ResourcesPlugin.getWorkspace().getRuleFactory().buildRule();
-		boolean gotRuleLocally = true;
-		try {
-			try {
-				jobManager.beginRule(buildRule, new NullProgressMonitor());
-			} catch (IllegalArgumentException e) {
-				gotRuleLocally = false;	// This thread already had a rule, and it conflicted with the build rule, so we need to spawn off.
-			}
-			if (gotRuleLocally)
-				doCreateRegistry(nature, new NullProgressMonitor());
-		} finally {
-			jobManager.endRule(buildRule);	// Whether we got the rule or not, we must do endrule.
-		}
-		
-		if (!gotRuleLocally) {
-			// Spawn off to a job and wait for it. Hopefully we don't have a deadlock somewhere.
-			Job doCreateJob = new Job(BeanInfoAdapterMessages.UICreateRegistryJobHandler_StartBeaninfoRegistry) { 
-
-				protected IStatus run(IProgressMonitor monitor) {
-					doCreateRegistry(nature, monitor);
-					return Status.OK_STATUS;
-				}
-			};
-			doCreateJob.schedule();
-			while (true) {
-				try {
-					doCreateJob.join();
-					break;
-				} catch (InterruptedException e) {
-				}
-			}
-		}
-	}
-		
-	/*
-	 * Do the creation. It is expected that the build rule has already been given to this thread.
-	 * It is important that the build rule be given to this thread. This is so that a build won't
-	 * start trying to create the same registry (which has happened in the past) at the same time
-	 * a different thread was trying to start the registry. You would either have a deadlock, or 
-	 * a race and get two different registries started.
-	 * 
-	 * The build rule also means that all beaninfo registry creations will be serialized and have
-	 * a race condition. The unfortunate part is that two independent project's registries can't be
-	 * created at same time. But that is the result of the build rule. We can't allow the builds, so
-	 * we need to stop all parallel beaninfo registry creations.
-	 * 
-	 * @param nature
-	 * @param pm
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void doCreateRegistry(BeaninfoNature nature, IProgressMonitor pm) {
-		pm.beginTask("", 100);	//$NON-NLS-1$
-		try {
-			nature.createRegistry(new SubProgressMonitor(pm, 100));	
-		} finally {
-			pm.done();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java
deleted file mode 100644
index aa813c933..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java
+++ /dev/null
@@ -1,73 +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.adapters;
-/*
-
-
- */
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-
-/**
- * The internal class for reading dom elements.
- * @version 	1.0
- * @author
- */
-class DOMReader implements IReader {
-	
-	/*
-	 * @see IReader#getChildren(Object)
-	 */
-	public Object getChildren(Object node) {
-		return (node instanceof Node) ? ((Node) node).getChildNodes() : null;
-	}
-	
-	
-	/*
-	 * @see IReader#getLength(Object)
-	 */
-	public int getLength(Object nodeList) {
-		return (nodeList instanceof NodeList) ? ((NodeList) nodeList).getLength() : 0;
-	}
-
-	/*
-	 * @see IReader#getItem(Object, int)
-	 */
-	public Object getItem(Object nodeList, int index) {
-		return (nodeList instanceof NodeList) ? ((NodeList) nodeList).item(index) : null;
-	}
-
-	/*
-	 * @see IReader#isNodeTypeElement(Object)
-	 */
-	public boolean isNodeTypeElement(Object node) {
-		return (node instanceof Node) ? ((Node) node).getNodeType() == Node.ELEMENT_NODE : false;
-	}
-
-	/*
-	 * @see IReader#getNodeName(Object)
-	 */
-	public String getNodeName(Object node) {
-		return (node instanceof Node) ? ((Node) node).getNodeName() : ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * @see IReader#getAttribute(Object, String)
-	 */
-	public String getAttribute(Object element, String attributeName) {
-		return (element instanceof Element) && ((Element) element).hasAttribute(attributeName) ? ((Element) element).getAttribute(attributeName) : null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java
deleted file mode 100644
index d63832048..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java
+++ /dev/null
@@ -1,32 +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.adapters;
-/*
-
-
- */
-/**
- * This is internal interface for reading beaninfoConfig either through IConfigurationElements or
- * w3.dom.Nodes. This is because when reading the .beaninfoConfig we will be using Nodes, but
- * when reading configs from registered extensions they will be IConfigurationElements.
- * @version 	1.0
- * TODO Need to move to core when we make things API.
- */
-public interface IReader {
-	
-	public Object getChildren(Object node);
-	public int getLength(Object nodeList);
-	public Object getItem(Object nodeList, int index);
-	public boolean isNodeTypeElement(Object node);	// Is this an element type node
-	public String getNodeName(Object node);
-	public String getAttribute(Object element, String attributeName);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
deleted file mode 100644
index e00ef522d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
+++ /dev/null
@@ -1,44 +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.adapters;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * A Special resource set that is used to link together to the beaninfo
- * nature's resource set and makes sure that any request for a new "java:/..."
- * JavaClass is redirected to the beaninfo nature's resource set. Otherwise
- * the classes will be all over the place and not all gathered in one place.
- * 
- * *package* protected because no one should create one of these. They are
- * returned by the BeaninfoNature.newResourceSet() request.
- * 
- * @version 	1.0
- * @author
- */
-class SpecialResourceSet extends ProjectResourceSetImpl {
-
-	/**
-	 * Constructor for SpecialResourceSet.
-	 * @param aProject
-	 */
-	public SpecialResourceSet() {
-		super(null);
-		JEMUtilPlugin.getSharedCache().stopListening(this);	// We don't care about listening.
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java
deleted file mode 100644
index b41226f12..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java
+++ /dev/null
@@ -1,106 +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.beaninfo.adapters;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.*;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
-
-/**
- * This is the version which can actually reference and use the UI classes. It won't be loaded except if ui plugin is available.
- * 
- * It will check to see if UI is running, and if it is not, then let super class handle. If it is running, then if this is the UI thread, do special
- * but run in ui, else if not then let super handle it normally.
- * 
- * @since 1.0.0
- */
-class UICreateRegistryJobHandler extends CreateRegistryJobHandler {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.beaninfo.adapters.CreateRegistryJobHandler#processCreateRegistry(org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature)
-	 */
-	protected void processCreateRegistry(final BeaninfoNature nature) {
-		if (PlatformUI.isWorkbenchRunning()) {
-			if (Display.getCurrent() == null)
-				super.processCreateRegistry(nature); // We are not in the UI thread. Do normal.
-			else {
-				IProgressService ps = PlatformUI.getWorkbench().getProgressService();
-				final ISchedulingRule buildRule = ResourcesPlugin.getWorkspace().getRuleFactory().buildRule();
-				// First find out if we already have the build rule. If we do, we MUST run in the UI thread. Have no option, can't transfer the
-				// rule to the thread and then back to us when done.
-				// This means a busy cursor instead of a possible progress dialog to keep the UI active. Only possible deadlock
-				// situation is if some other thread has the build rule (other than the build) and is doing an asyncExec or
-				// is waiting on something from the UI thread.
-				final IJobManager jobManager = Job.getJobManager();
-				Job currentJob = jobManager.currentJob();
-				if (currentJob == null || currentJob.getRule() == null || !currentJob.getRule().contains(buildRule)) {
-					// UI is not in a job, or it is and there is no rule, or there is a rule and it is not compatible with the buildRule.
-					// In that case we need to run in another thread. That is so that we can put up a progress dialog if it takes
-					// too long. 
-					// If no rule then we can't run in UI because some other job may have the rule, and there is no way to test
-					// for this. So we don't want to block the UI entirely waiting for the rule, so we can use progress dialog
-					// for this. Also if we have a rule and it conflicts with build rule then we should also go to another thread.
-					// busyCursorWhile will do this. It will run the create in another thread but keep the UI responsive with
-					// progress dialog after a "long operation" timeout.
-					try {
-						ps.busyCursorWhile(new IRunnableWithProgress() {
-	
-							public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-								monitor.beginTask("", 200); //$NON-NLS-1$
-								try {
-									jobManager.beginRule(buildRule, new SubProgressMonitor(monitor, 100));
-									doCreateRegistry(nature, new SubProgressMonitor(monitor, 100));
-								} finally {
-									jobManager.endRule(buildRule);
-									monitor.done();
-								}
-							}
-						});
-					} catch (InterruptedException e1) {
-					} catch (InvocationTargetException e2) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e2.getCause(), Level.WARNING);
-					}
-				} else {
-					// We are a job in the UI and we have or can contain the build rule. Therefor we must run in the UI thread itself. Otherwise
-					// there will be a deadlock because we have the build rule and the other thread won't be able to get it.
-					// Note: There is ProgressService.runInUI() but that guy is complicated with some interactions I'm not sure about. Safer to do this.
-					BusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
-						public void run() {
-							try {
-								jobManager.beginRule(buildRule, new NullProgressMonitor());
-								doCreateRegistry(nature, new NullProgressMonitor());
-							} finally {
-								jobManager.endRule(buildRule);
-							}
-						}
-					});
-				}
-			}
-		} else
-			super.processCreateRegistry(nature); // Workbench not running, do default.
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties
deleted file mode 100644
index 79ff64c3d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties
+++ /dev/null
@@ -1,19 +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
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties,v $
-# $Revision: 1.6 $  $Date: 2005/08/24 20:31:29 $
-#
-
-INTROSPECT_FAILED_EXC_                           = IWAV0155E Introspection failed on class "{0}." msg="{1}."
-BeaninfoClassAdapter_ClassNotFound               = Class not found
-BeaninfoNature_InvalidProject                    = Invalid project
-UICreateRegistryJobHandler_StartBeaninfoRegistry = Start Beaninfo registry
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java
deleted file mode 100644
index 31904a287..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java
+++ /dev/null
@@ -1,1603 +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.core;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.notify.*;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.change.impl.EObjectToChangesMapEntryImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin.CleanResourceChangeListener;
-
-/**
- * Controller of the BeanInfo cache. There is one per workspace (it is a static).
- * 
- * The cache is stored on a per IPackageFragmentRoot basis. Each package fragment root will be:
- * 
- * <pre>
- * 
- *  root{999}/classname.xmi
- *  
- * </pre>
- * 
- * "root{999}" will be a unigue name (root appended with a number}, one for each package fragment root. The "classname.xmi" will be the BeanInfo cache
- * for a class in the root. A root can't have more than one class with the same name, so there shouldn't be any collisions.
- * <p>
- * Now roots can either be in a project, or they can be an external jar (which can be shared between projects).
- * <p>
- * Now all roots for a project will be stored in the project's working location
- * {@link org.eclipse.core.resources.IProject#getWorkingLocation(java.lang.String)}under the ".cache" directory. It will be this format in each
- * project location (under the org.eclipse.jem.beaninfo directory):
- * 
- * <pre>
- * 
- *  .index
- *  root{999}/...
- *  
- * </pre>
- * 
- * The ".index" file will be stored/loaded through an ObjectStream. It will be a {@link BeanInfoCacheController.Index}. It is the index to all of the
- * root's in the directory.
- * <p>
- * All of the external jar roots will be stored in the org.eclipse.jem.beaninfo plugin's state location
- * {@link org.eclipse.core.runtime.Platform#getStateLocation(org.osgi.framework.Bundle)}under the ".cache" directory. The format of this directory
- * will be the same as for each project. And the roots will be for each unique shared external jar (such as the differnt jre's rt.jars).
- * <p>
- * Note: There are so many places where synchronization is needed, so it is decided to synchronize only on BeanInfoCacheController.INSTANCE. It would
- * be too easy to get a dead-lock because the order of synchronizations can't be easily controlled. Since each piece of sync control is very short
- * (except for save of the indices, but that is ok because we don't want them changing while saving) it shouldn't block a lot. There is one place we
- * violate this and that is we do a sync on ClassEntry instance when working with the pending. This is necessary because we don't want the cache write
- * job to hold up everything while writing, so we sync on the entry being written instead. There we must be very careful that we never to
- * BeanInfoCacheControler.INSTANCE sync and then a ClassEntry sync because we could deadlock. The CE access under the covers may do a CE sync and then
- * a BeanInfoCacheController.INSTANCE sync.
- * 
- * @since 1.1.0
- */
-public class BeanInfoCacheController {
-
-	/**
-	 * Singleton cache controller.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final BeanInfoCacheController INSTANCE = new BeanInfoCacheController();
-
-	private BeanInfoCacheController() {
-		// Start up save participent. This only is used for saving indexes and shutdown. Currently the saved state delta
-		// is of no interest. If a project is deleted while we were not up, then the project index would be gone, so
-		// our data will automatically be gone for the project. 
-		// If a class was deleted while the project's beaninfo was not active, the cache will still contain it. If the class ever came back it
-		// would be stale and so recreated. If it never comes back, until a clean is done, it would just hang around.
-		// The problem with delete is it is hard to determine that the file is actually a class of interest. The javamodel
-		// handles that for us but we won't have a javamodel to handle this on start up to tell us the file was a class of interest. So
-		// we'll take the hit of possible cache for non-existant classes. A clean will take care of this.
-		saveParticipant = new SaveParticipant();
-		try {
-			ResourcesPlugin.getWorkspace().addSaveParticipant(BeaninfoPlugin.getPlugin(), saveParticipant);
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		}
-		
-		// Create a cleanup listener to handle clean requests and project deletes. We need to know about project deletes while
-		// active because we may have a project index in memory and that needs to be thrown away.
-		JEMUtilPlugin.addCleanResourceChangeListener(new CleanResourceChangeListener() {
-		
-			protected void cleanProject(IProject project) {
-				// Get rid of the project index and the data for the project.
-				synchronized (BeanInfoCacheController.this) {
-					try {
-						Index projectIndex = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
-						if (projectIndex != null) {
-							project.setSessionProperty(PROJECT_INDEX_KEY, null);
-							projectIndex.markDead();
-							cleanDirectory(getCacheDir(project).toFile(), true);
-						}
-						BeaninfoNature nature = BeaninfoPlugin.getPlugin().getNature(project);
-						if (nature != null) {
-							nature.projectCleaned();
-							BeaninfoAdapterFactory adapterFactory = (BeaninfoAdapterFactory) EcoreUtil.getAdapterFactory(nature.getResourceSet().getAdapterFactories(), IIntrospectionAdapter.ADAPTER_KEY);
-							if (adapterFactory != null) {
-								adapterFactory.markAllStale(true);	// Also clear the overrides.
-							}
-						}						
-					} catch (CoreException e) {
-						// Shouldn't occur. 
-					}
-				}
-			}
-			
-			protected void cleanAll() {
-				synchronized(BeanInfoCacheController.this) {
-					// Get MAIN_INDEX, mark it dead, and then delete everything under it.
-					if (MAIN_INDEX != null) {
-						MAIN_INDEX.markDead();
-						MAIN_INDEX = null;
-						cleanDirectory(getCacheDir(null).toFile(), true);
-					}
-				}
-				super.cleanAll();
-			}
-			
-			public void resourceChanged(IResourceChangeEvent event) {
-				// We don't need to handle PRE_CLOSE because SaveParticipent project save will handle closing.
-				switch (event.getType()) {
-					case IResourceChangeEvent.PRE_DELETE:
-						// Don't need to clear the cache directory because Eclipse will get rid of it.
-						synchronized (BeanInfoCacheController.this) {
-							try {
-								Index projectIndex = (Index) event.getResource().getSessionProperty(PROJECT_INDEX_KEY);
-								if (projectIndex != null) {
-									// No need to remove from the project because the project is going away and will clean itself up.
-									projectIndex.markDead();
-								}
-							} catch (CoreException e) {
-								// Shouldn't occur.
-							}
-						}
-						// Flow into PRE_CLOSE to release the nature.
-					case IResourceChangeEvent.PRE_CLOSE:
-						// About to close or delete, so release the nature, if any.
-						IProject project = (IProject) event.getResource();
-						BeaninfoNature nature = BeaninfoPlugin.getPlugin().getNature(project);
-						if (nature != null) {
-							nature.cleanup(false, true);
-						}
-						break;
-					default:
-						super.resourceChanged(event);
-						break;
-				}
-			}
-		
-		}, IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE);
-	}
-
-	protected SaveParticipant saveParticipant;
-
-	/**
-	 * An index structure for the Main and Project indexes. Access to the index contents and methods should synchronize on the index itself.
-	 * <p>
-	 * Getting to the index instance should only be through the <code>getMainIndex()</code> and <code>getProjectIndex(IProject)</code> accessors
-	 * so that synchronization and serialization is controlled.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static class Index implements Serializable {
-
-		private static final long serialVersionUID = 1106864425567L;
-
-		/*
-		 * Is this a dirty index, i.e. it has been changed and needs to be saved.
-		 */
-		transient private boolean dirty;
-
-		private static final int DEAD = -1;	// Used in highRootNumber to indicate the index is dead.
-		/**
-		 * The highest root number used. It is incremented everytime one is needed. It doesn't ever decrease to recover removed roots.
-		 * 
-		 * @since 1.1.0
-		 */
-		public int highRootNumber;
-
-		/**
-		 * Map of root names to the root Index. The key is a {@link IPath}. The path will be relative to the workspace if a project root, or an
-		 * absolute local path to the archive if it is an external archive. It is the IPath to package fragment root (either a folder or a jar file).
-		 * <p>
-		 * The value will be a {@link BeanInfoCacheController.RootIndex}. This is the index for the contents of that root.
-		 * 
-		 * @since 1.1.0
-		 */
-		transient public Map rootToRootIndex;
-
-		/**
-		 * @param dirty
-		 *            The dirty to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		public void setDirty(boolean dirty) {
-			synchronized (BeanInfoCacheController.INSTANCE) {
-				this.dirty = dirty;
-			}
-		}
-
-		/**
-		 * @return Returns the dirty.
-		 * 
-		 * @since 1.1.0
-		 */
-		public boolean isDirty() {
-			synchronized (BeanInfoCacheController.INSTANCE) {
-				return dirty;
-			}
-		}
-		
-		/**
-		 * Answer if this index is dead. It is dead if a clean has occurred. This is needed because there could be some ClassEntry's still
-		 * around (such as in the pending write queue) that are for cleaned roots. This is used to test if it has been cleaned.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public boolean isDead() {
-			return highRootNumber == DEAD;
-		}
-		
-		/**
-		 * Mark the index as dead.
-		 * 
-		 * 
-		 * @since 1.1.0
-		 */
-		void markDead() {
-			highRootNumber = DEAD;
-		}
-
-		private void writeObject(ObjectOutputStream os) throws IOException {
-			os.defaultWriteObject();
-			// Now write out the root to root index map. We are not serializing the Map directly using normal Map serialization because
-			// the key of the map is an IPath (which is a Path under the covers) and Path is not serializable.
-			os.writeInt(rootToRootIndex.size());
-			for (Iterator mapItr = rootToRootIndex.entrySet().iterator(); mapItr.hasNext();) {
-				Map.Entry entry = (Map.Entry) mapItr.next();
-				os.writeUTF(((IPath) entry.getKey()).toString());
-				os.writeObject(entry.getValue());
-			}
-		}
-
-		private void readObject(ObjectInputStream is) throws IOException, ClassNotFoundException {
-			is.defaultReadObject();
-			int size = is.readInt();
-			rootToRootIndex = new HashMap(size < 100 ? 100 : size);
-			while (size-- > 0) {
-				rootToRootIndex.put(new Path(is.readUTF()), is.readObject());
-			}
-		}
-	}
-
-	/**
-	 * An index for a root. It has an entry for each class in this root. The class cache entry describes the cache, whether it is stale, what the
-	 * current mod stamp is, etc.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static abstract class RootIndex implements Serializable {
-
-		private static final long serialVersionUID = 1106868674101L;
-
-		transient private IPath cachePath; // Absolute local filesystem IPath to the root cache directory. Computed at runtime because it may change
-										   // if workspace relocated.
-
-		protected Map classNameToClassEntry; // Map of class names to class entries.
-
-		private String rootName; // Name of the root directory in the cache (e.g. "root1").
-
-		protected Index index; // Index containing this root index.
-
-		protected RootIndex() {
-		}
-
-		public RootIndex(String rootName, Index index) {
-			this.rootName = rootName;
-			classNameToClassEntry = new HashMap(100); // When created brand new, put in a map. Otherwise object stream will create the map.
-			this.index = index;
-		}
-		
-		/**
-		 * Get the index that points to this root.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		Index getIndex() {
-			return index;
-		}
-
-		/**
-		 * Return the root directory name
-		 * 
-		 * @return rootname
-		 * 
-		 * @since 1.1.0
-		 */
-		public String getRootName() {
-			return rootName;
-		}
-
-		/**
-		 * Set this RootIndex (and the containing Index) as being dirty and in need of saving.
-		 * 
-		 * 
-		 * @since 1.1.0
-		 */
-		public void setDirty() {
-			index.setDirty(true);
-		}
-
-		/*
-		 * Setup for index. It will initialize the path. Once set it won't set it again. This will be called repeatedly by the cache controller
-		 * because there is no way to know if it was lazily created or was brought in from file. When brought in from file the path is not set because
-		 * it should be relocatable and we don't want absolute paths out on the disk caches, and we don't want to waste time creating the path at load
-		 * time because it may not be needed for a while. So it will be lazily created. <p> If the project is set, then the path will be relative to
-		 * the project's working location. If project is <code> null </code> then it will be relative to the BeanInfo plugin's state location. <p>
-		 * This is <package-protected> because only the creator (BeanInfoCacheController class) should set this up.
-		 * 
-		 * @param project
-		 * 
-		 * @since 1.1.0
-		 */
-		void setupIndex(IProject project) {
-			if (getCachePath() == null)
-				cachePath = getCacheDir(project).append(rootName);
-		}
-
-		/**
-		 * @return Returns the path of the cache directory for the root.
-		 * 
-		 * @since 1.1.0
-		 */
-		public IPath getCachePath() {
-			return cachePath;
-		}
-
-		/**
-		 * Return whether this is a root for a archive or a folder.
-		 * 
-		 * @return <code>true</code> if archive for a root. <code>false</code> if archive for a folder.
-		 * 
-		 * @since 1.1.0
-		 */
-		public abstract boolean isArchiveRoot();
-	}
-
-	/**
-	 * A root index that is for an archive, either internal or external. It contains the archive's modification stamp. Each class cache entry will
-	 * have this same modification stamp. If the archive is changed then all of the class cache entries will be removed because they are all possibly
-	 * stale. No way to know which may be stale and which not.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static class ArchiveRootIndex extends RootIndex {
-
-		private static final long serialVersionUID = 110686867444L;
-
-		private long archiveModificationStamp;
-
-		/*
-		 * For serializer to call.
-		 */
-		protected ArchiveRootIndex() {
-		}
-
-		public ArchiveRootIndex(String rootName, long archiveModificationStamp, Index index) {
-			super(rootName, index);
-			this.archiveModificationStamp = archiveModificationStamp;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoCacheController.RootIndex#isArchiveRoot()
-		 */
-		public boolean isArchiveRoot() {
-			return true;
-		}
-
-		/*
-		 * Set the modification stamp. <p> <package-protected> because only the cache controller should change it.
-		 * 
-		 * @param archiveModificationStamp The archiveModificationStamp to set.
-		 * 
-		 * @see BeanInfoCacheController#MODIFICATION_STAMP_STALE
-		 * @since 1.1.0
-		 */
-		void setArchiveModificationStamp(long archiveModificationStamp) {
-			this.archiveModificationStamp = archiveModificationStamp;
-			setDirty();
-		}
-
-		/**
-		 * Returns the modification stamp.
-		 * 
-		 * @return Returns the archiveModificationStamp.
-		 * @see BeanInfoCacheController#MODIFICATION_STAMP_STALE
-		 * @since 1.1.0
-		 */
-		public long getArchiveModificationStamp() {
-			return archiveModificationStamp;
-		}
-	}
-
-	/**
-	 * This is a root index for a folder (which will be in the workspace). Each class cache entry can have a different modification stamp with a
-	 * folder root index.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static class FolderRootIndex extends RootIndex {
-
-		private static final long serialVersionUID = 1106868674922L;
-
-		/*
-		 * For serialization.
-		 */
-		protected FolderRootIndex() {
-		}
-
-		/**
-		 * @param rootName
-		 * 
-		 * @since 1.1.0
-		 */
-		public FolderRootIndex(String rootName, Index index) {
-			super(rootName, index);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoCacheController.RootIndex#isArchiveRoot()
-		 */
-		public boolean isArchiveRoot() {
-			return false;
-		}
-	}
-
-	/**
-	 * An individual class entry from the cache. It has an entry for each class in the root. The class cache entry describes the cache, whether it is
-	 * stale, what the current mod stamp is, etc.
-	 * <p>
-	 * There is a method to call to see if deleted. This should only be called if entry is being held on to because
-	 * <code>getClassEntry(JavaClass)</code> will never return a deleted entry. There is a method to get the modification stamp of the current cache
-	 * entry. This is the time stamp of the cooresponding class resource (or archive file) that the cache file was created from. If the value is
-	 * <code>IResource.NULL_STAMP</code>, then the cache file is known to be stale. Otherwise if the value is less than a modification stamp of a
-	 * super class then the cache file is stale.
-	 * 
-	 * @see ClassEntry#isDeleted()
-	 * @see ClassEntry#getModificationStamp()
-	 * @see BeanInfoCacheController#getClassEntry(JavaClass)
-	 * @since 1.1.0
-	 */
-	public static class ClassEntry implements Serializable {
-
-		private static final long serialVersionUID = 1106868674333L;
-
-		public static final long DELETED_MODIFICATION_STAMP = Long.MIN_VALUE; // This flag won't be seen externally. It is used to indicate the entry
-																			  // has been deleted for those that have been holding a CE.
-		
-		/**
-		 * Check against the super modification stamp and the interface stamps to see if they were set
-		 * by undefined super class or interface at cache creation time. 
-		 * 
-		 * @since 1.1.0
-		 */
-		public static final long SUPER_UNDEFINED_MODIFICATION_STAMP = Long.MIN_VALUE+1;	
-
-		private long modificationStamp;
-		private long superModificationStamp;	// Stamp of superclass, if any, at time of cache creation.
-		private String[] interfaceNames;	// Interfaces names (null if no interfaces)
-		private long[] interfaceModicationStamps;	// Modification stamps of interfaces, if any. (null if no interfaces).
-		private transient Resource pendingResource;	// Resource is waiting to be saved, but the timestamps are for this pending resource so that we know what it will be ahead of time. At this point the class will be introspected. 
-
-		private RootIndex rootIndex; // The root index this class entry is in, so that any changes can mark the entry as dirty.
-
-		private String className; // The classname for this entry.
-		
-		private boolean saveOperations;	// Flag for saving operations. Once this is set, it will continue to save operations in the cache in addition to everything else.
-
-		private long configurationModificationStamp;	// Modification stamp of the Eclipse configuration. Used to determine if the cache of override files is out of date due to a config change.
-		private boolean overrideCacheExists;	// Flag that there is an override cache to load. This is orthogonal to the config mod stamp because it simply means that on the current configuration there is no override cache.
-		private transient Resource pendingOverrideResource;	// Override resource is waiting to be saved.
-		
-		protected ClassEntry() {
-		}
-
-		ClassEntry(RootIndex rootIndex, String className) {
-			this.setRootIndex(rootIndex);
-			this.className = className;
-			modificationStamp = IResource.NULL_STAMP;
-			rootIndex.classNameToClassEntry.put(className, this);
-		}
-
-		/**
-		 * 
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public String getClassName() {
-			return className;
-		}
-
-		/**
-		 * Return whether the entry has been deleted. This will never be seen in an entry that is still in an index. It is used for entries that have
-		 * been removed from the index. It is for classes (such as the BeanInfoClassAdapter) which are holding onto a copy of entry to let them know.
-		 * <p>
-		 * Holders of entries should call isDeleted if they don't need to further check the mod stamp. Else they should call getModificationStamp and
-		 * check of deleted, stale, or mod stamp. That would save extra synchronizations. If entry is deleted then it should throw the entry away.
-		 * 
-		 * @return <code>true</code> if the entry has been deleted, <code>false</code> if still valid.
-		 * 
-		 * @see ClassEntry#getModificationStamp()
-		 * @see ClassEntry#isStale()
-		 * @see ClassEntry#DELETED_MODIFICATION_STAMP
-		 * @since 1.1.0
-		 */
-		public boolean isDeleted() {
-			return getModificationStamp() == DELETED_MODIFICATION_STAMP;
-		}
-
-		/**
-		 * Mark the entry as deleted. It will also be removed from root index in that case.
-		 * <p>
-		 * Note: It is public only so that BeanInfoClassAdapter can access it. It should not be called by anyone else outside of BeanInfo.
-		 */
-		public synchronized void markDeleted() {
-			if (!isDeleted()) {
-				getRootIndex().classNameToClassEntry.remove(className);
-				setModificationStamp(DELETED_MODIFICATION_STAMP); // Also marks index as dirty.
-			}
-		}
-
-		/**
-		 * Return whether the entry is stale or not. This orthoganal to isDeleted. isDeleted will not be true if isStale and isStale will not be true
-		 * if isDeleted. Normally you should use getModificationStamp and check the value for IResource.NULL_STAMP and other values to bring it down
-		 * to only one synchronized call to CE, but if only needing to know if stale, you can use this.
-		 * 
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 * @see IResource#NULL_STAMP
-		 * @see ClassEntry#getModificationStamp()
-		 * @see ClassEntry#isDeleted()
-		 */
-		public boolean isStale() {
-			return getModificationStamp() == IResource.NULL_STAMP;
-		}
-
-		/**
-		 * Return the modification stamp. For those holding onto an entry, and they need to know more than if just deleted, then they should just the
-		 * return value from getModificationStamp. Else they should use isDeleted or isStale.
-		 * 
-		 * @return modification stamp, or {@link IResource#NULL_STAMP}if stale or not yet created, or {@link ClassEntry#DELETED_MODIFICATION_STAMP}
-		 *         if deleted.
-		 * 
-		 * @see ClassEntry#isDeleted()
-		 * @see ClassEntry#isStale()
-		 * @since 1.1.0
-		 */
-		public synchronized long getModificationStamp() {
-			return modificationStamp;
-		}
-		
-		/**
-		 * Return the super modification stamp.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized long getSuperModificationStamp() {
-			return superModificationStamp;
-		}
-		
-		/**
-		 * Return the interface names or <code>null</code> if no interface names.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized String[] getInterfaceNames() {
-			return interfaceNames;
-		}
-
-		/**
-		 * Return the interface modification stamps or <code>null</code> if no interfaces.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized long[] getInterfaceModificationStamps() {
-			return interfaceModicationStamps;
-		}
-		
-		/*
-		 * Set the modification stamp. <p> <package-protected> because only the cache controller should set it. @param modificationStamp
-		 * 
-		 * @since 1.1.0
-		 */
-		void setModificationStamp(long modificationStamp) {
-			if (this.modificationStamp != modificationStamp) {
-				this.modificationStamp = modificationStamp;
-				getRootIndex().setDirty();
-			}
-		}
-
-		/**
-		 * Answer whether operations are also stored in the cache for this class. By default they are not. Once turned on they
-		 * will always be stored for this class until the class is deleted.
-		 * 
-		 * @return <code>true</code> if operations are cached, <code>false</code> if they are not cached.
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized boolean isOperationsStored() {
-			return saveOperations;
-		}
-		
-		/*
-		 * Set the operations stored flag.
-		 * @param storeOperations
-		 * 
-		 * @see BeanInfoCacheController.ClassEntry#isOperationsStored()
-		 * @since 1.1.0
-		 */
-		void setOperationsStored(boolean storeOperations) {
-			saveOperations = storeOperations;
-		}
-		
-		/**
-		 * Get the configuration modification stamp of the last saved override cache.
-		 * 
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized long getConfigurationModificationStamp() {
-			return configurationModificationStamp;
-		}
-
-		/* 
-		 * Set the configuration modification stamp.
-		 * <p> <package-protected> because only the cache controller should access it.
-		 * 
-		 * @param configurationModificationStamp
-		 * 
-		 * @since 1.1.0
-		 */
-		void setConfigurationModificationStamp(long configurationModificationStamp) {
-			this.configurationModificationStamp = configurationModificationStamp;
-			getRootIndex().setDirty();
-		}
-		
-		/**
-		 * Answer whether there is an override cache available.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized boolean overrideCacheExists() {
-			return overrideCacheExists;
-		}
-		
-		/*
-		 * Set the override cache exists flag.
-		 * <p> <package-protected> because only the cache controller should access it.
-		 * @param overrideCacheExists
-		 * 
-		 * @since 1.1.0
-		 */
-		void setOverrideCacheExists(boolean overrideCacheExists) {
-			this.overrideCacheExists = overrideCacheExists;
-		}
-		
-		/**
-		 * Get the pending resource or <code>null</code> if not pending.
-		 * 
-		 * @return the pending resource or <code>null</code> if not pending.
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized Resource getPendingResource() {
-			return pendingResource;
-		}
-		
-		/*
-		 * Set the entry. The sequence get,do something,set must be grouped within a synchronized(ClassEntry). 
-		 * <p> <package-protected> because only the cache controller should access it. 
-		 * @param cacheResource The cacheResource to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setPendingResource(Resource pendingResource) {
-			this.pendingResource = pendingResource;
-		}
-
-		/**
-		 * Get the pending override resource or <code>null</code> if not pending.
-		 * 
-		 * @return the pending override resource or <code>null</code> if not pending.
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized Resource getPendingOverrideResource() {
-			return pendingOverrideResource;
-		}
-		
-		/*
-		 * Set the entry. The sequence get,do something,set must be grouped within a synchronized(ClassEntry). 
-		 * <p> <package-protected> because only the cache controller should access it. 
-		 * @param cacheResource The cacheResource to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setPendingOverrideResource(Resource pendingOverrideResource) {
-			this.pendingOverrideResource = pendingOverrideResource;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it. @param rootIndex The rootIndex to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setRootIndex(RootIndex rootIndex) {
-			this.rootIndex = rootIndex;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it. @return Returns the rootIndex.
-		 * 
-		 * @since 1.1.0
-		 */
-		RootIndex getRootIndex() {
-			return rootIndex;
-		}
-		
-		/*
-		 * <package-protected> because only the cache controller should access it.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setSuperModificationStamp(long superModificationStamp) {
-			this.superModificationStamp = superModificationStamp;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setInterfaceNames(String[] interfaceNames) {
-			this.interfaceNames = interfaceNames;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setInterfaceModificationStamps(long[] interfaceModificationStamps) {
-			this.interfaceModicationStamps = interfaceModificationStamps;
-		}
-		
-	}
-
-	/*
-	 * Main index for the external jars. This variable should not be referenced directly except through the getMainIndex() accessor. That controls
-	 * synchronization and restoration as needed.
-	 */
-	private static Index MAIN_INDEX;
-
-	/*
-	 * Key into the Project's session data for the project index. The Project index is stored in the project's session data. That
-	 * way when the project is closed or deleted it will go away. 
-	 * 
-	 * The project indexes will be read in as needed on a per-project basis. This variable should not be
-	 * referenced directly except through the getProjectIndex(IProject) accessor. That controls synchronization and restoration as needed.
-	 * Only during cleanup and such where we don't want to create one if it doesn't exist you must use sync(this). Be careful to keep 
-	 * the sync small.
-	 */
-	private static final QualifiedName PROJECT_INDEX_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "project_index");	//$NON-NLS-1$
-
-	/*
-	 * Suffix for class cache files.
-	 */
-	private static final String CLASS_CACHE_SUFFIX = ".xmi"; //$NON-NLS-1$
-	/*
-	 * Suffic for class override cache files.
-	 */
-	private static final String OVERRIDE_CACHE_SUFFIX = ".override.xmi"; //$NON-NLS-1$
-
-	/**
-	 * Return the current class entry for the JavaClass, or <code>null</code> if no current entry.
-	 * 
-	 * @param jclass
-	 * @return class entry or <code>null</code> if no current entry.
-	 * 
-	 * @since 1.1.0
-	 */
-	public ClassEntry getClassEntry(JavaClass jclass) {
-		IType type = (IType) jclass.getReflectionType();
-		RootIndex rootIndex = getRootIndex(type);
-		String className = jclass.getQualifiedNameForReflection();
-		return getClassEntry(rootIndex, className, false);
-	}
-
-	/**
-	 * Enumeration for newCache: Signals that this cache is the Reflection Cache with no operations in it.
-	 * @since 1.1.0
-	 */
-	public final static int REFLECTION_CACHE = 1;
-	/**
-	 * Enumeration for newCache: Signals that this cache is the Reflection Cache with operations in it.
-	 * @since 1.1.0
-	 */
-	public final static int REFLECTION_OPERATIONS_CACHE = 2;
-	/**
-	 * Enumeration for newCache: Signals that this cache is the Overrides cache.
-	 * @since 1.1.0
-	 */
-	public final static int OVERRIDES_CACHE = 3;
-	/**
-	 * A new cache entry for the given class has been created. Need to write it out.
-	 * 
-	 * @param jclass
-	 *            the JavaClass the cache is for.
-	 * @param cache
-	 *            the ChangeDescription to put out if cacheType is Reflection types, a List if override cache type.
-	 * @param cacheType
-	 *            {@link BeanInfoCacheController.ClassEntry#REFLECTION_CACHE} for the enum values.
-	 * @return new class entry (or old one if same one). Should always replace one being held by this one. <code>null</code> if cache could not be
-	 *         updated for some reason.
-	 * @since 1.1.0
-	 */
-	public ClassEntry newCache(JavaClass jclass, Object cache, int cacheType) {
-		if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER)) {
-			Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-			String type = cacheType!=OVERRIDES_CACHE?"Class":"Overrides"; //$NON-NLS-1$ //$NON-NLS-2$
-			if (cacheType == OVERRIDES_CACHE && cache == null)
-				type+="  empty"; //$NON-NLS-1$
-			logger.log("Creating cache for class "+jclass.getQualifiedNameForReflection()+" cache type="+type, Level.FINER); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		ChangeDescription cd = null;
-		if (cacheType != OVERRIDES_CACHE) {
-			// First go through the cd and remove any empty changes. This is because we created the feature change before we knew what went into
-			// it, and at times nothing goes into it.
-			cd = (ChangeDescription) cache;
-			for (Iterator iter = cd.getObjectChanges().iterator(); iter.hasNext();) {
-				EObjectToChangesMapEntryImpl fcEntry = (EObjectToChangesMapEntryImpl) iter.next();
-				if (((List) fcEntry.getValue()).isEmpty())
-					iter.remove(); // Empty changes, remove it.
-			}
-		}
-		IType type = (IType) jclass.getReflectionType();
-		RootIndex rootIndex = getRootIndex(type);
-		String className = jclass.getQualifiedNameForReflection();
-		ClassEntry ce = getClassEntry(rootIndex, className, true); // Create it if not existing.
-		// Sync on ce so that only can create a cache for a class at a time and so that writing (if occurring at the same time for the class) can be
-		// held up.
-		// this is a violation of the agreement to only sync on THIS, but it is necessary or else the write job would lock everything out while it is
-		// writing. This way it only locks out one class, if the class is at the same time.
-		// We shouldn't have deadlock because here we lock ce and then THIS (maybe). The write job will lock ce, and then lock THIS. Everywhere else
-		// we must
-		// also do lock ce then THIS. Mustn't do other way around or possibility of deadlock. Be careful that any synchronized methods in this class
-		// do
-		// not lock an existing ce.
-		ResourceSet cacheRset = null;
-		synchronized (ce) {
-			Resource cres;
-			if (cacheType != OVERRIDES_CACHE) {
-				cres = ce.getPendingResource();
-				if (cres != null) {
-					// We have a pending, so clear and reuse the resource.
-					cres.getContents().clear();
-				} else {
-					// Not currently writing or waiting to write, so create a new resource.
-					cres = jclass.eResource().getResourceSet().createResource(
-							URI.createFileURI(rootIndex.getCachePath().append(className + CLASS_CACHE_SUFFIX).toString()));
-				}
-				cacheRset = cres.getResourceSet();
-				ce.setOperationsStored(cacheType == REFLECTION_OPERATIONS_CACHE);
-				ce.setPendingResource(cres);
-				cres.getContents().add(cd);
-				// Archives use same mod as archive (retrieve from rootindex), while non-archive use the underlying resource's mod stamp.
-				if (rootIndex.isArchiveRoot())
-					ce.setModificationStamp(((ArchiveRootIndex) rootIndex).getArchiveModificationStamp());
-				else {
-					try {
-						ce.setModificationStamp(type.getUnderlyingResource().getModificationStamp());
-					} catch (JavaModelException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e);
-						ce.markDeleted(); // Mark as deleted in case this was an existing that someone is holding.
-						return null; // Couldn't do it, throw cache entry away. This actually should never occur.
-					}
-				}
-				// Need to get the supers info. 
-				List supers = jclass.getESuperTypes();
-				if (!supers.isEmpty()) {
-					// We assume that they all have been introspected. This was done back in main introspection. If they are introspected they will have a class entry.
-					BeaninfoClassAdapter bca = BeaninfoClassAdapter.getBeaninfoClassAdapter((EObject) supers.get(0));
-					ClassEntry superCE = bca.getClassEntry();
-					if (superCE != null)
-						ce.setSuperModificationStamp(superCE.getModificationStamp());
-					else
-						ce.setSuperModificationStamp(ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP);	// No classentry means undefined. So put something in so that when it becomes defined we will know.
-					if(supers.size() == 1) {
-						ce.setInterfaceNames(null);
-						ce.setInterfaceModificationStamps(null);
-					} else {
-						String[] interNames = new String[supers.size()-1];
-						long[] interMods = new long[interNames.length];
-						for (int i = 1, indx = 0; indx < interNames.length; i++, indx++) {
-							JavaClass javaClass = (JavaClass) supers.get(i);
-							bca = BeaninfoClassAdapter.getBeaninfoClassAdapter(javaClass);
-							bca.introspectIfNecessary();	// Force introspection to get a valid super mod stamp.
-							superCE = bca.getClassEntry();
-							interNames[indx] = javaClass.getQualifiedNameForReflection();
-							if (superCE != null)
-								interMods[indx] = superCE.getModificationStamp();
-							else
-								interMods[indx] = ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP;	// No classentry means undefined. So put something in so that when it becomes defined we will know.
-						}
-						ce.setInterfaceNames(interNames);
-						ce.setInterfaceModificationStamps(interMods);
-					}
-				} else {
-					ce.setSuperModificationStamp(IResource.NULL_STAMP);
-					ce.setInterfaceNames(null);
-					ce.setInterfaceModificationStamps(null);
-				}
-			} else {
-				// We are an override cache.
-				if (cache != null) { 
-					cres = ce.getPendingOverrideResource();
-					if (cres != null) {
-						// We have a pending, so clear and reuse the resource.
-						cres.getContents().clear();
-					} else {
-						// Not currently writing or waiting to write, so create a new resource.
-						cres = jclass.eResource().getResourceSet().createResource(
-								URI.createFileURI(rootIndex.getCachePath().append(className + OVERRIDE_CACHE_SUFFIX).toString()));
-					}
-					cacheRset = cres.getResourceSet();
-					cres.getContents().addAll((List) cache);
-					ce.setPendingOverrideResource(cres);
-					ce.setOverrideCacheExists(true);
-				} else {
-					ce.setPendingOverrideResource(null);
-					ce.setOverrideCacheExists(false);
-				}
-				ce.setConfigurationModificationStamp(Platform.getPlatformAdmin().getState(false).getTimeStamp());
-			}
-		}
-		queueClassEntry(ce, cacheRset); // Now queue it up.
-		return ce;
-	}
-
-	/**
-	 * Get the cache resource for the given java class.
-	 * <p>
-	 * NOTE: It is the responsibility of the caller to ALWAYS remove the Resource from its resource set when done with it.
-	 * 
-	 * @param jclass
-	 * @param ce the class entry for the jclass
-	 * @param reflectCache <code>true</code> if this the reflection/introspection cache or <code>false</code> if this is the override cache.
-	 * @return the loaded cache resource, or <code>null</code> if not there (for some reason) or an error trying to load it.
-	 * 
-	 * @since 1.1.0
-	 */
-	public Resource getCache(JavaClass jclass, ClassEntry ce, boolean reflectCache) {
-		String className = jclass.getQualifiedNameForReflection();
-		if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER)) {
-			Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-			String type = reflectCache?"Class":"Overrides"; //$NON-NLS-1$ //$NON-NLS-2$
-			logger.log("Loading cache for class "+className+" cache type="+type, Level.FINER); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		if (reflectCache) {
-			boolean waitForJob = false;
-			synchronized (ce) {
-				if (ce.getPendingResource() != null) {
-					// We have one pending. So wait until write cache job is done, and then load it in.
-					// Note: Can't just copy the pending resource because it has references to JavaClasses
-					// and these could be in a different project (since this could be a workspace wide class).
-					// We would get the wrong java classes then when we apply it. 
-					waitForJob = true;
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Using pending class cache.", Level.FINER); //$NON-NLS-1$
-				}
-			}
-			if (waitForJob)
-				waitForCacheSaveJob();	
-
-			try {
-				return jclass.eResource().getResourceSet().getResource(
-						URI.createFileURI(ce.getRootIndex().getCachePath().append(
-								className + CLASS_CACHE_SUFFIX).toString()), true);
-			} catch (Exception e) {
-				// Something happened and couldn't load it.
-				// TODO - need to remove the Level.INFO arg when the beaninfo cache is working dynamically
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
-				return null;
-			}
-		} else {
-			boolean waitForJob = false;
-			synchronized (ce) {
-				if (ce.getPendingOverrideResource() != null) {
-					// We have one pending. So wait until write cache job is done, and then load it in.
-					// Note: Can't just copy the pending resource because it has references to JavaClasses
-					// and these could be in a different project (since this could be a workspace wide class).
-					// We would get the wrong java classes then when we apply it. 
-					waitForJob = true;
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Using pending override cache.", Level.FINER); //$NON-NLS-1$
-				}
-			}
-			if (waitForJob)
-				waitForCacheSaveJob();	
-
-			try {
-				return jclass.eResource().getResourceSet().getResource(
-						URI.createFileURI(ce.getRootIndex().getCachePath().append(
-								className + OVERRIDE_CACHE_SUFFIX).toString()), true);
-			} catch (Exception e) {
-				// Something happened and couldn't load it.
-				// TODO - need to remove the Level.INFO arg when the beaninfo cache is working dynamically
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
-				return null;
-			}
-		}
-	}
-
-	private synchronized ClassEntry getClassEntry(RootIndex rootIndex, String className, boolean createEntry) {
-		ClassEntry ce = (ClassEntry) rootIndex.classNameToClassEntry.get(className);
-		if (createEntry && ce == null) {
-			// Need to create one.
-			ce = new ClassEntry(rootIndex, className);
-			// Don't actually mark the rootIndex dirty until the cache for it is actually saved out.
-		}
-		return ce;
-	}
-
-	private static final String ROOT_PREFIX = "root"; //$NON-NLS-1$
-
-	/*
-	 * Get the root index for the appropriate cache for the given java class.
-	 */
-	private RootIndex getRootIndex(IType type) {
-		IPackageFragmentRoot root = (IPackageFragmentRoot) type.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
-		if (!root.isExternal()) {
-			// So it is in a project. Get the project index.
-			return getRootIndex(root, root.getJavaProject().getProject());
-		} else {
-			// It is an external jar (archive), so needs to come from main index, no project.
-			return getRootIndex(root, null);
-		}
-	}
-
-	/*
-	 * Get the root index for the given root. A Project index if project is not null.
-	 */
-	private synchronized RootIndex getRootIndex(IPackageFragmentRoot root, IProject project) {
-		Index index = project != null ? getProjectIndex(project) : getMainIndex();
-		IPath rootPath = root.getPath();
-		RootIndex rootIndex = (RootIndex) index.rootToRootIndex.get(rootPath);
-		if (rootIndex == null) {
-			// Need to do a new root path.
-			String rootName = ROOT_PREFIX + (++index.highRootNumber);
-			rootIndex = root.isArchive() ? createArchiveRootIndex(root, rootName, index) : new FolderRootIndex(rootName, index);
-			index.rootToRootIndex.put(rootPath, rootIndex);
-			// Don't set index dirty until we actually save a class cache file. Until then it only needs to be in memory.
-		}
-		rootIndex.setupIndex(project); // Set it up, or may already be set, so it will do nothing in that case.
-		return rootIndex;
-	}
-
-	/*
-	 * Create an archive root with the given root number and root.
-	 */
-	private RootIndex createArchiveRootIndex(IPackageFragmentRoot rootArchive, String rootName, Index index) {
-		long modStamp = IResource.NULL_STAMP;
-		if (rootArchive.isExternal()) {
-			modStamp = rootArchive.getPath().toFile().lastModified();
-		} else {
-			try {
-				modStamp = rootArchive.getUnderlyingResource().getModificationStamp();
-			} catch (JavaModelException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			}
-		}
-		return new ArchiveRootIndex(rootName, modStamp, index);
-	}
-
-	private static final String INDEXFILENAME = ".index"; //$NON-NLS-1$
-
-	private static final String CACHEDIR = ".cache"; // Cache directory (so as not to conflict with any future BeanInfo Plugin specific data files. //$NON-NLS-1$
-
-	/*
-	 * Get the cache directory for the project (or if project is null, the main plugin cache directory).
-	 */
-	// TODO: make this one private
-	public static IPath getCacheDir(IProject project) {
-		if (project != null)
-			return project.getWorkingLocation(BeaninfoPlugin.getPlugin().getBundle().getSymbolicName()).append(CACHEDIR);
-		else
-			return BeaninfoPlugin.getPlugin().getStateLocation().append(CACHEDIR);
-	}
-
-	/*
-	 * Get the project index. Synchronized so that we can create it if necessary and not get race conditions.
-	 */
-	private synchronized Index getProjectIndex(IProject project) {
-		try {
-			Index index = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
-			if (index == null) {
-				// Read the index in.
-				File indexDirFile = getCacheDir(project).append(INDEXFILENAME).toFile();
-				if (indexDirFile.canRead()) {
-					ObjectInputStream ois = null;
-					try {
-						ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(indexDirFile)));
-						index = (Index) ois.readObject();
-					} catch (InvalidClassException e) {
-						// This is ok. It simply means the cache index is at a downlevel format and needs to be reconstructed.
-					} catch (IOException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e);
-					} catch (ClassNotFoundException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e);
-					} finally {
-						if (ois != null)
-							try {
-								ois.close();
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							}
-					}
-				}
-
-				if (index == null) {
-					// Doesn't yet exist or it couldn't be read for some reason, or it was downlevel cache in which case we just throw it away and create
-					// new).
-					index = new Index();
-					index.highRootNumber = 0;
-					index.rootToRootIndex = new HashMap();
-				}
-
-				project.setSessionProperty(PROJECT_INDEX_KEY, index); // We either created a new one, or we were able to load it.
-			}
-			return index;
-		} catch (CoreException e) {
-			// Shouldn't occur,
-			return null;
-		}
-	}
-
-	/*
-	 * Get the main index. Synchronized so that we can create it if necessary and not get race conditions.
-	 */
-	private synchronized Index getMainIndex() {
-		if (MAIN_INDEX == null) {
-			// Read the index in.
-			File indexDirFile = getCacheDir(null).append(INDEXFILENAME).toFile();
-			if (indexDirFile.canRead()) {
-				ObjectInputStream ois = null;
-				try {
-					ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(indexDirFile)));
-					MAIN_INDEX = (Index) ois.readObject();
-				} catch (InvalidClassException e) {
-					// This is ok. It just means that the cache index is at a downlevel format and needs to be reconstructed.
-				} catch (IOException e) {
-					BeaninfoPlugin.getPlugin().getLogger().log(e);
-				} catch (ClassNotFoundException e) {
-					BeaninfoPlugin.getPlugin().getLogger().log(e);
-				} finally {
-					if (ois != null)
-						try {
-							ois.close();
-						} catch (IOException e) {
-							BeaninfoPlugin.getPlugin().getLogger().log(e);
-						}
-				}
-			}
-
-			if (MAIN_INDEX == null) {
-				// Doesn't yet exist or it couldn't be read for some reason, or it was downlevel cache in which case we just throw it away and create
-				// new).
-				MAIN_INDEX = new Index();
-				MAIN_INDEX.highRootNumber = 0;
-				MAIN_INDEX.rootToRootIndex = new HashMap();
-			}
-
-		}
-		return MAIN_INDEX;
-	}
-
-	// -------------- Save Participant code -----------------
-
-	protected class SaveParticipant implements ISaveParticipant {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void doneSaving(ISaveContext context) {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void prepareToSave(ISaveContext context) throws CoreException {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#rollback(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void rollback(ISaveContext context) {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#saving(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void saving(ISaveContext context) throws CoreException {
-			boolean fullsave = false;
-			switch (context.getKind()) {
-				case ISaveContext.PROJECT_SAVE:
-					IProject project = context.getProject();
-					synchronized (BeanInfoCacheController.INSTANCE) {
-						// Write the index. The cache save job will eventually run and at that point write out the pending cache files too.
-						// They don't need to be written before the project save is complete.
-						Index projectIndex = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
-						if (projectIndex != null && projectIndex.isDirty())
-							if (reconcileIndexDirectory(project, projectIndex))
-								writeIndex(project, projectIndex);
-							else {
-								// It was empty, just get rid of the index. The directories have already been cleared.
-								projectIndex.markDead();
-								project.setSessionProperty(PROJECT_INDEX_KEY, null);
-							}
-					}
-					break;
-				case ISaveContext.FULL_SAVE:
-					fullsave = true;
-					waitForCacheSaveJob();
-				// Now flow into the snapshot save to complete the fullsave.
-				case ISaveContext.SNAPSHOT:
-					// For a snapshot, just the dirty indexes, no clean up. If fullsave, cleanup the indexes, but only save the dirty.
-					synchronized (BeanInfoCacheController.INSTANCE) {
-						if (MAIN_INDEX != null) {
-							if (fullsave) {
-								if (reconcileIndexDirectory(null, MAIN_INDEX)) {
-									if (MAIN_INDEX.isDirty())
-										writeIndex(null, MAIN_INDEX);
-								} else {
-									// It was empty, just get rid of the index. The directories have already been cleared.
-									MAIN_INDEX.markDead();
-									MAIN_INDEX = null;
-								}
-							} else if (MAIN_INDEX.isDirty())
-								writeIndex(null, MAIN_INDEX);
-						}
-						// Now do the project indexes. We have to walk all open projects to see which have an index. Since we are
-						// doing a major save, the hit will ok
-						IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-						for (int i=0; i<projects.length; i++) {
-							project = projects[i];
-							if (project.isOpen()) {
-								Index index = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
-								if (index != null) {
-									if (fullsave) {
-										if (reconcileIndexDirectory(project, index)) {
-											if (index.isDirty())
-												writeIndex(project, index);
-										} else {
-											// It was empty, just get rid of the index from memory. It has already been deleted from disk.
-											index.markDead();
-											project.setSessionProperty(PROJECT_INDEX_KEY, null);
-										}
-									} else if (index.isDirty())
-										writeIndex(project, index);
-								}
-							}
-						}
-					}
-			}
-		}
-
-		/*
-		 * Write an index. Project if not null indicates a project index.
-		 */
-		private void writeIndex(IProject project, Index index) {
-			ObjectOutputStream oos = null;
-			try {
-				File indexDirFile = getCacheDir(project).toFile();
-				indexDirFile.mkdirs();
-				File indexFile = new File(indexDirFile, INDEXFILENAME);
-				oos = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(indexFile)));
-				oos.writeObject(index);
-				index.setDirty(false);
-			} catch (IOException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			} finally {
-				if (oos != null)
-					try {
-						oos.close();
-					} catch (IOException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e);
-					}
-			}
-		}
-
-		/*
-		 * Reconcile the index directory of unused (empty) root directories. If after reconciling the index is empty, then it will delete the index file too. @return
-		 * true if index not empty, false if index was empty and was erased too.
-		 */
-		private boolean reconcileIndexDirectory(IProject project, Index index) {
-			// clean out unused rootIndexes
-			File indexDir = getCacheDir(project).toFile();
-			if (indexDir.canWrite()) {
-				// Create a set of all root names for quick look up.
-				if (index.rootToRootIndex.isEmpty()) {
-					// It is empty, clear everything, including index file.
-					cleanDirectory(indexDir, false);
-					return false;
-				} else {
-					// Need a set of the valid rootnames for quick lookup of names in the directory list.
-					// And while accumulating this list, clean out the root indexes cache too (i.e. the class cache files).
-					final Set validFiles = new HashSet(index.rootToRootIndex.size());
-					validFiles.add(INDEXFILENAME);
-					for (Iterator itr = index.rootToRootIndex.values().iterator(); itr.hasNext();) {
-						RootIndex rootIndex = (RootIndex) itr.next();
-						if (reconcileClassCacheDirectory(rootIndex, project)) {
-							// The class cache has been reconciled, and there are still some classes left, so keep the root index.
-							validFiles.add(rootIndex.getRootName());
-						} else {
-							itr.remove(); // The root index is empty, so get rid of it. Since not a valid name, it will be deleted in next step.
-							index.setDirty(true); // Also set it dirty in case it wasn't because we need to write out the container Index since it was
-							// changed.
-						}
-					}
-					// Get list of files and delete those that are not a valid name (used root name, or index file)
-					String[] fileNames = indexDir.list();
-					for (int i = 0; i < fileNames.length; i++) {
-						if (!validFiles.contains(fileNames[i])) {
-							File file = new File(indexDir, fileNames[i]);
-							if (file.isDirectory())
-								cleanDirectory(file, true);
-							else
-								file.delete();
-						}
-					}
-					return true;
-				} 
-			} else 
-				return true;	// Can't write, so treat as leave alone.
-		}
-
-		/*
-		 * Reconcile the class cache directory for the root index. Return true if reconciled good but not empty. Return false if the class cache
-		 * directory is now empty. In this case we should actually get rid of the entire root index. This makes sure that the directory matches
-		 * the contents of the index by removing any file not found in the index.
-		 */
-		private boolean reconcileClassCacheDirectory(RootIndex rootIndex, IProject project) {
-			if (rootIndex.classNameToClassEntry.isEmpty())
-				return false; // There are no classes, so get rid the entire root index.
-			else {
-				final Set validFiles = rootIndex.classNameToClassEntry.keySet(); // The keys (classnames) are the filenames (without extension)
-																					// that
-				// should be kept.
-				File indexDir = getCacheDir(project).append(rootIndex.getRootName()).toFile();
-				// Get list of files that are not a valid name (used classname)
-				String[] fileNames = indexDir.list();
-				if (fileNames != null) {
-					for (int i = 0; i < fileNames.length; i++) {
-						String fileName = fileNames[i];
-						if (fileName.endsWith(OVERRIDE_CACHE_SUFFIX)) {
-							// Ends with out class cache extension, see if valid classname.
-							String classname = fileName.substring(0, fileName.length() - OVERRIDE_CACHE_SUFFIX.length());
-							ClassEntry ce = (ClassEntry) rootIndex.classNameToClassEntry.get(classname);
-							if (ce != null && ce.overrideCacheExists())
-								continue; // It is one of ours. Keep it.
-						} else if (fileName.endsWith(CLASS_CACHE_SUFFIX)) {
-							// Ends with out class cache extension, see if valid classname.
-							if (validFiles.contains(fileName.substring(0, fileName.length() - CLASS_CACHE_SUFFIX.length()))) // Strip down to just
-																																// class and see if
-																																// one of ours.
-								continue; // It is one of ours. Keep it.
-						}
-						// Not valid, get rid of it.
-						File file = new File(indexDir, fileName);
-						if (file.isDirectory())
-							cleanDirectory(file, true);
-						else
-							file.delete();
-
-					}
-				}
-				return true;
-			}
-		}
-	}
-	
-	private static void cleanDirectory(File dir, boolean eraseDir) {
-		if (dir.canWrite()) {
-			File[] files = dir.listFiles();
-			for (int i = 0; i < files.length; i++) {
-				if (files[i].isDirectory())
-					cleanDirectory(files[i], true);
-				else
-					files[i].delete();
-			}
-			if (eraseDir)
-				dir.delete();
-		}
-	}	
-
-	//-------------- Save Class Cache Entry Job -------------------
-	// This is write queue for class caches. It is a FIFO queue. It is sychronized so that adds/removes are controlled.
-	// Entries are ClassEntry's. The class entry has the resource that needs to be written out. It will be set to null
-	// by the job when it is written. The job will have a ClassEntry locked while it is retrieving and resetting the resource
-	// field in the entry.
-	//
-	// The process is the new cache will lock, create resource, set resource into the CE and release lock. Then add the CE to the queue
-	// and schedule the job (in case job is not running).
-	//
-	// The job will lock the CE, get resource from the CE, write it out, set it back to null, release the CE). If the resource is null,
-	// then it was already processed (this could happen if the job didn't get a chance to save it before another entry was posted
-	// and this is the second request and it was actually processed by the first request).
-	// IE:
-	// 1) resource created, queue entry added
-	// 2) 2nd req, job not processed yet, resource recreated and put back into CE, new queue entry.
-	// 3) job pulls from queue, locks ce, grabs resource, writes out the resource, sets back to null, release ce.
-	// 4) job pulls from queue. This time the resoure is null so it skips it.
-	//
-	// Need to lock Ce during entire create and write because the resource set is not reentrant so can't be writing it while creating it.
-
-	private List cacheWriteQueue = null;
-
-	void waitForCacheSaveJob() {
-		// For a full save we want to get the class cache files written too, so we need to manipulate the job to get it to finish ASAP.
-		if (cacheWriteJob != null) {
-			if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-				BeaninfoPlugin.getPlugin().getLogger().log("Forcing a cache save job to start early.", Level.FINER); //$NON-NLS-1$
-			switch (cacheWriteJob.getState()) {
-				case Job.SLEEPING:
-					// It could be waiting a long time, so we need to wake it up at a high priority to get it running ASAP.
-					cacheWriteJob.setPriority(Job.INTERACTIVE); // Need to get it going right away
-					cacheWriteJob.wakeUp();
-					// Now drop into the wait.
-				default:
-					// Now wait for it (if not running this will return right away).
-					try {
-						cacheWriteJob.join();
-					} catch (InterruptedException e) {
-					}
-			}
-		}
-	}
-
-	static final Map SAVE_CACHE_OPTIONS;
-	static {
-		SAVE_CACHE_OPTIONS = new HashMap(3);
-		SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, Boolean.TRUE);
-		SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-        SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
-	}
-
-	protected Job cacheWriteJob = null;
-	protected Adapter projectReleaseAdapter = new AdapterImpl() {
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-		 */
-		public boolean isAdapterForType(Object type) {
-			return type == BeanInfoCacheController.this;	// We're making the BeanInfoCacheController.this be the adapter type.
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			if (msg.getEventType() == ProjectResourceSet.SPECIAL_NOTIFICATION_TYPE && msg.getFeatureID(BeanInfoCacheController.class) == ProjectResourceSet.PROJECTRESOURCESET_ABOUT_TO_RELEASE_ID) {
-				// This is an about to be closed. If we have an active write job, bring it up to top priority and wait for it to finish.
-				// This will make sure any resources in the project are written. There may not be any waiting, but this is doing a close
-				// project, which is slow already relatively speaking, that waiting for the cache write job to finish is not bad.
-				waitForCacheSaveJob();
-			}
-		}
-	};
-
-	private void queueClassEntry(ClassEntry ce, ResourceSet rset) {
-		if (cacheWriteQueue == null) {
-			cacheWriteQueue = Collections.synchronizedList(new LinkedList());
-			cacheWriteJob = new Job(BeaninfoCoreMessages.BeanInfoCacheController_Job_WriteBeaninfoCache_Title) { 
-
-				protected IStatus run(IProgressMonitor monitor) {
-					monitor.beginTask("", cacheWriteQueue.size() + 10); // This is actually can change during the run, so we add 10 for the heck of it. //$NON-NLS-1$
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Starting write BeanInfo Cache files.", Level.FINER); //$NON-NLS-1$
-					while (!monitor.isCanceled() && !cacheWriteQueue.isEmpty()) {
-						ClassEntry ce = (ClassEntry) cacheWriteQueue.remove(0); // Get first one.
-						boolean dead = false;
-						synchronized (BeanInfoCacheController.this) {
-							if (ce.getRootIndex().getIndex().isDead()) {
-								dead = true;	// The index is dead, so don't write it. We still need to go through and get the pending resource out of its resource set so that it goes away.
-							}
-						}
-						synchronized (ce) {
-							Resource cres = ce.getPendingResource();
-							if (cres != null) {
-								try {
-									if (!dead)
-										cres.save(SAVE_CACHE_OPTIONS);
-								} catch (IOException e) {
-									BeaninfoPlugin.getPlugin().getLogger().log(e);
-								} finally {
-									// Remove the resource from resource set, clear out the pending.
-									cres.getResourceSet().getResources().remove(cres);
-									ce.setPendingResource(null);
-								}
-							}
-							cres = ce.getPendingOverrideResource();
-							if (cres != null) {
-								try {
-									if (!dead)
-										cres.save(SAVE_CACHE_OPTIONS);
-								} catch (IOException e) {
-									BeaninfoPlugin.getPlugin().getLogger().log(e);
-								} finally {
-									// Remove the resource from resource set, clear out the pending.
-									cres.getResourceSet().getResources().remove(cres);
-									ce.setPendingOverrideResource(null);
-								}
-							}
-							
-							monitor.worked(1);
-						}
-					}
-					monitor.done();
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Finished write BeanInfo Cache files.", Level.FINER); //$NON-NLS-1$
-					return Status.OK_STATUS;
-				}
-			};
-			cacheWriteJob.setPriority(Job.SHORT);
-			cacheWriteJob.setSystem(true);
-		}
-		if (rset != null && EcoreUtil.getExistingAdapter(rset, this) == null) {
-			// If it is a project resource set, then add ourselves as listeners so we know when released.
-			if (rset instanceof ProjectResourceSet)
-				rset.eAdapters().add(projectReleaseAdapter);
-		}
-		cacheWriteQueue.add(ce);
-		cacheWriteJob.schedule(60 * 1000L); // Put off for 1 minute to let other stuff go on. Not important that it happens immediately.
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java
deleted file mode 100644
index b787ff731..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java
+++ /dev/null
@@ -1,148 +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.beaninfo.core;
-
-import java.io.FileNotFoundException;
-
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IContributorOverrideRunnable;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
- 
-/**
- * A default implementation of IBeanInfoContributor for users to subclass. Default does nothing.
- * <p>
- * But this does supply several very useful utility methods.
- * 
- * @since 1.0.0
- */
-public class BeanInfoContributorAdapter implements IBeanInfoContributor {
-	
-	/**
-	 * An empty array of BeaninfoEntry. Available for subclasses to return if they
-	 * decide there is nothing to return.
-	 */
-	public static final BeaninfoEntry[] EMPTY_BEANINFO_ENTRIES = new BeaninfoEntry[0];
-	
-	/**
-	 * Return true if the given fragment is part of the package. Used by subclasses to determine
-	 * if a override associated with a given fragment should be used for the package.
-	 * <p>
-	 * In other words, <code>org.eclipse</code> as a fragment and and <code>org.eclipse.core</code> as
-	 * a packagePath will answer true, but if you swapped them it will answer false.
-	 * 
-	 * @param fragment
-	 * @param packagePath
-	 * @return <code>true</code> if the given fragment is a leading part of the package.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected boolean isFragment(IPath fragment, IPath packagePath) {
-		return fragment.isPrefixOf(packagePath);
-	}
-	
-	/**
-	 * Return the unmatched portion of the package path from a fragment. Used by subclasses
-	 * to get the part of the package path that is after the fragment. This is then used to
-	 * append to the path from the override to get the full path to override files for this
-	 * package.
-	 * <p>
-	 * This will return the part of the packagePath that is not matched by the fragment. 
-	 * <p>
-	 * Note: It is important that the fragment and packagePath have first been tested through
-	 * isFragment. Otherwise an invalid result will be returned.
-	 * 
-	 * @param fragment
-	 * @param packagePath
-	 * @return the part of the package path not matched.
-	 * 
-	 * @see BeanInfoContributorAdapter#isFragment(IPath, IPath)
-	 * @since 1.0.0
-	 */
-	protected String getUnmatchedPath(IPath fragment, IPath packagePath) {
-		return fragment.removeFirstSegments(packagePath.segmentCount()).toString();
-	}
-	
-	/**
-	 * Subclasses can use this helper method to get the override resource from the given (plugin) bundle. 
-	 * 
-	 * @param bundle the bundle to use.
-	 * @param relativePath path of file relative to the plugin.
-	 * @param resource set to load into.
-	 * @param runnable the runnable that is being used for the override. It is used to determine if resource already used once.
-	 * @return the resource or <code>null</code> if couldn't be loaded or if it was already used once.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected Resource loadOverrideResource(Bundle bundle, String relativePath, ResourceSet rset, BeaninfoPlugin.IContributorOverrideRunnable runnable) {
-		URI uri = URI.createURI(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+relativePath); //$NON-NLS-1$
-		if (runnable.resourceContributed(uri))
-			return null;	// Already contributed once.
-		Resource result = null;
-		try {
-			result = rset.getResource(uri, true);
-		} catch (WrappedException e) {
-			// FileNotFoundException is ok
-			if (!(e.exception() instanceof FileNotFoundException)) {
-				if (e.exception() instanceof CoreException
-					&& ((CoreException) e.exception()).getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND) {
-					// This is ok. Means uri_mapping not set so couldn't find in Workspace, also ok.
-				} else {
-					BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-				}
-			}
-			// In case it happened after creating resource but during load. Need to get rid of it in the finally.
-			result = null;
-			Resource res = rset.getResource(uri, false);
-			if (res != null)
-				rset.getResources().remove(res);
-		} catch (Exception e) {
-			// Couldn't load it for some reason.
-			BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
-			// In case it happened after creating resource but during load. Need to get rid of it in the finally.
-			result = null;
-			Resource res = rset.getResource(uri, false);
-			if (res != null)
-				rset.getResources().remove(res);
-		};
-		return result;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor#getBeanInfoEntryContributions(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
-	 */
-	public BeaninfoEntry[] getBeanInfoEntryContributions(IConfigurationContributionInfo info) {
-		return EMPTY_BEANINFO_ENTRIES;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor#runOverrides(org.eclipse.core.runtime.IPath, java.lang.String, org.eclipse.jem.java.JavaClass, org.eclipse.emf.ecore.resource.ResourceSet, org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IContributorOverrideRunnable)
-	 */
-	public void runOverrides(IPath packagePath, String className, JavaClass javaClass, ResourceSet rset, IContributorOverrideRunnable runnable) {
-		// Default is do nothing
-	}
-		
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoCoreMessages.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoCoreMessages.java
deleted file mode 100644
index 2dd5656a6..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoCoreMessages.java
+++ /dev/null
@@ -1,28 +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.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class BeaninfoCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.beaninfo.core.messages";//$NON-NLS-1$
-
-	private BeaninfoCoreMessages() {
-		// Do not instantiate
-	}
-
-	public static String BeanInfoCacheController_Job_WriteBeaninfoCache_Title;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, BeaninfoCoreMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java
deleted file mode 100644
index fbd7fad2d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java
+++ /dev/null
@@ -1,373 +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.core;
-/*
-
-
- */
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.w3c.dom.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-
-/**
- * Beaninfo entry. Location of the beaninfos. Much like a standard classpath entry.
- * The BeanInfos are either in a jar or another project. They can be supplied as
- * a local file in the project, or as an external jar, or as external jar through a
- * variable, or an external jar through a plugin.
- * <p>
- * An external jar through containers is not valid because container are attached to
- * projects. they aren't standalone.
- * 
- * @version 	1.0
- * @author
- */
-public class BeaninfoEntry implements IBeaninfosDocEntry {
-
-	final static String sBeaninfo = "beaninfo"; // Beaninfo entry, shared with BeaninfosDoc. //$NON-NLS-1$
-	
-	public static final int BIE_PLUGIN = 100;	// Beaninfo jar can be found in a plugin.
-
-	static int kindFromString(String kindStr) {
-		if (kindStr == null || kindStr.length() == 0)
-			return BIE_PLUGIN;	// Default to plugin. If coming from beaninfoconfig, there should always be kind. But if coming from plugin.xml there shouldn't be one.
-		if (kindStr.equalsIgnoreCase("con")) //$NON-NLS-1$
-			return IClasspathEntry.CPE_CONTAINER;
-		if (kindStr.equalsIgnoreCase("var")) //$NON-NLS-1$
-			return IClasspathEntry.CPE_VARIABLE;
-		if (kindStr.equalsIgnoreCase("src")) //$NON-NLS-1$
-			return IClasspathEntry.CPE_SOURCE;
-		if (kindStr.equalsIgnoreCase("lib")) //$NON-NLS-1$
-			return IClasspathEntry.CPE_LIBRARY;
-		if (kindStr.equalsIgnoreCase("plugin")) //$NON-NLS-1$
-			return BIE_PLUGIN;
-		return -1;
-	}
-
-	static String kindToString(int kind) {
-
-		switch (kind) {
-			case IClasspathEntry.CPE_PROJECT :
-				return "src"; // backward compatibility //$NON-NLS-1$
-			case IClasspathEntry.CPE_SOURCE :
-				return "src"; //$NON-NLS-1$
-			case IClasspathEntry.CPE_LIBRARY :
-				return "lib"; //$NON-NLS-1$
-			case IClasspathEntry.CPE_VARIABLE :
-				return "var"; //$NON-NLS-1$
-			case IClasspathEntry.CPE_CONTAINER:
-				return "con"; //$NON-NLS-1$
-			case BIE_PLUGIN:
-				return "plugin";	//$NON-NLS-1$
-			default :
-				return "unknown"; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Return the appropriate kind of entry when we know it is a classpath entry.
-	 */
-	public static IClasspathEntry createEntry(int kind, IPath path, IProject project, boolean isExported) {
-		switch (kind) {
-
-			case IClasspathEntry.CPE_LIBRARY :
-				if (path.isAbsolute())
-					return JavaCore.newLibraryEntry(path, null, null, isExported);
-				break;
-
-			case IClasspathEntry.CPE_SOURCE :
-				if (path.isAbsolute()) {
-					// must be an entry in this project or specify another project
-					String projSegment = path.segment(0);
-					if (project != null && projSegment != null && projSegment.equals(project.getName())) {
-						// this project
-						return JavaCore.newSourceEntry(path);
-					} else {
-						// another project
-						return JavaCore.newProjectEntry(path, isExported);
-					}
-				}
-				break;
-
-			case IClasspathEntry.CPE_VARIABLE :
-				return JavaCore.newVariableEntry(path, null, null, isExported);
-			
-			case IClasspathEntry.CPE_CONTAINER:
-				return JavaCore.newContainerEntry(path, isExported);
-
-		}
-
-		return null;
-	}
-	/**
-	 * Read the entry in from the element.
-	 */
-	public static BeaninfoEntry readEntry(IReader reader, Object element, IProject project) {
-		String elementKind = reader.getAttribute(element, BeaninfosDoc.sKind);
-		String pathStr = reader.getAttribute(element, BeaninfosDoc.sPath);
-		// ensure path is absolute
-		IPath path = new Path(pathStr);
-		int kind = kindFromString(elementKind);
-		if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER && kind != BIE_PLUGIN && !path.isAbsolute()) {
-			path = project != null ? project.getFullPath().append(path) : path.makeAbsolute(); // Some folder/jar within this project
-		}
-
-		// exported flag
-		String exportedString = reader.getAttribute(element, BeaninfosDoc.sExported);
-		boolean isExported = "true".equalsIgnoreCase(exportedString); //$NON-NLS-1$
-		//$NON-NLS-1$
-
-		// recreate the entry
-		IClasspathEntry cpEntry = null;
-		IPath pluginPath = null;
-		if (kind != BIE_PLUGIN) {
-			cpEntry = createEntry(kind, path, project, isExported);
-		} else {
-			if (path.isAbsolute())
-				pluginPath = path;
-			else {
-				// Kludge This should only be a plugin type if from configuration element. So we will cast to that
-				// and get the plugin id to create an absolute plugin path.
-				if (element instanceof IConfigurationElement) {
-					pluginPath = new Path('/'+((IConfigurationElement) element).getDeclaringExtension().getContributor().getName()).append(path);
-				} else
-					return null;	// Not valid because can't have plugin from .beaninfoconfig file.
-			}
-		}
-
-		ArrayList searchpaths = new ArrayList();
-		Object children = reader.getChildren(element);
-		int childrenLength = reader.getLength(children);
-		for (int i = 0; i < childrenLength; i++) {
-			Object child = reader.getItem(children, i);
-			if (reader.isNodeTypeElement(child)) {
-				Object entry = null;
-				if (reader.getNodeName(child).equalsIgnoreCase(SearchpathEntry.sSearchpath)) {
-					entry = SearchpathEntry.readEntry(reader, child, project, true);
-				}
-				if (entry != null)
-					searchpaths.add(entry);
-			}
-		}
-
-		if (cpEntry != null)
-			return new BeaninfoEntry(
-				cpEntry,
-				(SearchpathEntry[]) searchpaths.toArray(new SearchpathEntry[searchpaths.size()]),
-				isExported);
-		else return new BeaninfoEntry(
-				pluginPath,
-				(SearchpathEntry[]) searchpaths.toArray(new SearchpathEntry[searchpaths.size()]),
-				isExported);
-	}
-
-	protected IClasspathEntry entry; // Store it as a classpath entry for convienence. It is the RAW classpath entry. This is only used when pointing to something other than a plugin.
-	protected IPath pluginPath;	// When stored in a plugin, this will be set instead.
-	protected boolean isExported;
-	protected SearchpathEntry[] searchpaths;
-	
-	/**
-	 * Used when the beaninfo jar is within a plugin. In that case, the first segment
-	 * of the path is the plugin descriptor, and the rest is the path from the plugin
-	 * directory to the jar.
-	 */
-	public BeaninfoEntry(IPath pluginPath, SearchpathEntry[] searchpaths, boolean isExported) {
-		this(searchpaths, isExported);
-		this.pluginPath = pluginPath;
-	}
-
-	/**
-	 * Used when the beaninfo jar/folder is either an external jar/folder or is somewhere else
-	 * in the workspace. In that case the entry is the RAW classpath entry to that code.
-	 */
-	public BeaninfoEntry(IClasspathEntry entry, SearchpathEntry[] searchpaths, boolean isExported) {
-		this(searchpaths, isExported);
-		this.entry = entry;
-	}
-	
-	protected BeaninfoEntry(SearchpathEntry[] searchpaths, boolean isExported) {
-		this.isExported = isExported;
-		this.searchpaths = searchpaths != null ? searchpaths : new SearchpathEntry[0];
-	}
-	
-	public SearchpathEntry[] getSearchPaths() {
-		return searchpaths;
-	}
-	
-	public void setSearchPaths(SearchpathEntry[] searchpaths) {
-		this.searchpaths = searchpaths;
-	}
-	
-	public boolean isExported() {
-		return isExported;
-	}
-	
-	public void setIsExported(boolean isExported) {
-		this.isExported = isExported;
-	}
-
-	public Node writeEntry(Document doc, IProject project) {
-
-		Element element = doc.createElement(sBeaninfo);
-		IPath path = null;
-		if (entry != null) {
-			element.setAttribute(BeaninfosDoc.sKind, kindToString(entry.getEntryKind()));
-			path = entry.getPath();
-			if (entry.getEntryKind() != IClasspathEntry.CPE_VARIABLE && entry.getEntryKind() != IClasspathEntry.CPE_CONTAINER) {
-				// translate to project relative from absolute (unless a device path)
-				if (path.isAbsolute()) {
-					if (path.segment(0).equals(project.getFullPath().segment(0))) {
-						path = path.removeFirstSegments(1);
-						path = path.makeRelative();
-					} else {
-						path = path.makeAbsolute();
-					}
-				}
-			}
-		} else {
-			element.setAttribute(BeaninfosDoc.sKind, kindToString(BIE_PLUGIN));
-			path = pluginPath;
-		}
-
-		element.setAttribute(BeaninfosDoc.sPath, path.toString()); //$NON-NLS-1$
-		if (isExported()) {
-			element.setAttribute(BeaninfosDoc.sExported, "true"); //$NON-NLS-1$
-		}
-
-		for (int i = 0; i < searchpaths.length; i++) {
-			SearchpathEntry spe = searchpaths[i];
-			element.appendChild(spe.writeEntry(doc, project));
-		}
-
-		return element;
-	}
-	
-	/**
-	 * If this is not a plugin info, then return the classpath entry.
-	 */
-	public IClasspathEntry getClasspathEntry() {
-		return entry;
-	}
-
-	/**
-	 * Return the resolved classpaths. Each entry in the array will be either:
-	 * 1) IProject - If it is a project type entry. Want the whole project
-	 * 2) String - an absolute external path to a jar
-	 * 3) IPath - a path to a plugin jar. The first segment is the plugin id, the rest is the path relative to that plugin.
-	 *            
-	 * 
-	 * @param javaProject
-	 * @return The array of paths, or <code>null</code> if no paths.
-	 * 
-	 * @since 1.0.0
-	 */
-	public Object[] getClasspath(IJavaProject javaProject) {
-		if (entry != null) {
-			// It is a standard CPE Entry.
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			List paths = new ArrayList(1);
-			IClasspathEntry resolvedEntry = JavaCore.getResolvedClasspathEntry(entry);
-			resolveEntry(root, paths, resolvedEntry, javaProject);
-			return paths.toArray();
-		} else if (pluginPath != null) 
-			return new Object[] {pluginPath};
-		
-		return null;
-
-	}
-	
-	private void resolveEntry(IWorkspaceRoot root, List paths, IClasspathEntry entry, IJavaProject javaProject) {
-		switch (entry.getEntryKind()) {
-			case IClasspathEntry.CPE_PROJECT :
-				IProject reqProject = (IProject) root.findMember(entry.getPath().lastSegment());
-				// Project entries only have one segment.
-				if (reqProject != null && reqProject.isOpen())
-					paths.add(reqProject);
-				break;
-
-			case IClasspathEntry.CPE_SOURCE :
-				reqProject = (IProject) root.findMember(entry.getPath().segment(0));
-				// Find project from the first segment.
-				IJavaProject jProject = JavaCore.create(reqProject);
-				if (jProject != null) {
-					try {
-						IPath outputLocation = jProject.getOutputLocation();
-						IResource resource = root.findMember(outputLocation);
-						if (resource != null) {
-							paths.add(resource.getLocation().toString());
-						}
-					} catch(JavaModelException e) {
-					}
-				}
-				break;
-
-			case IClasspathEntry.CPE_LIBRARY :
-				IResource library = root.findMember(entry.getPath());
-				// can be external or in workspace
-				paths.add((library != null) ? library.getLocation().toString() : entry.getPath().toString());
-				break;
-				
-			case IClasspathEntry.CPE_CONTAINER:
-				try {
-					IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), javaProject);
-					if (container != null) {
-						IClasspathEntry[] entries = container.getClasspathEntries();
-						for (int i = 0; i < entries.length; i++) {
-							resolveEntry(root, paths, entries[i], javaProject);
-						}
-					}
-				} catch (JavaModelException e) {
-					BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-				}			
-		}
-	}
-
-	public int getKind() {
-		return entry != null ? entry.getEntryKind() : BIE_PLUGIN;
-	}
-	
-	public IPath getPath() {
-		return entry != null ? entry.getPath() : pluginPath;
-	}
-	
-	public boolean equals(Object other) {
-		if (this == other)
-			return true;
-			
-		if (!(other instanceof BeaninfoEntry))
-			return false;
-
-		// Return equal if the classpath entry is the same classpath entry or plugin path entry.
-		// The search path doesn't have any affect on the semantic equality.
-		BeaninfoEntry otherEntry = (BeaninfoEntry) other;
-		if (isExported != otherEntry.isExported)
-			return false;	
-		if (entry != null)
-			return entry.equals(otherEntry.entry);
-		
-		return pluginPath.equals(otherEntry.pluginPath);
-	}
-	
-	public int hashCode() {
-		if (entry != null)
-			return entry.hashCode() ^ (isExported ? Boolean.TRUE : Boolean.FALSE).hashCode();
-		else
-			return pluginPath.hashCode() ^ (isExported ? Boolean.TRUE : Boolean.FALSE).hashCode();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java
deleted file mode 100644
index 55512ec82..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java
+++ /dev/null
@@ -1,752 +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.core;
-/*
-
-
- */
-
-
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.JavaCore;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ContainerPathContributionMapping.ContainerContributionEntry;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo.ContainerPaths;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * The plugin class for the org.eclipse.jem.internal.proxy.core plugin.
- */
-
-public class BeaninfoPlugin extends Plugin {
-	public static final String PI_BEANINFO_PLUGINID = "org.eclipse.jem.beaninfo";	// Plugin ID, used for QualifiedName. //$NON-NLS-1$
-	public static final String PI_BEANINFO_OVERRIDES = "overrides";	// ID of the overrides extension point. //$NON-NLS-1$
-	
-	private static BeaninfoPlugin BEANINFO_PLUGIN = null;
-		
-	public BeaninfoPlugin() {	
-		BEANINFO_PLUGIN = this;
-	}
-	
-	/**
-	 * Accessor method to get the singleton plugin.
-	 */
-	public static BeaninfoPlugin getPlugin() {
-		return BEANINFO_PLUGIN;
-	}
-	
-	/**
-	 * Special Override file name used when need to apply an override to a class that is at the root.
-	 * A root is one that doesn't have a super type. These are <code>java.lang.Object</code>, interfaces, and any
-	 * undefined classes (i.e. classes that don't actually exist).
-	 */
-	public static final String ROOT = "..ROOT.."; //$NON-NLS-1$
-	
-
-	/**
-	 * Special override scheme to refer to the current java class. (As in "X:ROOT#//@root").
-	 * @since 1.2.0
-	 */
-	public static final String ROOT_SCHEMA = "X"; //$NON-NLS-1$
-	
-	/**
-	 * Special override opaque part to refer to the current java class. (As in "X:ROOT#//@root").
-	 * @since 1.2.0
-	 */
-	public static final String ROOT_OPAQUE = "ROOT"; //$NON-NLS-1$
-	
-	/**
-	 * The extension used on any override file when you pass in a path through the method that takes a string.
-	 */
-	public static final String OVERRIDE_EXTENSION = "override";	//$NON-NLS-1$
-		
-	
-	/*
-	 * Map of open natures. This map is needed because on shutdown of beaninfo plugin we need
-	 * to shutdown the natures. If we don't do that there is a slight possibility of an error
-	 * because proxy plugin will shutdown and this can cause a callback into beaninfo which has
-	 * already been shutdown. It calls back through the registry listener that BeaninfoNature
-	 * added to the registry to notify that the registry is being shutdown.
-	 * 
-	 * Also BeanInfoCacheController needs to know so that it can tell it the project is closing or
-	 * being deleted or that it needs to be cleared due to a clear request.
-	 */
-	private Map openNatures;
-	
-	private ContainerPathContributionMapping beaninfoEntryContributionsMapping;
-	private ContainerPathContributionMapping contributorContributionsMapping;
-	private Map pluginToBeaninfoEntryContributions;
-	private Map pluginToContributors;
-	
-	/*
-	 * Override contributions from extension point.
-	 * ocFragments: Array of fragments paths. When a match is found for a path, the index
-	 * 		is the index into the ocContainerIds and ocPluginIds array for the contributions.
-	 * ocContainerIds: The first dimension is the index of the fragment that the list of OverrideContributions is for.
-	 * 		The second dimension is the array of contributions for that fragment, one per container id.
-	 * ocPluginIds: The first dimension is the index of the fragment that the list of OverrideContributions is for.
-	 * 		The second dimension is the array of contributions for that fragment, one per plugin id.
-	 * 
-	 * If a particular fragment doesn't have any entries of container and/or plugin, then EMPTY_OC is used for that
-	 * entry so that we don't need to check for null.
-	 * 
-	 * How this is used is for a particular path requested, the ocFragments will be searched for the fragments that
-	 * are appropriate, then the index of the entry is used to walk through the OC[] array returned from the ocContainerIds
-	 * or ocPluginIds. Each contribution would be checked to see if the container id/plugin id is in the visible classpath (through 
-	 * the info data stored in the persistent property). If it is, then the overrides from that contribution will be used.
-	 */
-	private IPath ocFragments[];
-	private OverrideContribution[][] ocContainerIds;
-	private OverrideContribution[][] ocPluginIds;
-	
-	private static final OverrideContribution[] EMPTY_OC = new OverrideContribution[0];	// Used for an empty contribution list for a fragment.
-
-	public synchronized BeaninfoEntry[] getContainerIdBeanInfos(String containerID, String[] containerPaths) {
-		if (beaninfoEntryContributionsMapping == null)
-			processBeanInfoContributionExtensionPoint();
-		return (BeaninfoEntry[]) beaninfoEntryContributionsMapping.getContributors(containerID, containerPaths);
-	}
-	
-	public synchronized BeaninfoEntry[] getPluginBeanInfos(String pluginid) {
-		if (pluginToBeaninfoEntryContributions == null)
-			processBeanInfoContributionExtensionPoint();
-		return (BeaninfoEntry[]) pluginToBeaninfoEntryContributions.get(pluginid);
-	}
-	
-	public synchronized IConfigurationElement[] getPluginContributors(String pluginid) {
-		if (pluginToContributors == null)
-			processBeanInfoContributionExtensionPoint();
-		return (IConfigurationElement[]) pluginToContributors.get(pluginid);
-	}	
-	
-	public synchronized IConfigurationElement[] getContainerIdContributors(String containerID, String[] containerPaths) {
-		if (contributorContributionsMapping == null)
-			processBeanInfoContributionExtensionPoint();
-		return (IConfigurationElement[]) contributorContributionsMapping.getContributors(containerID, containerPaths);
-	}	
-	
-	public static final String PI_BEANINFO_CONTRIBUTION_EXTENSION_POINT = PI_BEANINFO_PLUGINID+".registrations"; //$NON-NLS-1$
-	public static final String PI_REGISTRATION = "registration"; //$NON-NLS-1$
-	public static final String PI_BEANINFO = "beaninfo";  //$NON-NLS-1$
-	public static final String PI_OVERRIDE = "override"; //$NON-NLS-1$
-	public static final String PI_CONTRIBUTOR = "contributor"; //$NON-NLS-1$
-	public static final String PI_PACKAGE = "package"; //$NON-NLS-1$
-	public static final String PI_PATH = "path"; //$NON-NLS-1$
-	
-	protected synchronized void processBeanInfoContributionExtensionPoint() {
-		ContributorExtensionPointInfo info = ProxyPlugin.processContributionExtensionPoint(PI_BEANINFO_CONTRIBUTION_EXTENSION_POINT);
-		ConfigurationElementReader reader = new ConfigurationElementReader();
-		// Process the container IDs first. We can't use the info directly because the actual configuration elements of interest are
-		// sub-elements of the info. The info contains the container path that we need.
-		beaninfoEntryContributionsMapping = new ContainerPathContributionMapping(BeaninfoEntry.class);
-		contributorContributionsMapping = new ContainerPathContributionMapping(IConfigurationElement.class);
-
-		Map fragmentsToIds = new HashMap();
-		for (Iterator iter = info.containerPathContributions.containerIdToContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry= (Map.Entry) iter.next();
-			String containerid = (String) entry.getKey();
-			ContainerContributionEntry[] contribElements = (ContainerContributionEntry[]) entry.getValue();
-			for (int i = 0; i < contribElements.length; i++) {
-				ContainerContributionEntry contribElement = contribElements[i];
-				IConfigurationElement element = (IConfigurationElement) contribElement.getContribution();
-				if (PI_REGISTRATION.equals(element.getName())) {
-					IConfigurationElement[] children = element.getChildren();
-					for (int j = 0; j < children.length; j++) {
-						IConfigurationElement child = children[j];
-						if (PI_BEANINFO.equals(child.getName())) {
-							// This is a beaninfo entry
-							BeaninfoEntry be = BeaninfoEntry.readEntry(reader, child, null);
-							if (be != null)
-								beaninfoEntryContributionsMapping.addContribution(containerid, contribElement.getContainerPathPattern(), be);
-						} else if (PI_OVERRIDE.equals(child.getName())) {
-							addOverrideEntry(fragmentsToIds, true, containerid, contribElement.getContainerPathPattern(), child);
-						}
-					}
-				} else if (PI_CONTRIBUTOR.equals(element.getName())) {
-					contributorContributionsMapping.addContribution(containerid, contribElement.getContainerPathPattern(), element);
-				}
-			}
-		}
-			
-		beaninfoEntryContributionsMapping.finalizeMapping();
-		contributorContributionsMapping.finalizeMapping();
-		
-		// Now process the plugin IDs.
-		pluginToBeaninfoEntryContributions = new HashMap(info.pluginToContributions.size());		
-		for (Iterator iter = info.pluginToContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry= (Map.Entry) iter.next();
-			String pluginId = (String) entry.getKey();
-			IConfigurationElement[] configElements = (IConfigurationElement[]) entry.getValue();
-			for (int i = 0; i < configElements.length; i++) {
-				IConfigurationElement element = configElements[i];
-				if (PI_REGISTRATION.equals(element.getName())) {
-					IConfigurationElement[] children = element.getChildren();
-					for (int j = 0; j < children.length; j++) {
-						IConfigurationElement child = children[j];
-						if (PI_BEANINFO.equals(child.getName())) {
-							// This is a beaninfo entry
-							BeaninfoEntry be = BeaninfoEntry.readEntry(reader, child, null);
-							if (be != null)
-								addEntry(pluginToBeaninfoEntryContributions, pluginId, be);
-						} else if (PI_OVERRIDE.equals(child.getName())) {
-							addOverrideEntry(fragmentsToIds, false, pluginId, null, child);
-						}
-					}
-				} else if (PI_CONTRIBUTOR.equals(element.getName())) {
-						if (pluginToContributors == null)
-							pluginToContributors = new HashMap(5);	// These are rare, don't create until necessary.
-						addEntry(pluginToContributors, pluginId, element);
-					}
-				}
-			}
-			
-		// Now go through and turn all of the contribution lists into arrays.
-		for (Iterator iter = pluginToBeaninfoEntryContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			entry.setValue(((List) entry.getValue()).toArray(new BeaninfoEntry[((List) entry.getValue()).size()]));
-		}
-		
-		if (pluginToContributors == null)
-				pluginToContributors = Collections.EMPTY_MAP;	// Since we don't have any.
-		else {
-			for (Iterator iter = pluginToContributors.entrySet().iterator(); iter.hasNext();) {
-				Map.Entry entry = (Map.Entry) iter.next();
-				entry.setValue(((List) entry.getValue()).toArray(new IConfigurationElement[((List) entry.getValue()).size()]));
-			}			
-		}
-		
-		// Now handle the entire list of fragments.
-		ocFragments = new IPath[fragmentsToIds.size()];
-		ocContainerIds = new OverrideContribution[ocFragments.length][];
-		ocPluginIds = new OverrideContribution[ocFragments.length][];
-		Iterator iter;
-		int fragIndex;
-		for (iter = fragmentsToIds.entrySet().iterator(), fragIndex=0; iter.hasNext(); fragIndex++) {
-			Map.Entry mapEntry = (Map.Entry) iter.next();
-			ocFragments[fragIndex] = (IPath) mapEntry.getKey();
-			Map[] mapValue = (Map[]) mapEntry.getValue();
-			if (mapValue[0] == null)
-				ocContainerIds[fragIndex] = EMPTY_OC;
-			else {
-				Map containers = mapValue[0];
-				List ocContributions = new ArrayList();
-				for (Iterator ocIterator = containers.entrySet().iterator(); ocIterator.hasNext();) {
-					Map.Entry containerEntry = (Map.Entry) ocIterator.next();
-					String containerID = (String) containerEntry.getKey();
-					for (Iterator patternIterator = ((Map) containerEntry.getValue()).entrySet().iterator(); patternIterator.hasNext();) {
-						Map.Entry patternEntry = (Entry) patternIterator.next();
-						OverrideContribution oc = new OverrideContribution();
-						oc.id = containerID;
-						oc.pattern = (Pattern) patternEntry.getKey();
-						List[] ocLists = (List[]) patternEntry.getValue();
-						oc.pluginIds = (String[]) ocLists[0].toArray(new String[ocLists[0].size()]);
-						oc.paths = (String[]) ocLists[1].toArray(new String[ocLists[1].size()]);
-						ocContributions.add(oc);
-					}
-				}
-				ocContainerIds[fragIndex] = (OverrideContribution[]) ocContributions.toArray(new OverrideContribution[ocContributions.size()]);
-			}
-			if (mapValue[1] == null)
-				ocPluginIds[fragIndex] = EMPTY_OC;
-			else {
-				Map plugins = mapValue[1];
-				OverrideContribution[] ocContribution = ocPluginIds[fragIndex] = new OverrideContribution[plugins.size()];
-				int ocIndex;
-				Iterator ocIterator;
-				for (ocIterator = plugins.entrySet().iterator(), ocIndex=0; ocIterator.hasNext(); ocIndex++) {
-					Map.Entry pluginEntry = (Map.Entry) ocIterator.next();
-					OverrideContribution oc = ocContribution[ocIndex] = new OverrideContribution();
-					oc.id = (String) pluginEntry.getKey();
-					List[] ocLists = (List[]) pluginEntry.getValue();
-					oc.pluginIds = (String[]) ocLists[0].toArray(new String[ocLists[0].size()]);
-					oc.paths = (String[]) ocLists[1].toArray(new String[ocLists[1].size()]);
-				}
-			}			
-		}
-	}
-	
-	/*
-	 * Add an entry to the map. If the key doesn't exist, create an entry as an array. Then add the entry to array.
-	 */
-	private void addEntry(Map map, Object key, Object entry) {
-		List mapEntry = (List) map.get(key);
-		if (mapEntry == null) {
-			mapEntry = new ArrayList(1);
-			map.put(key, mapEntry);
-		}
-		mapEntry.add(entry);
-	}
-	
-	/*
-	 * Add an entry to the map.
-	 * id is the container path pattern/plugin id.
-	 * 
-	 * The structure of the map is:
-	 * 	key: fragment name
-	 * 	value: Map[2], where [0] is for container id, and [1] is for plugin ids.
-	 * 		Map[x]:
-	 * 			key: container/plugin id
-	 * 			value: Map(pattern->List(FinalOverride)) for container, of FinalOverride for plugin. 
-	 * 
-	 * FinalOverride: List[2], where [0] is list of plugin ids for the override, and [1] is list of paths for the override files relative to that plugin id.
-	 * 
-	 * After all done these maps/list will be boiled down to the arrays that will be used for lookup.
-	 */
-	private void addOverrideEntry(Map map, boolean container, Object id, Pattern pattern, IConfigurationElement entry) {
-		
-		String packageName = entry.getAttribute(PI_PACKAGE);
-		String plugin = null;
-		String pathString = entry.getAttribute(PI_PATH);
-		IPath fragment = null; 
-		if (packageName != null && packageName.length() > 0 && pathString != null && pathString.length() > 0) { 
-			fragment = new Path(packageName.replace('.', '/'));
-			if (pathString.charAt(pathString.length()-1) != '/')
-				pathString += '/';
-			if (pathString.charAt(0) != '/')
-				plugin = entry.getDeclaringExtension().getContributor().getName();
-			else {
-				if (pathString.length() > 4) {
-					int pend = pathString.indexOf('/', 1);
-					if (pend == -1 || pend >= pathString.length()-1)
-						return;	// invalid
-					plugin = pathString.substring(1, pend);
-					pathString = pathString.substring(pend+1);
-				} else
-					return;	// invalid
-			}
-		}
-		if (pathString.length() < 2)
-			return;	// invalid
-
-		Map[] mapEntry = (Map[]) map.get(fragment);
-		if (mapEntry == null) {
-			mapEntry = new HashMap[2];
-			map.put(fragment, mapEntry);
-		}
-		List[] idEntry;
-		if (container) {
-			if (mapEntry[0] == null)
-				mapEntry[0] = new HashMap(2);
-			
-			Map patternMap = (Map) mapEntry[0].get(id);
-			if (patternMap == null)
-				mapEntry[0].put(id, patternMap = new HashMap());
-			
-			idEntry = (List[]) patternMap.get(pattern);
-			if (idEntry == null) {
-				patternMap.put(pattern, idEntry = new List[] { new ArrayList(1), new ArrayList(1)});
-			}
-		} else {
-			if (mapEntry[1] == null)
-				mapEntry[1] = new HashMap(2);
-
-			idEntry = (List[]) mapEntry[1].get(id);
-			if (idEntry == null) {
-				mapEntry[1].put(id, idEntry = new List[] { new ArrayList(1), new ArrayList(1)});
-			}
-		}
-		idEntry[0].add(plugin);
-		idEntry[1].add(pathString);
-
-
-	}	
-			
-	/*
-	 * This is an list of overrides that are available as a contribution for a specific fragment.
-	 * <ul>
-	 * <li>The id of this contribution. Either container (Pattern) or plugin id depending on which list it was in..
-	 * <li>The plugins array lists the plugin ids for all of the paths in this contribution.
-	 * <li>The paths array lists the folder path under that corresponding plugin from "pluginIds".
-	 * </ul> 
-	 * <p>
-	 * 
-	 * @since 1.0.0
-	 */
-	private static class OverrideContribution {
-		public String id;
-		public Pattern pattern;	// Used only for containers.
-		public String[] pluginIds;
-		public String[] paths;
-	}
-	
-	/**
-	 * The runnable is to used to apply override. 
-	 * <p>
-	 * This will be called in sequence for each override path found. It is send in on the apply overrides call. This
-	 * interface implementation is private.
-	 * <p>
-	 * Clients (implementers of the IBeanInfoContributor) will be passed in the subinterface <code>IContributorOverrideRunnable</code> which
-	 * inherits from this interface.
-	 * <p>
-	 * This interface is not intended to be implemented by clients. 
-	 * 
-	 * @since 1.0.0
-	 * @see BeaninfoPlugin#applyOverrides(IProject, String, String, ResourceSet, IOverrideRunnable)
-	 */
-	public interface IOverrideRunnable {
-		/**
-		 * This will be called with the directory path to use. It will be called over and over for every
-		 * override path found for a package. The path will be complete, including trailing '/'.
-		 * It will be in a URI format for a directory. The overriderunnable implementation will then append the filename call (i.e. classbeingintrospected.override) to get a complete path.
-		 * <p>
-		 * Clients (IBeanInfoContributor implementers) can call this to apply a specific override file to the current
-		 * class being processed.
-		 * 
-		 * @param overridePath the path will be complete, including trailing '/'. It will be in a URI format for a directory. The override file name (classname.override) will be appended to this and retrieved and applied.
-		 * 
-		 * @since 1.0.0
-		 */
-		public void run(String overridePath);
-		
-		/**
-		 * This will be called with the actual resource to use. This will be called by special contributors that want
-		 * a special explicit override resource to be used.
-		 * <p>
-		 * Contributors should use the ResourceSet that was passed into them. This is so that anything java class that
-		 * the override resource points to will be found.
-		 * <p>
-		 * This resource will be automatically removed by BeanInfo after being applied. It must not be left around because
-		 * in the process of being applied it will be modified, so it could not be reused. 
-		 *  
-		 * @param overrideResource the resource to apply to the current class. NOTE: This resource WILL be removed from
-		 * the resource set it is in automatically by this call. It won't be left around because the action of apply
-		 * will actually modify the resource.
-		 * 
-		 * @since 1.0.0
-		 */
-		public void run(Resource overrideRes);
-	}
-	
-	/**
-	 * IBeanInfoContributor runnable to use to apply overrides.
-	 * <p>
-	 * An implementation of this will be passed in to IBeanInfoContributor's so that they can call back to apply the overrides. They
-	 * should call the appropriate run method once for each override to be applied. The run can be called more than once from each IBeanInfoContributor.
-	 * <p>
-	 * It inherits from <code>IOverrideRunnable</code>, so see that for more methods to call.
-	 * <p>
-	 * This interface is not intended to be implemented by clients.
-	 * 
-	 * @see BeaninfoPlugin.IOverrideRunnable for more methods that can be called.
-	 * @since 1.0.0
-	 */
-	public interface IContributorOverrideRunnable extends IOverrideRunnable {
-		
-		/**
-		 * Tests if path has already been contributed once for the current class.
-		 * <p>
-		 * This can be called by the IBeanInfoContributor for overrides to test if the path (same path as for the IOverrideRunnable.run(String) method)
-		 * has already been contributed once for this class. It can be used to save time. However it is not necessary because
-		 * BeanInfo will not permit it to be contributed more than once for a class.
-		 * 
-		 * @param path
-		 * @return <code>true</code> if used already.
-		 * 
-		 * @see IOverrideRunnable#run(String)
-		 * @since 1.0.0
-		 */
-		public boolean pathContributed(String path);
-		
-		/**
-		 * Tests if the URI has already been contributed once for the current class.
-		 * <p>
-		 * This can be called by an IBeanInfoContributor for overrides to see if the URI (same path as the URI from the IOverrideRunnable.run(Resource) method)
-		 * has already been contributed once for this class. It can be used to save time. However, not necessary because
-		 * BeanInfo will not permit the URI to be contributed more than once for a class.
-		 * 
-		 * @param resourceURI
-		 * @return <code>true</code> if used already.
-		 * 
-		 * @see IOverrideRunnable#run(Resource)
-		 * @since 1.0.0
-		 */
-		public boolean resourceContributed(URI resourceURI);
-	}
-	
-	private static final String[] NO_PATHS = new String[0];
-	
-	/**
-	 * Return just the contributed override paths (through the BeanInfo registrations). Does not include any paths that are contributed from
-	 * IBeanInfoContributor's. This is used by the BeanInfoClassAdapter to load the overrides files into one cache file so that it can
-	 * be done at one time the next time it is needed.
-	 * 
-	 * @param project
-	 * @param packageName
-	 * @return array of path strings to the override. The files may not exist, they is just possible overrides. 
-	 * 
-	 * @since 1.1.0
-	 */
-	public String[] getOverridePaths(IProject project, String packageName) {
-		final IPath packagePath = new Path(packageName.replace('.', '/')+'/');
-		List overridePaths = new ArrayList();
-		try {
-			IConfigurationContributionInfo info = (IConfigurationContributionInfo) project.getSessionProperty(BeaninfoNature.CONFIG_INFO_SESSION_KEY);
-			if (info == null) {
-				// It hasn't been created yet, so we need to create our own internal version here.
-				info = ProxyLaunchSupport.createDefaultConfigurationContributionInfo(JavaCore.create(project));					
-				BeaninfoNature.computeBeanInfoConfigInfo(info);
-			}
-			synchronized (this) {
-				if (ocFragments == null)
-					processBeanInfoContributionExtensionPoint(); // We haven't processed them yet.
-			}
-			
-			// Cache of tested patterns. (Pattern->Boolean). If a pattern has been tested against all visible container paths we don't need to test the
-			// pattern again if it is found again. (Note: This works for efficiency because ProxyPlugin uses the same pattern instance for
-			// same pattern found while processing one extension point). The value is true if the pattern matches a visible container path.
-			Map testedPatterns = new HashMap();	
-			for (int fragmentIndex = 0; fragmentIndex < ocFragments.length; fragmentIndex++) {
-				if (ocFragments[fragmentIndex].isPrefixOf(packagePath)) {
-					String leftOver = null;	// The left over portion of the package. This will be set first time needed. 
-					OverrideContribution[] cntrContributions = ocContainerIds[fragmentIndex];
-					for (int ocindex = 0; ocindex < cntrContributions.length; ocindex++) {
-						OverrideContribution contribution = cntrContributions[ocindex];
-						Boolean tested = (Boolean) testedPatterns.get(contribution.pattern);
-						if (tested == null) {
-							tested = Boolean.FALSE;
-							ContainerPaths containerPaths = (ContainerPaths) info.getContainerIds().get(contribution.id);
-							if (containerPaths != null) {
-								String[] visible = containerPaths.getVisibleContainerPaths();
-								for (int i = 0; i < visible.length; i++) {
-									if (contribution.pattern.matcher(visible[i]).matches()) {
-										tested = Boolean.TRUE;
-										break;
-									}
-								}
-							}
-							testedPatterns.put(contribution.pattern, tested);
-						}
-						
-						if (tested.booleanValue()) {
-							for (int cindex = 0; cindex < contribution.pluginIds.length; cindex++) {
-								// Because of URIConverters and normalization in org.eclipse.jem.util stuff, we
-								// need to have plugin uri's in the form "platform:/plugin/pluginname".
-								// Bundle's don't return this format. They return bundle:/stuff
-								// So we will simple create it of the platform:/plugin format.
-								// To save time, we will first see if we have the bundle.
-								Bundle bundle = Platform.getBundle(contribution.pluginIds[cindex]);
-								if (bundle != null) {
-									if (leftOver == null)
-										leftOver = getLeftOver(ocFragments[fragmentIndex], packagePath);
-									overridePaths.add(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+contribution.paths[cindex]+leftOver); //$NON-NLS-1$
-								}
-							}
-						}
-					}
-					
-					OverrideContribution[] pluginContributions = ocPluginIds[fragmentIndex];
-					for (int ocindex = 0; ocindex < pluginContributions.length; ocindex++) {
-						OverrideContribution contribution = pluginContributions[ocindex];
-						Boolean visible = (Boolean) info.getPluginIds().get(contribution.id);
-						if (visible != null && visible.booleanValue()) {
-							for (int cindex = 0; cindex < contribution.pluginIds.length; cindex++) {
-								Bundle bundle = Platform.getBundle(contribution.pluginIds[cindex]);
-								if (bundle != null) {
-									if (leftOver == null)
-										leftOver = getLeftOver(ocFragments[fragmentIndex], packagePath);
-									overridePaths.add(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+contribution.paths[cindex]+leftOver); //$NON-NLS-1$
-								}
-							}
-						}
-					}
-				}
-			}
-		} catch (CoreException e) {
-			getLogger().log(e, Level.INFO);
-		}
-		return overridePaths.isEmpty() ? NO_PATHS : (String[]) overridePaths.toArray(new String[overridePaths.size()]);
-	}
-	
-	/**
-	 * Apply the runnable to all of the override paths that are applicable to the 
-	 * given package name. It will run through the explicit contributors and the IContainers that implement IBeanInfoContributor.
-	 * <p>
-	 * The package name uses '.' to delineate the fragments of the name,
-	 * i.e. use "<code>java.lang</code>" as a package name.
-	 * <p>
-	 * Note: This is not meant to be called by clients. It is public only because an internal class in another package needs to call it.
-	 * TODO This should be package-protected. Later the other class will be moved into this package.
-	 * 
-	 * @param project the project to run against.
-	 * @param packageName
-	 * @param className class name of the class that is being overridden.
-	 * @param javaClass the java class the overrides will be applied to.
-	 * @param resource set that contributors can use to temporarily load dynamic override files.
-	 * @param runnable use this runnable to actually apply overrides.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void applyOverrides(final IProject project, String packageName, final String className, final JavaClass javaClass, final ResourceSet rset, final IOverrideRunnable runnable) {
-		final IPath packagePath = new Path(packageName.replace('.', '/')+'/');
-		try {
-			IConfigurationContributionInfo info = (IConfigurationContributionInfo) project.getSessionProperty(BeaninfoNature.CONFIG_INFO_SESSION_KEY);
-			if (info == null) {
-				// It hasn't been created yet, so we need to create our own internal version here.
-				info = ProxyLaunchSupport.createDefaultConfigurationContributionInfo(JavaCore.create(project));					
-				BeaninfoNature.computeBeanInfoConfigInfo(info);
-			}
-			final IBeanInfoContributor[] explicitContributors = (IBeanInfoContributor[]) project.getSessionProperty(BeaninfoNature.BEANINFO_CONTRIBUTORS_SESSION_KEY);
-			synchronized (this) {
-				if (ocFragments == null)
-					processBeanInfoContributionExtensionPoint(); // We haven't processed them yet.
-			}
-
-			final Set usedPaths = new HashSet(10);	// Set of used paths. So that the contributors don't supply a path already used. This could cause problems if they did.
-			final IContributorOverrideRunnable contribRunnable = new IContributorOverrideRunnable() {
-				public void run(String overridePath) {
-					if (!usedPaths.contains(overridePath)) {
-						usedPaths.add(overridePath);
-						runnable.run(overridePath);
-					}
-				}
-				
-				public void run(Resource overrideRes) {
-					if (!usedPaths.contains(overrideRes.getURI())) {
-						usedPaths.add(overrideRes.getURI());
-						try {
-							runnable.run(overrideRes);
-						} finally {
-							overrideRes.getResourceSet().getResources().remove(overrideRes);
-						}
-					}
-				}
-				
-				public boolean pathContributed(String path) {
-					return usedPaths.contains(path);
-				}
-				
-				public boolean resourceContributed(URI resourceURI) {
-					return usedPaths.contains(resourceURI);
-				}
-			};
-			
-			// Run through the containers that implement IBeanInfoContributor.
-			for (Iterator iter = info.getContainers().entrySet().iterator(); iter.hasNext();) {
-				Map.Entry mapEntry = (Map.Entry) iter.next();
-				final IClasspathContainer container = (IClasspathContainer) mapEntry.getKey();
-				if (container instanceof IBeanInfoContributor && ((Boolean) mapEntry.getValue()).booleanValue()) {
-					SafeRunner.run(new ISafeRunnable() {
-						public void handleException(Throwable exception) {
-							// Standard run logs to .log
-						}
-						public void run() throws Exception {
-							((IBeanInfoContributor) container).runOverrides(packagePath, className, javaClass, rset, contribRunnable);						
-						}
-					});
-				}
-			}
-			
-			// Run through the explicit contributors.
-			for (int i=0; i<explicitContributors.length; i++) {
-				final int ii = i;
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Standard run logs to .log
-					}
-					public void run() throws Exception {
-						explicitContributors[ii].runOverrides(packagePath, className, javaClass, rset, contribRunnable);						
-					}
-				});
-			}			
-		} catch (CoreException e) {
-			getLogger().log(e, Level.INFO);
-		}
-	}
-	
-	private String getLeftOver(IPath fragment, IPath packagePath) {
-		return packagePath.removeFirstSegments(fragment.segmentCount()).toString();
-	}
-	
-	private Logger logger;
-	public Logger getLogger() {
-		if (logger == null)
-			logger = EclipseLogger.getEclipseLogger(this);
-		return logger;
-	}
-	
-	/**
-	 * Add that a BeanInfo nature is active. This is used to tell it to shutdown when beaninfo shuts down.
-	 * TODO <package-protected> because only BeanInfoNature should call it. (public for now but when we make
-	 * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
-	 * 
-	 * @param nature
-	 * 
-	 * @since 1.0.0
-	 */
-	public void addBeanInfoNature(BeaninfoNature nature) {
-		if (openNatures == null)
-			openNatures = new HashMap();
-		openNatures.put(nature.getProject(), nature);
-	}
-	
-	/**
-	 * Mark that a BeanInfo nature is not active. This is used to tell it to shutdown when beaninfo shuts down.
-	 * TODO <package-protected> because only BeanInfoNature should call it. (public for now but when we make
-	 * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
-	 * 
-	 * @param nature
-	 * 
-	 * @since 1.0.0
-	 */
-	public void removeBeanInfoNature(BeaninfoNature nature) {
-		if (openNatures != null)
-			openNatures.remove(nature.getProject());
-	}
-	
-	/**
-	 * Return the registered nature, if any, for the project. This will not cause the
-	 * nature to be created.
-	 * <p>
-	 * <package-protected> because only BeanInfoCacheController should access it.
-	 * @param project
-	 * @return nature for project or <code>null</code> if not registered.
-	 * 
-	 * @since 1.1.0
-	 */
-	BeaninfoNature getNature(IProject project) {
-		return (BeaninfoNature) openNatures.get(project);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		if (openNatures != null && !openNatures.isEmpty()) {
-			for (Iterator natureItr = openNatures.values().iterator(); natureItr.hasNext();) {
-				BeaninfoNature nature = (BeaninfoNature) natureItr.next();
-				nature.shutdown();
-			}
-		}
-			
-		super.stop(context);
-	}
-}
-
-
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java
deleted file mode 100644
index d8cb816d8..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java
+++ /dev/null
@@ -1,79 +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.core;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
- * This is the registration information for registered beaninfos in the BeaninfoPlugin.
- * @version 	1.0
- * @author
- */
-public class BeaninfoRegistration {
-	
-	protected BeaninfosDoc doc;
-	protected IConfigurationElement variableElement;	// This is used to get contributor element. If null, then no contributor.
-	
-	public BeaninfoRegistration() {
-	}
-	
-	/**
-	 * Construct with a BeaninfosDoc
-	 */
-	public BeaninfoRegistration(BeaninfosDoc doc) {
-		this.doc = doc;
-	}
-	
-	/**
-	 * Construct with a BeaninfosDoc and variable element.
-	 */
-	public BeaninfoRegistration(BeaninfosDoc doc, IConfigurationElement variableElement) {
-		this.doc = doc;
-		this.variableElement = variableElement;
-	}	
-
-	/**
-	 * Gets the doc.
-	 * @return Returns a BeaninfosDoc
-	 */
-	public BeaninfosDoc getDoc() {
-		return doc;
-	}
-
-	/**
-	 * Sets the doc.
-	 * @param doc The doc to set
-	 */
-	public void setDoc(BeaninfosDoc doc) {
-		this.doc = doc;
-	}
-
-	/**
-	 * Gets the variableElement.
-	 * @return Returns a IConfigurationElement
-	 */
-	public IConfigurationElement getVariableElement() {
-		return variableElement;
-	}
-
-	/**
-	 * Sets the variableElement.
-	 * @param variableElement The variableElement to set
-	 */
-	public void setVariableElement(IConfigurationElement variableElement) {
-		this.variableElement = variableElement;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java
deleted file mode 100644
index 5869c809e..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java
+++ /dev/null
@@ -1,87 +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.core;
-/*
-
-
- */
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.w3c.dom.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-/**
- * Beaninfos document in-memory format.
- */
-
-public class BeaninfosDoc implements IBeaninfosDocEntry {
-
-	protected IBeaninfosDocEntry[] searchpath;
-
-	static final String sExported = "exported"; //$NON-NLS-1$
-
-	static final String sKind = "kind"; //$NON-NLS-1$
-
-	static final String sPath = "path"; //$NON-NLS-1$
-
-	public BeaninfosDoc() {
-	}
-
-	public BeaninfosDoc(IBeaninfosDocEntry[] searchpath) {
-		this.searchpath = searchpath;
-	}
-
-	public int getKind() {
-		return -1;	// N.A.
-	}
-	
-	public IPath getPath() {
-		return null;	// N.A.
-	}
-	
-	public static BeaninfosDoc readEntry(IReader reader, Object root, IProject project) {
-		ArrayList paths = new ArrayList();
-		Object children = reader.getChildren(root);
-		int childrenLength = reader.getLength(children);
-		for (int i = 0; i < childrenLength; i++) {
-			Object child = reader.getItem(children, i);
-			if (reader.isNodeTypeElement(child)) {
-				Object entry = null;
-				if (reader.getNodeName(child).equalsIgnoreCase(BeaninfoEntry.sBeaninfo)) {
-					entry = BeaninfoEntry.readEntry(reader, child, project);
-				} else if (reader.getNodeName(child).equalsIgnoreCase(SearchpathEntry.sSearchpath)) {
-					entry = SearchpathEntry.readEntry(reader, child, project, false);
-				}
-				if (entry != null)
-					paths.add(entry);
-			}
-		}
-		return new BeaninfosDoc((IBeaninfosDocEntry[]) paths.toArray(new IBeaninfosDocEntry[paths.size()]));
-	}
-
-	public IBeaninfosDocEntry[] getSearchpath() {
-		return searchpath;
-	}
-
-	public void setSearchpath(IBeaninfosDocEntry[] searchpath) {
-		this.searchpath = searchpath;
-	}
-
-	public Node writeEntry(Document doc, IProject project) {
-		Element root = doc.createElement(SearchpathEntry.sSearchpath); // Create Root Element
-		for (int i = 0; i < searchpath.length; i++) {
-			root.appendChild(searchpath[i].writeEntry(doc, project)); // Add to the document
-		}
-		return root;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java
deleted file mode 100644
index 896c1d259..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java
+++ /dev/null
@@ -1,73 +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.core;
-/*
-
-
- */
-
-import java.lang.reflect.Array;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-
-
-/**
- * For reading from IConfigurationElements
- * @version 	1.0
- * @author
- */
-class ConfigurationElementReader implements IReader {
-
-	/*
-	 * @see IReader#getChildren(Object)
-	 */
-	public Object getChildren(Object node) {
-		return (node instanceof IConfigurationElement) ? ((IConfigurationElement) node).getChildren() : new IConfigurationElement[0];
-	}
-
-	/*
-	 * @see IReader#getLength(Object)
-	 */
-	public int getLength(Object nodeList) {
-		return (nodeList instanceof IConfigurationElement[]) ? Array.getLength(nodeList) : 0;
-	}
-
-	/*
-	 * @see IReader#getItem(Object, int)
-	 */
-	public Object getItem(Object nodeList, int index) {
-		return (nodeList instanceof IConfigurationElement[]) ? Array.get(nodeList, index) : null;
-	}
-
-	/*
-	 * @see IReader#isNodeTypeElement(Object)
-	 */
-	public boolean isNodeTypeElement(Object node) {
-		return node instanceof IConfigurationElement;
-	}
-
-	/*
-	 * @see IReader#getNodeName(Object)
-	 */
-	public String getNodeName(Object node) {
-		return (node instanceof IConfigurationElement) ? ((IConfigurationElement) node).getName() : ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * @see IReader#getAttribute(Object, String)
-	 */
-	public String getAttribute(Object element, String attributeName) {
-		return (element instanceof IConfigurationElement) ? ((IConfigurationElement) element).getAttribute(attributeName) : null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java
deleted file mode 100644
index 859073802..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java
+++ /dev/null
@@ -1,78 +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.beaninfo.core;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo;
-import org.eclipse.jem.java.JavaClass;
- 
-/**
- * Interface for BeanInfo contributors. Supplied either as additional interface on a IClasspathContainer, or as
- * an explicit contributor for BeanInfos from the manifest files.
- * <p>
- * Implementations of this interface allows a dynamic supply of BeanInfo contributions (beaninfo jars and search paths)
- * and override files. This is used when the default plugin extension mechanism is too static for the requirements. 
- * <p>
- * There is a very useful default implementation (<code>BeanInfoContributorAdapter</code>) that can be subclassed. The
- * default doesn't do anything on its own. But it does have a very useful utility method for loading resources.
- * 
- * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoContributorAdapter
- * @since 1.0.0
- */
-public interface IBeanInfoContributor {
-	
-	/**
-	 * Return the BeanInfoEntry contributions that are needed.
-	 * <p>
-	 * This will be called by BeanInfo when it determines that this contributor is applicable 
-	 * for the current project being processed. BeaninfoEntry's define the BeanInfo jars and search paths to use.
-	 * 
-	 * @param info
-	 * @return BeanInfo contributions or <code>null</code> if none to contribute.
-	 * 
-	 * @since 1.0.0
-	 */
-	public BeaninfoEntry[] getBeanInfoEntryContributions(IConfigurationContributionInfo info);
-	
-	/**
-	 * For the given package path run the override contributions through the runnable.
-	 * <p>
-	 * This will be called by BeanInfo when it determines that this
-	 * contributor is applicable for the current project being processed.
-	 * <p>
-	 * Implementations must call the runnable (the argument <code>runnable</code>) for each override file that is to be applied to the incoming class.
-	 * You can either call the run method that passes in a string pointing to a directory where your override file is
-	 * located (i.e. <code>overrideFileName.override</code> where "overrideFileName" is the name passed. Or you can call the run method that 
-	 * takes a Resource that is already loaded (and maybe modified or created locally).
-	 * 
-	 * @param packagePath
-	 * @param overrideFileName the overrideFileName that the overrides is for. This can be used in very special cases to provide 
-	 * exact override files instead of letting the path be searched. An example would be for providing a file that isn't the same name as the class.
-	 * A very special case is <code>ROOT</code>. This is used when asking to apply root overrides to classes that have no 
-	 * super type. 
-	 * @param javaClass the java class that the overrides will be applied to. Note: Do not call any property, features, events, or operations calls
-	 * or any property, events, or operations Utilities against this class. That is because this class is being introspected at this time
-	 * and those calls will return invalid values if called at this point since introspection is not yet complete. 
-	 * @param resource set that contributors can use to temporarily load dynamic override files.
-	 * @param runnable the runnable that you call to actually apply the override files.
-	 * 
-	 * @see BeaninfoPlugin#ROOT
-	 * @see BeaninfoPlugin#OVERRIDE_EXTENSION
-	 * @since 1.0.0
-	 */
-	public void runOverrides(IPath packagePath, String overrideFileName, JavaClass javaClass, ResourceSet rset, BeaninfoPlugin.IContributorOverrideRunnable runnable);
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.java
deleted file mode 100644
index 37075e7e8..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.java
+++ /dev/null
@@ -1,75 +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.core;
-/*
-
-
- */
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-/**
- * Interface to supply information for beaninfo to decouple
- * the introspection from the desktop.
- */
-
-public interface IBeaninfoSupplier {
-	
-	/**
-	 * @return Return the registry to use. Initialize it if not already initialized.
-	 */
-	public ProxyFactoryRegistry getRegistry();
-	
-	/**
-	 * Used to know if we currently have a registry created in the supplier.
-	 * 
-	 * @return true if there is a registry currently in the supplier.
-	 */
-	public boolean isRegistryCreated();
-	
-	/**
-	 * Close the registry. This tells the registry to close. This is necessary
-	 * at times because of changes to classes require the registry to be
-	 * reconstructed.
-	 */
-	public void closeRegistry();
-	
-	/**
-	 * Return the project that this supplier is for.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IProject getProject();
-	
-	/**
-	 * Create a new resource set based upon the current project. This resource set is hooked into the
-	 * project's resource set so that any searches for java classes.
-	 * 
-	 * @return a new resource set that is hooked into the project's java resource set.
-	 * 
-	 * @since 1.2.0
-	 */
-	public ProjectResourceSet getNewResourceSet();
-	
-	/**
-	 * The project resource set for this supplier.
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public ResourceSet getProjectResourceSet();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java
deleted file mode 100644
index 5cc90c514..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java
+++ /dev/null
@@ -1,33 +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.core;
-/*
-
-
- */
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * Interface for DOM Doc writable entries.
- * 
- * @version 	1.0
- * @author
- */
-public interface IBeaninfosDocEntry {
-	public Node writeEntry(Document doc, IProject project);
-	
-	public int getKind();
-	public IPath getPath();
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java
deleted file mode 100644
index ceefae9cc..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoAdapterFactory;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-
-/**
- * Static initializer class to initialize the beaninfo stuff.
- * It is disconnected from the desktop and so doesn't require it.
- */
-
-public class Init {
-	
-	// So it can't be instantiated.
-	private Init() {
-	};
-
-	/**
-	 * Initialize the context with an IBeaninfoSupplier, used to set up the
-	 * introspection process. 
-	 *
-	 * The beaninfo supplier is responsible for setting up the bean info search path,
-	 * including removing the sun beaninfos, if desired.
-	 */
-	public static void initialize(ResourceSet rset, final IBeaninfoSupplier supplier) {
-		rset.getAdapterFactories().add(new BeaninfoAdapterFactory(supplier));
-	}
-
-	/**
-	 * Initialize the registry now that it is available.
-	 */
-	public static void initialize(ProxyFactoryRegistry registry) {
-		// Remove the "sun.beans.info" from the beaninfo search path because
-		// we completely override the sun bean infos.
-		Utilities.removeBeanInfoPath(registry, "sun.beans.infos"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Cleanup from the context because we are being removed.
-	 * If clearResults is true, then the factory should clear the results of introspection
-	 * from the everything because the context will still be around.
-	 */
-	public static void cleanup(ResourceSet rset, boolean clearResults) {
-		BeaninfoAdapterFactory factory =
-			(BeaninfoAdapterFactory) EcoreUtil.getAdapterFactory(rset.getAdapterFactories(), IIntrospectionAdapter.ADAPTER_KEY);
-		rset.getAdapterFactories().remove(factory);
-		if (factory != null)
-			factory.closeAll(clearResults);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java
deleted file mode 100644
index ce77ecc37..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java
+++ /dev/null
@@ -1,189 +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.core;
-/*
-
-
- */
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.w3c.dom.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-
-/**
- * Searchpath entry. Beaninfo searchpath entry (i.e. package name). Can include
- * kind/path/exported if not a child of the BeaninfoEntry.
- * 
- * Note: if not a child of a BeanInfoEntry, then the path refers to a package
- * in the classpath, so container is supported here.
- * 
- * @version 	1.0
- * @author
- */
-public class SearchpathEntry implements IBeaninfosDocEntry {
-
-	final static String sSearchpath = "searchpath"; // Searchpath entry, shared with BeaninfosDoc. //$NON-NLS-1$
-	final static String sPackage = "package"; // Package name. //$NON-NLS-1$
-
-	/**
-	 * Read the entry in from the element.
-	 */
-	public static SearchpathEntry readEntry(IReader reader, Object element, IProject project, boolean beaninfoChild) {
-		String packageName = reader.getAttribute(element, sPackage);
-		if (beaninfoChild)
-			return new SearchpathEntry(packageName); // Kind/path aren't valid on beaninfo children.
-
-		String elementKind = reader.getAttribute(element, BeaninfosDoc.sKind);
-		String pathStr = reader.getAttribute(element, BeaninfosDoc.sPath);
-		int kind = BeaninfoEntry.kindFromString(elementKind);		
-		IPath path = null;
-		if (pathStr != null) {
-			// ensure path is absolute
-			path = new Path(pathStr);
-			if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER && !path.isAbsolute()) {
-				path = project != null ? project.getFullPath().append(path) : path.makeAbsolute(); // Some folder/jar within this project
-			}
-		}
-
-		// create the appropriate entry
-		boolean valid = true;
-		switch (kind) {
-
-			case IClasspathEntry.CPE_LIBRARY :
-				valid = path != null && path.isAbsolute();
-				break;
-
-			case IClasspathEntry.CPE_SOURCE :
-				if (path == null)
-					valid = false;
-				else if (path.isAbsolute()) {
-					// must be an entry in this project or specify another project
-					String projSegment = path.segment(0);
-					if (project == null || projSegment == null || !projSegment.equals(project.getName())) {
-						// another project
-						kind = IClasspathEntry.CPE_PROJECT;
-					}
-				}
-				break;
-
-			case IClasspathEntry.CPE_VARIABLE :
-			case IClasspathEntry.CPE_CONTAINER:				
-				break;
-
-			default :
-				valid = false;
-				break;
-		}
-
-		if (valid)
-			return new SearchpathEntry(kind, path, packageName);
-		else
-			return null;
-
-	}
-
-	protected int kind = -1; // Under Beaninfo entry, these don't have kind/path's.
-	protected IPath path;	// Path can be null if under beaninfo entry
-	protected String packageName;	// Packagename can be null if kind/path refer to a project or registered variable.
-	protected boolean isExported;
-
-	public SearchpathEntry(int kind, IPath path, String packageName) {
-		this.kind = kind;
-		this.path = path;
-		this.packageName = packageName;
-	}
-
-	public SearchpathEntry(String packageName) {
-		this.packageName = packageName;
-	}
-
-	public int getKind() {
-		return kind;
-	}
-	
-	public IPath getPath() {
-		return path;
-	}
-
-	public String getPackage() {
-		return packageName;
-	}
-
-	public Node writeEntry(Document doc, IProject project) {
-
-		Element element = doc.createElement(sSearchpath);
-		if (kind != -1) {
-			// A non-beaninfo child
-			element.setAttribute(BeaninfosDoc.sKind, BeaninfoEntry.kindToString(kind));
-			IPath tPath = path;
-			if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER) {
-				// translate to project relative from absolute (unless a device path)
-				if (tPath.isAbsolute()) {
-					if (tPath.segment(0).equals(project.getFullPath().segment(0))) {
-						tPath = tPath.removeFirstSegments(1);
-						tPath = tPath.makeRelative();
-					} else {
-						tPath = tPath.makeAbsolute();
-					}
-				}
-			}
-
-			element.setAttribute(BeaninfosDoc.sPath, tPath.toString());
-		}
-		if (packageName != null)
-			element.setAttribute(sPackage, packageName);
-		return element;
-	}
-	
-	public boolean equals(Object other) {
-		if (this == other)
-			return true;
-			
-		if (!(other instanceof SearchpathEntry))
-			return false;
-	
-		SearchpathEntry otherEntry = (SearchpathEntry) other;
-		if (kind != otherEntry.kind)
-			return false;
-			
-		if (path == null)
-			if (otherEntry.path != null)
-				return false;
-			else
-				;
-		else if (!path.equals(otherEntry.path))
-			return false;
-			
-		if (packageName == null)
-			if (otherEntry.packageName != null)
-				return false;
-			else
-				;
-		else if (!packageName.equals(otherEntry.packageName))
-			return false;
-			
-		return true;
-	}
-	
-	public int hashCode() {
-		int hashCode = kind;
-		if (path != null)
-			hashCode ^= path.hashCode();
-		if (packageName != null)
-			hashCode ^= packageName.hashCode();
-		return hashCode;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java
deleted file mode 100644
index b001299f8..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java
+++ /dev/null
@@ -1,501 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoProxyConstants;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-
-/**
- * Beaninfo (introspection) utilities methods
- */
-
-public final class Utilities {
-	
-	private Utilities() {
-	}
-
-	/**
-	 * Utility to return the class as a JavaClass. If it actually is a JavaType this will
-	 * fail with a ClassCastException.
-	 * @param className
-	 * @param rset
-	 * @return java class
-	 * 
-	 * @throws ClassCastException if not a java class, but instead a java primitive.
-	 * @since 1.1.0
-	 */
-	public static JavaClass getJavaClass(String className, ResourceSet rset) {
-		return (JavaClass) getJavaType(className, rset);
-	}
-	
-	/**
-	 * Utility to return the class as a JavaHelpers.
-	 * 
-	 * @param className
-	 * @param rset
-	 * @return java helpers.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static JavaHelpers getJavaType(String className, ResourceSet rset) {
-		return (JavaHelpers) rset.getEObject(getJavaClassURI(className), true);
-	}
-	
-	/**
-	 * Create a URI to the given classname.
-	 * <p>
-	 * Note: It must be in normal form, i.e. fully-qualified, if primitive spelled out (e.g. "int" not I), and if
-	 * arrays it must readable form (e.g. "java.lang.String[]" and not "[Ljava.lang.String;").
-	 * 
-	 * @param className
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static URI getJavaClassURI(String className) {
-		return JavaRefFactory.eINSTANCE.createTypeURI(className);
-	}
-
-	/** 
-	 * Utility to return the EClassifier from the given IBeanTypeProxy.
-	 */
-	public static EClassifier getJavaClass(IBeanTypeProxy type, ResourceSet rset) {
-		if (type != null) {
-			return getJavaType(type.getFormalTypeName(), rset);
-		} else
-			return null;
-	}
-
-	/**
-	 * Utility to return the Method from the given IMethodProxy.
-	 */
-	public static Method getMethod(IMethodProxy method, ResourceSet rset) {
-		return method != null ? (Method) rset.getEObject(URI.createURI(getMethodURL(method)), true) : null;
-	}
-
-	/**
-	 * Answer the URL String for Method from the given IMethodProxy
-	 */
-	public static String getMethodURL(IMethodProxy method) {
-		String className = method.getClassType().getTypeName();
-		IBeanTypeProxy[] parms = method.getParameterTypes();
-		String[] parmTypes = parms.length > 0 ? new String[parms.length] : null;
-		for (int i = 0; i < parms.length; i++) {
-			parmTypes[i] = parms[i].getFormalTypeName();
-		}
-		return computeMethodURL(className, method.getName(), parmTypes);
-	}
-	
-	protected static String computeMethodURL(String fullyQualifiedClassName, String methodName, String[] parmTypes) {
-		int classStart = fullyQualifiedClassName.lastIndexOf('.');
-		StringBuffer url = new StringBuffer(50);
-		url.append("java:/"); //$NON-NLS-1$
-		if (classStart > -1)
-			url.append(fullyQualifiedClassName.substring(0, classStart));
-		url.append('#');
-		url.append(computeMethodID(fullyQualifiedClassName.substring(classStart + 1), methodName, parmTypes));
-		return url.toString();
-	}
-	
-	protected static String computeFieldURL(String fullyQualifiedClassName, String fieldName) {
-		int classStart = fullyQualifiedClassName.lastIndexOf('.');
-		StringBuffer url = new StringBuffer(50);
-		url.append("java:/"); //$NON-NLS-1$
-		if (classStart > -1)
-			url.append(fullyQualifiedClassName.substring(0, classStart));
-		url.append('#');
-		url.append(fullyQualifiedClassName.substring(classStart + 1));
-		url.append(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
-		url.append(fieldName);
-		return url.toString();
-	}
-	
-	/**
-	 * Return the field uri for the given classname, fieldname.
-	 * @param fullyQualifiedClassName
-	 * @param fieldName
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static URI getFieldURI(String fullyQualifiedClassName, String fieldName) {
-		return URI.createURI(computeFieldURL(fullyQualifiedClassName, fieldName));
-	}
-	/**
-	 * Return the method uri for the given classname, methodname, parm types.
-	 * @param fullyQualifiedClassName
-	 * @param methodName
-	 * @param parmTypes <code>null</code> if there are no parms.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static URI getMethodURI(String fullyQualifiedClassName, String methodName, String[] parmTypes) {
-		return URI.createURI(computeMethodURL(fullyQualifiedClassName, methodName, parmTypes));
-	}
-
-	/**
-	 * Turn it into an URI.
-	 */
-	public static URI getMethodURI(IMethodProxy method) {
-		return URI.createURI(getMethodURL(method));
-	}
-
-	/**
-	 * Utility to compute the Java Modeling METHODID from method declaring class name,
-	 * method name, and parameter class names.
-	 */
-	public static String computeMethodID(String className, String methodName, String[] parameterTypes) {
-		StringBuffer out = new StringBuffer(50);
-		out.append(className);
-		out.append(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
-		out.append(methodName);
-		out.append(ReflectionAdaptor.C_METHOD_PARM_DELIMITER);
-		if (parameterTypes != null)
-			for (int i = 0; i < parameterTypes.length; i++) {
-				out.append(parameterTypes[i]);
-				if (i < parameterTypes.length - 1)
-					out.append(ReflectionAdaptor.C_PARM_PARM_DELIMITER);
-			}
-		if (className.equals(methodName))
-			out.append(ReflectionAdaptor.S_CONSTRUCTOR_TOKEN); //It's a constructor
-		return out.toString();
-	}
-
-	/**
-	 * Utility to retrieve the BeanDecorator.
-	 */
-	public static BeanDecorator getBeanDecorator(EModelElement model) {
-		return (BeanDecorator) getDecorator(model, BeanDecorator.class);
-	}
-	/**
-	 * Utility to retrieve a decorator of the specified class.
-	 */
-	public static EAnnotation getDecorator(EModelElement model, Class decoratorClass) {
-		Iterator itr = model.getEAnnotations().iterator();
-		while (itr.hasNext()) {
-			EAnnotation decr = (EAnnotation) itr.next();
-			if (decoratorClass.isInstance(decr))
-				return decr;
-		}
-		return null;
-	}
-
-	/**
-	 * Utility to retrieve the EventSetDecorator.
-	 */
-	public static EventSetDecorator getEventSetDecorator(EModelElement model) {
-		return (EventSetDecorator) getDecorator(model, EventSetDecorator.class);
-	}
-
-	/**
-	 * Utility to retrieve the MethodDecorator.
-	 */
-	public static MethodDecorator getMethodDecorator(EModelElement model) {
-		return (MethodDecorator) getDecorator(model, MethodDecorator.class);
-	}
-
-	/**
-	 * Utility to retrieve the PropertyDecorator.
-	 */
-	public static PropertyDecorator getPropertyDecorator(EModelElement model) {
-		return (PropertyDecorator) getDecorator(model, PropertyDecorator.class);
-	}
-
-	/**
-	 * Utility to return an iterator on the list which will return the property decorators
-	 * of only the properties in the EList passed in. If the property does not have a
-	 * property decorator, then it is not a beaninfo property.
-	 */
-	public static Iterator getPropertiesIterator(final EList properties) {
-		return new Iterator() {
-			private Iterator itr = properties.iterator();
-			private boolean hasNext = true;
-			private PropertyDecorator next;
-			{
-				findNext();
-			}
-			public boolean hasNext() {
-				return hasNext;
-			}
-
-			public Object next() {
-				PropertyDecorator temp = next;
-				findNext();
-				return temp;
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-
-			private void findNext() {
-				while (itr.hasNext()) {
-					EModelElement nextOne = (EModelElement) itr.next();
-					next = getPropertyDecorator(nextOne);
-					if (next != null) {
-						return;
-					}
-				}
-				hasNext = false;
-			}
-		};
-	}
-
-	/**
-	 * Utility to return an iterator on the list which will return the EventSet decorators
-	 * of only the BeanEvents in the EList passed in.
-	 */
-	public static Iterator getEventSetsIterator(final EList events) {
-		return new Iterator() {
-			private Iterator itr = events.iterator();
-			private boolean hasNext = true;
-			private EventSetDecorator next;
-			{
-				findNext();
-			}
-			public boolean hasNext() {
-				return hasNext;
-			}
-
-			public Object next() {
-				EventSetDecorator temp = next;
-				findNext();
-				return temp;
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-
-			private void findNext() {
-				while (itr.hasNext()) {
-					EModelElement nextOne = (EModelElement) itr.next();
-					next = getEventSetDecorator(nextOne);
-					if (next != null) {
-						return;
-					}
-				}
-				hasNext = false;
-			}
-		};
-	}
-
-	/**
-	 * Utility to return an iterator on the list which will return the Method decorators
-	 * of only the Methods in the EList passed in.
-	 */
-	public static Iterator getMethodsIterator(final EList methods) {
-		return new Iterator() {
-			private Iterator itr = methods.iterator();
-			private boolean hasNext = true;
-			private MethodDecorator next;
-			{
-				findNext();
-			}
-			public boolean hasNext() {
-				return hasNext;
-			}
-
-			public Object next() {
-				MethodDecorator temp = next;
-				findNext();
-				return temp;
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-
-			private void findNext() {
-				while (itr.hasNext()) {
-					EModelElement nextOne = (EModelElement) itr.next();
-					next = getMethodDecorator(nextOne);
-					if (next != null) {
-						return;
-					}
-				}
-				hasNext = false;
-			}
-		};
-	}
-
-	/**
-	 * Get the search path from the remote vm. 
-	 * 
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).
-	 */
-	public static IArrayBeanProxy getBeanInfoSearchPath(ProxyFactoryRegistry registry) {
-		BeaninfoProxyConstants biconstants = BeaninfoProxyConstants.getConstants(registry);
-		if (biconstants != null)
-			return (IArrayBeanProxy) biconstants
-				.getGetBeanInfoSearchPathProxy()
-				.invokeCatchThrowableExceptions(
-				null);
-		else
-			return null;
-	}
-
-	/**
-	 * Set the search path to the array of strings passed in on the remote vm.
-	 *
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).	 
-	 */
-	public static void setBeanInfoSearchPath(ProxyFactoryRegistry registry, String[] paths) {
-
-		try {
-			BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
-			if (biConstants != null) {
-				JavaStandardBeanProxyConstants jConstants = JavaStandardBeanProxyConstants.getConstants(registry);
-				IStandardBeanProxyFactory proxyFactory = registry.getBeanProxyFactory();
-				IArrayBeanProxy newPath = proxyFactory.createBeanProxyWith(jConstants.getStringType(), paths != null ? paths.length : 0);
-				if (paths != null)
-					for (int i = 0; i < paths.length; i++)
-						newPath.set(proxyFactory.createBeanProxyWith(paths[i]), i);
-				biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
-			}			
-		} catch (ThrowableProxy e) {
-		}
-	}
-
-	/**
-	 * From the Beaninfo Nature, insert a path to the beaninfo path at the given index, -1 means at the end.
-	 * If index is larger than the current path, it will also add at the end.
-	 */
-	public static void insertBeanInfoSearchPath(BeaninfoNature nature, IBeaninfosDocEntry path, int index) throws CoreException {
-		BeaninfosDoc infoPath = nature.getSearchPath();
-		IBeaninfosDocEntry[] oldPath = infoPath.getSearchpath();
-
-		IBeaninfosDocEntry[] newPath = new IBeaninfosDocEntry[oldPath.length + 1];
-
-		if (index == -1 || index >= oldPath.length) {
-			// At the end or past end
-			System.arraycopy(oldPath, 0, newPath, 0, oldPath.length);
-			newPath[oldPath.length] = path;
-		} else {
-			// In the middle
-			System.arraycopy(oldPath, 0, newPath, 0, index);
-			newPath[index] = path;
-			System.arraycopy(oldPath, index, newPath, index + 1, oldPath.length - index);
-		}
-
-		infoPath.setSearchpath(newPath);
-		nature.setSearchPath(infoPath);
-	}
-
-	/**
-	 * Insert a path to the beaninfo path at the given index, -1 means at the end.
-	 * If index is larger than the current path, it will also add at the end.
-	 *
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).	 
-	 */
-	public static void insertBeanInfoSearchPath(ProxyFactoryRegistry registry, String path, int index) {
-		try {
-			BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
-			if (biConstants != null) {
-				IArrayBeanProxy infoPath = (IArrayBeanProxy) biConstants.getGetBeanInfoSearchPathProxy().invoke(null);
-				int pathLength = infoPath.getLength();
-				IStandardBeanProxyFactory proxyFactory = registry.getBeanProxyFactory();
-				IArrayBeanProxy newPath = proxyFactory.createBeanProxyWith(infoPath.getTypeProxy(), pathLength + 1);
-				IBeanProxy stringProxy = proxyFactory.createBeanProxyWith(path);
-				JavaStandardBeanProxyConstants constants = JavaStandardBeanProxyConstants.getConstants(registry);
-				if (index == -1 || index >= pathLength) {
-					// At the end or past end
-					constants.arraycopy(infoPath, 0, newPath, 0, infoPath.getLength());
-					newPath.set(stringProxy, pathLength);
-				} else {
-					// In the middle
-					constants.arraycopy(infoPath, 0, newPath, 0, index);
-					newPath.set(stringProxy, index);
-					constants.arraycopy(infoPath, index, newPath, index + 1, pathLength - index);
-				}
-				biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
-			}			
-		} catch (ThrowableProxy e) {
-		}
-	}
-
-	/**
-	 * From the Beaninfo Nature, remove the specified path from the beaninfo search path.
-	 * Not an error if not found.
-	 */
-	public static void removeBeanInfoPath(BeaninfoNature nature, IBeaninfosDocEntry path) throws CoreException {
-		BeaninfosDoc infoPath = nature.getSearchPath();
-		IBeaninfosDocEntry[] oldPath = infoPath.getSearchpath();
-
-		for (int i = 0; i < oldPath.length; i++) {
-			if (path.equals(oldPath[i])) {
-				// We found it, so remove it.
-				IBeaninfosDocEntry[] newPath = new IBeaninfosDocEntry[oldPath.length - 1];
-				System.arraycopy(oldPath, 0, newPath, 0, i);
-				if (i < oldPath.length - 1)
-					System.arraycopy(oldPath, i + 1, newPath, i, oldPath.length - i - 1);
-				infoPath.setSearchpath(newPath);
-				nature.setSearchPath(infoPath);
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Remove the specified path from the beaninfo search path.
-	 * Not an error if not found.
-	 *
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).	 	 
-	 */
-	public static void removeBeanInfoPath(ProxyFactoryRegistry registry, String path) {
-		try {
-			BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
-			if (biConstants != null) {
-				IArrayBeanProxy infoPath = (IArrayBeanProxy) biConstants.getGetBeanInfoSearchPathProxy().invoke(null);
-				int pathLength = infoPath.getLength();
-				for (int i = 0; i < pathLength; i++) {
-					IStringBeanProxy aPath = (IStringBeanProxy) infoPath.get(i);
-					if (path.equals(aPath.stringValue())) {
-						// We found it, so remove it.
-						IArrayBeanProxy newPath = registry.getBeanProxyFactory().createBeanProxyWith(infoPath.getTypeProxy(), pathLength - 1);
-						JavaStandardBeanProxyConstants constants = JavaStandardBeanProxyConstants.getConstants(registry);
-						constants.arraycopy(infoPath, 0, newPath, 0, i);
-						if (i < pathLength - 1)
-							constants.arraycopy(infoPath, i + 1, newPath, i, pathLength - i - 1);
-						biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
-						return;
-					}
-				}
-			}			
-		} catch (ThrowableProxy e) {
-		}
-	};
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties
deleted file mode 100644
index a6341164c..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties
+++ /dev/null
@@ -1,12 +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
-###############################################################################
-#
-BeanInfoCacheController_Job_WriteBeaninfoCache_Title=Write BeanInfo cache files
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java
deleted file mode 100644
index 53850aa51..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java
+++ /dev/null
@@ -1,1072 +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.impl;
-/*
-
-
- */
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.logging.Level;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.beaninfo.common.IBaseBeanInfoConstants;
-import org.eclipse.jem.internal.beaninfo.BeanDecorator;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bean Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperProperties <em>Merge Super Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperMethods <em>Merge Super Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperEvents <em>Merge Super Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectProperties <em>Introspect Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectMethods <em>Introspect Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectEvents <em>Introspect Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isDoBeaninfo <em>Do Beaninfo</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedEventNames <em>Not Inherited Event Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getCustomizerClass <em>Customizer Class</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class BeanDecoratorImpl extends FeatureDecoratorImpl implements BeanDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long BEAN_CUSTOMIZER_IMPLICIT = 0x1L;
-	public static final long BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT = 0x2L;
-	public static final long BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT = 0x4L;
-	public static final long BEAN_MERGE_INHERITED_EVENTS_IMPLICIT = 0x8L;
-
-	/**
-	 * The default value of the '{@link #isMergeSuperProperties() <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_SUPER_PROPERTIES_EDEFAULT = true;
-	
-	/**
-	 * The flag representing the value of the '{@link #isMergeSuperProperties() <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_PROPERTIES_EFLAG = 1 << 18;
-
-	/**
-	 * The flag representing whether the Merge Super Properties attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_PROPERTIES_ESETFLAG = 1 << 19;
-
-	/**
-	 * The default value of the '{@link #isMergeSuperMethods() <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_SUPER_METHODS_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isMergeSuperMethods() <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_METHODS_EFLAG = 1 << 20;
-
-	/**
-	 * The flag representing whether the Merge Super Methods attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_METHODS_ESETFLAG = 1 << 21;
-
-	/**
-	 * The default value of the '{@link #isMergeSuperEvents() <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_SUPER_EVENTS_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isMergeSuperEvents() <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_EVENTS_EFLAG = 1 << 22;
-
-	/**
-	 * The flag representing whether the Merge Super Events attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_EVENTS_ESETFLAG = 1 << 23;
-
-	/**
-	 * The default value of the '{@link #isIntrospectProperties() <em>Introspect Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INTROSPECT_PROPERTIES_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isIntrospectProperties() <em>Introspect Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int INTROSPECT_PROPERTIES_EFLAG = 1 << 24;
-
-	/**
-	 * The default value of the '{@link #isIntrospectMethods() <em>Introspect Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INTROSPECT_METHODS_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isIntrospectMethods() <em>Introspect Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int INTROSPECT_METHODS_EFLAG = 1 << 25;
-
-	/**
-	 * The default value of the '{@link #isIntrospectEvents() <em>Introspect Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INTROSPECT_EVENTS_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isIntrospectEvents() <em>Introspect Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int INTROSPECT_EVENTS_EFLAG = 1 << 26;
-
-	/**
-	 * The default value of the '{@link #isDoBeaninfo() <em>Do Beaninfo</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDoBeaninfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DO_BEANINFO_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isDoBeaninfo() <em>Do Beaninfo</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDoBeaninfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int DO_BEANINFO_EFLAG = 1 << 27;
-
-	/**
-	 * The cached value of the '{@link #getNotInheritedPropertyNames() <em>Not Inherited Property Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotInheritedPropertyNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList notInheritedPropertyNames = null;
-
-	/**
-	 * The cached value of the '{@link #getNotInheritedMethodNames() <em>Not Inherited Method Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotInheritedMethodNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList notInheritedMethodNames = null;
-
-	/**
-	 * The cached value of the '{@link #getNotInheritedEventNames() <em>Not Inherited Event Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotInheritedEventNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList notInheritedEventNames = null;
-
-	/**
-	 * The cached value of the '{@link #getCustomizerClass() <em>Customizer Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomizerClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass customizerClass = null;
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected BeanDecoratorImpl() {
-		super();
-		eFlags |= MERGE_SUPER_PROPERTIES_EFLAG;
-		eFlags |= MERGE_SUPER_METHODS_EFLAG;
-		eFlags |= MERGE_SUPER_EVENTS_EFLAG;
-		eFlags |= INTROSPECT_PROPERTIES_EFLAG;
-		eFlags |= INTROSPECT_METHODS_EFLAG;
-		eFlags |= INTROSPECT_EVENTS_EFLAG;
-		eFlags |= DO_BEANINFO_EFLAG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getBeanDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeSuperProperties() {
-		return (eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeSuperProperties(boolean newMergeSuperProperties) {
-		boolean oldMergeSuperProperties = (eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0;
-		if (newMergeSuperProperties) eFlags |= MERGE_SUPER_PROPERTIES_EFLAG; else eFlags &= ~MERGE_SUPER_PROPERTIES_EFLAG;
-		boolean oldMergeSuperPropertiesESet = (eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0;
-		eFlags |= MERGE_SUPER_PROPERTIES_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES, oldMergeSuperProperties, newMergeSuperProperties, !oldMergeSuperPropertiesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMergeSuperProperties() {
-		boolean oldMergeSuperProperties = (eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0;
-		boolean oldMergeSuperPropertiesESet = (eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0;
-		if (MERGE_SUPER_PROPERTIES_EDEFAULT) eFlags |= MERGE_SUPER_PROPERTIES_EFLAG; else eFlags &= ~MERGE_SUPER_PROPERTIES_EFLAG;
-		eFlags &= ~MERGE_SUPER_PROPERTIES_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES, oldMergeSuperProperties, MERGE_SUPER_PROPERTIES_EDEFAULT, oldMergeSuperPropertiesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMergeSuperProperties() {
-		return (eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeSuperMethods() {
-		return (eFlags & MERGE_SUPER_METHODS_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeSuperMethods(boolean newMergeSuperMethods) {
-		boolean oldMergeSuperMethods = (eFlags & MERGE_SUPER_METHODS_EFLAG) != 0;
-		if (newMergeSuperMethods) eFlags |= MERGE_SUPER_METHODS_EFLAG; else eFlags &= ~MERGE_SUPER_METHODS_EFLAG;
-		boolean oldMergeSuperMethodsESet = (eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0;
-		eFlags |= MERGE_SUPER_METHODS_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS, oldMergeSuperMethods, newMergeSuperMethods, !oldMergeSuperMethodsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMergeSuperMethods() {
-		boolean oldMergeSuperMethods = (eFlags & MERGE_SUPER_METHODS_EFLAG) != 0;
-		boolean oldMergeSuperMethodsESet = (eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0;
-		if (MERGE_SUPER_METHODS_EDEFAULT) eFlags |= MERGE_SUPER_METHODS_EFLAG; else eFlags &= ~MERGE_SUPER_METHODS_EFLAG;
-		eFlags &= ~MERGE_SUPER_METHODS_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS, oldMergeSuperMethods, MERGE_SUPER_METHODS_EDEFAULT, oldMergeSuperMethodsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMergeSuperMethods() {
-		return (eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeSuperEvents() {
-		return (eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeSuperEvents(boolean newMergeSuperEvents) {
-		boolean oldMergeSuperEvents = (eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0;
-		if (newMergeSuperEvents) eFlags |= MERGE_SUPER_EVENTS_EFLAG; else eFlags &= ~MERGE_SUPER_EVENTS_EFLAG;
-		boolean oldMergeSuperEventsESet = (eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0;
-		eFlags |= MERGE_SUPER_EVENTS_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS, oldMergeSuperEvents, newMergeSuperEvents, !oldMergeSuperEventsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMergeSuperEvents() {
-		boolean oldMergeSuperEvents = (eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0;
-		boolean oldMergeSuperEventsESet = (eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0;
-		if (MERGE_SUPER_EVENTS_EDEFAULT) eFlags |= MERGE_SUPER_EVENTS_EFLAG; else eFlags &= ~MERGE_SUPER_EVENTS_EFLAG;
-		eFlags &= ~MERGE_SUPER_EVENTS_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS, oldMergeSuperEvents, MERGE_SUPER_EVENTS_EDEFAULT, oldMergeSuperEventsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMergeSuperEvents() {
-		return (eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIntrospectProperties() {
-		return (eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIntrospectProperties(boolean newIntrospectProperties) {
-		boolean oldIntrospectProperties = (eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0;
-		if (newIntrospectProperties) eFlags |= INTROSPECT_PROPERTIES_EFLAG; else eFlags &= ~INTROSPECT_PROPERTIES_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES, oldIntrospectProperties, newIntrospectProperties));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIntrospectMethods() {
-		return (eFlags & INTROSPECT_METHODS_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIntrospectMethods(boolean newIntrospectMethods) {
-		boolean oldIntrospectMethods = (eFlags & INTROSPECT_METHODS_EFLAG) != 0;
-		if (newIntrospectMethods) eFlags |= INTROSPECT_METHODS_EFLAG; else eFlags &= ~INTROSPECT_METHODS_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS, oldIntrospectMethods, newIntrospectMethods));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIntrospectEvents() {
-		return (eFlags & INTROSPECT_EVENTS_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIntrospectEvents(boolean newIntrospectEvents) {
-		boolean oldIntrospectEvents = (eFlags & INTROSPECT_EVENTS_EFLAG) != 0;
-		if (newIntrospectEvents) eFlags |= INTROSPECT_EVENTS_EFLAG; else eFlags &= ~INTROSPECT_EVENTS_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS, oldIntrospectEvents, newIntrospectEvents));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCustomizerClass(JavaClass newCustomizerClass) {
-		JavaClass oldCustomizerClass = customizerClass;
-		customizerClass = newCustomizerClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS, oldCustomizerClass, customizerClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				return isMergeSuperProperties() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				return isMergeSuperMethods() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				return isMergeSuperEvents() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				return isIntrospectProperties() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				return isIntrospectMethods() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				return isIntrospectEvents() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				return isDoBeaninfo() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				return getNotInheritedPropertyNames();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				return getNotInheritedMethodNames();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				return getNotInheritedEventNames();
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				if (resolve) return getCustomizerClass();
-				return basicGetCustomizerClass();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				setMergeSuperProperties(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				setMergeSuperMethods(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				setMergeSuperEvents(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				setIntrospectProperties(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				setIntrospectMethods(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				setIntrospectEvents(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				setDoBeaninfo(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				getNotInheritedPropertyNames().clear();
-				getNotInheritedPropertyNames().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				getNotInheritedMethodNames().clear();
-				getNotInheritedMethodNames().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				getNotInheritedEventNames().clear();
-				getNotInheritedEventNames().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				setCustomizerClass((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				unsetMergeSuperProperties();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				unsetMergeSuperMethods();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				unsetMergeSuperEvents();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				setIntrospectProperties(INTROSPECT_PROPERTIES_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				setIntrospectMethods(INTROSPECT_METHODS_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				setIntrospectEvents(INTROSPECT_EVENTS_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				setDoBeaninfo(DO_BEANINFO_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				getNotInheritedPropertyNames().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				getNotInheritedMethodNames().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				getNotInheritedEventNames().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				setCustomizerClass((JavaClass)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				return isSetMergeSuperProperties();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				return isSetMergeSuperMethods();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				return isSetMergeSuperEvents();
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				return ((eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0) != INTROSPECT_PROPERTIES_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				return ((eFlags & INTROSPECT_METHODS_EFLAG) != 0) != INTROSPECT_METHODS_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				return ((eFlags & INTROSPECT_EVENTS_EFLAG) != 0) != INTROSPECT_EVENTS_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				return ((eFlags & DO_BEANINFO_EFLAG) != 0) != DO_BEANINFO_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				return notInheritedPropertyNames != null && !notInheritedPropertyNames.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				return notInheritedMethodNames != null && !notInheritedMethodNames.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				return notInheritedEventNames != null && !notInheritedEventNames.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				return customizerClass != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mergeSuperProperties: ");
-		if ((eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0) result.append((eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0); else result.append("<unset>");
-		result.append(", mergeSuperMethods: ");
-		if ((eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0) result.append((eFlags & MERGE_SUPER_METHODS_EFLAG) != 0); else result.append("<unset>");
-		result.append(", mergeSuperEvents: ");
-		if ((eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0) result.append((eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0); else result.append("<unset>");
-		result.append(", introspectProperties: ");
-		result.append((eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0);
-		result.append(", introspectMethods: ");
-		result.append((eFlags & INTROSPECT_METHODS_EFLAG) != 0);
-		result.append(", introspectEvents: ");
-		result.append((eFlags & INTROSPECT_EVENTS_EFLAG) != 0);
-		result.append(", doBeaninfo: ");
-		result.append((eFlags & DO_BEANINFO_EFLAG) != 0);
-		result.append(", notInheritedPropertyNames: ");
-		result.append(notInheritedPropertyNames);
-		result.append(", notInheritedMethodNames: ");
-		result.append(notInheritedMethodNames);
-		result.append(", notInheritedEventNames: ");
-		result.append(notInheritedEventNames);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetCustomizerClass() {
-		return customizerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDoBeaninfo() {
-		return (eFlags & DO_BEANINFO_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDoBeaninfo(boolean newDoBeaninfo) {
-		boolean oldDoBeaninfo = (eFlags & DO_BEANINFO_EFLAG) != 0;
-		if (newDoBeaninfo) eFlags |= DO_BEANINFO_EFLAG; else eFlags &= ~DO_BEANINFO_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO, oldDoBeaninfo, newDoBeaninfo));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNotInheritedPropertyNames() {
-		if (notInheritedPropertyNames == null) {
-			notInheritedPropertyNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES);
-		}
-		return notInheritedPropertyNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNotInheritedMethodNames() {
-		if (notInheritedMethodNames == null) {
-			notInheritedMethodNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES);
-		}
-		return notInheritedMethodNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNotInheritedEventNames() {
-		if (notInheritedEventNames == null) {
-			notInheritedEventNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES);
-		}
-		return notInheritedEventNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getCustomizerClass() {
-		if (customizerClass != null && customizerClass.eIsProxy()) {
-			JavaClass oldCustomizerClass = customizerClass;
-			customizerClass = (JavaClass)eResolveProxy((InternalEObject)customizerClass);
-			if (customizerClass != oldCustomizerClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS, oldCustomizerClass, customizerClass));
-			}
-		}
-		return customizerClass;
-	}
-
-	private URL iconURL;
-	private boolean hasQueriedIconURL;
-	
-	public URL getIconURL(){
-		if (!hasQueriedIconURL){
-			FeatureAttributeValue value = (FeatureAttributeValue) getAttributes().get(IBaseBeanInfoConstants.ICONCOLOR16X16URL);
-			if (value != null) { 
-				// Get the value
-				Object attr = value.getValue();
-				if (attr instanceof String) {
-					try {
-						hasQueriedIconURL = true;
-						iconURL = new URL((String) attr);
-					} catch ( MalformedURLException exc ) {
-						BeaninfoPlugin.getPlugin().getLogger().log(exc, Level.INFO);
-					}
-				}
-			}			
-		}
-		return iconURL;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java
deleted file mode 100644
index 3b7e5f6c4..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java
+++ /dev/null
@@ -1,55 +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.impl;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jem.internal.beaninfo.BeanEvent;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.java.internal.impl.JavaEventImpl;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bean Event</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-
-public class BeanEventImpl extends JavaEventImpl implements BeanEvent{
-
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BeanEventImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.Literals.BEAN_EVENT;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java
deleted file mode 100644
index 1d73e696a..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java
+++ /dev/null
@@ -1,277 +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.impl;
-/*
-
-
- */
-
-import java.util.Map;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-
-
-public class BeaninfoFactoryImpl extends EFactoryImpl implements BeaninfoFactory{
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BeaninfoFactory init() {
-		try {
-			BeaninfoFactory theBeaninfoFactory = (BeaninfoFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore"); 
-			if (theBeaninfoFactory != null) {
-				return theBeaninfoFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new BeaninfoFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	public BeaninfoFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case BeaninfoPackage.FEATURE_DECORATOR: return createFeatureDecorator();
-			case BeaninfoPackage.BEAN_DECORATOR: return createBeanDecorator();
-			case BeaninfoPackage.EVENT_SET_DECORATOR: return createEventSetDecorator();
-			case BeaninfoPackage.METHOD_DECORATOR: return createMethodDecorator();
-			case BeaninfoPackage.PARAMETER_DECORATOR: return createParameterDecorator();
-			case BeaninfoPackage.PROPERTY_DECORATOR: return createPropertyDecorator();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR: return createIndexedPropertyDecorator();
-			case BeaninfoPackage.METHOD_PROXY: return createMethodProxy();
-			case BeaninfoPackage.BEAN_EVENT: return createBeanEvent();
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY: return (EObject)createFeatureAttributeMapEntry();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case BeaninfoPackage.IMPLICIT_ITEM:
-				return createImplicitItemFromString(eDataType, initialValue);
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_VALUE:
-				return createFeatureAttributeValueFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case BeaninfoPackage.IMPLICIT_ITEM:
-				return convertImplicitItemToString(eDataType, instanceValue);
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_VALUE:
-				return convertFeatureAttributeValueToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public FeatureDecorator createFeatureDecorator() {
-		FeatureDecoratorImpl featureDecorator = new FeatureDecoratorImpl();
-		featureDecorator.setSource(FeatureDecorator.class.getName());
-		return featureDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public EventSetDecorator createEventSetDecorator() {
-		EventSetDecoratorImpl eventSetDecorator = new EventSetDecoratorImpl();
-		eventSetDecorator.setSource(EventSetDecorator.class.getName());
-		return eventSetDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodProxy createMethodProxy() {
-		MethodProxyImpl methodProxy = new MethodProxyImpl();
-		return methodProxy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public PropertyDecorator createPropertyDecorator() {
-		PropertyDecoratorImpl propertyDecorator = new PropertyDecoratorImpl();
-		propertyDecorator.setSource(PropertyDecorator.class.getName());
-		return propertyDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public IndexedPropertyDecorator createIndexedPropertyDecorator() {
-		IndexedPropertyDecoratorImpl indexedPropertyDecorator = new IndexedPropertyDecoratorImpl();
-		indexedPropertyDecorator.setSource(IndexedPropertyDecorator.class.getName());
-		return indexedPropertyDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public BeanDecorator createBeanDecorator() {
-		BeanDecoratorImpl beanDecorator = new BeanDecoratorImpl();
-		beanDecorator.setSource(BeanDecorator.class.getName());
-		return beanDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public MethodDecorator createMethodDecorator() {
-		MethodDecoratorImpl methodDecorator = new MethodDecoratorImpl();
-		methodDecorator.setSource(MethodDecorator.class.getName());
-		return methodDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public ParameterDecorator createParameterDecorator() {
-		ParameterDecoratorImpl parameterDecorator = new ParameterDecoratorImpl();
-		parameterDecorator.setSource(ParameterDecorator.class.getName());
-		return parameterDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeaninfoPackage getBeaninfoPackage() {
-		return (BeaninfoPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static BeaninfoPackage getPackage() {
-		return BeaninfoPackage.eINSTANCE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeanEvent createBeanEvent() {
-		BeanEventImpl beanEvent = new BeanEventImpl();
-		return beanEvent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map.Entry createFeatureAttributeMapEntry() {
-		FeatureAttributeMapEntryImpl featureAttributeMapEntry = new FeatureAttributeMapEntryImpl();
-		return featureAttributeMapEntry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ImplicitItem createImplicitItemFromString(EDataType eDataType, String initialValue) {
-		ImplicitItem result = ImplicitItem.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertImplicitItemToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public FeatureAttributeValue createFeatureAttributeValueFromString(EDataType eDataType, String initialValue) {
-		return new FeatureAttributeValue(initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public String convertFeatureAttributeValueToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java
deleted file mode 100644
index 2e4df756f..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java
+++ /dev/null
@@ -1,992 +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.impl;
-/*
-
-
- */
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-import org.eclipse.jem.java.JavaRefPackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-
-public class BeaninfoPackageImpl extends EPackageImpl implements BeaninfoPackage{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass featureDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass beanDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass eventSetDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass parameterDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass propertyDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass indexedPropertyDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodProxyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass beanEventEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass featureAttributeMapEntryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum implicitItemEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType featureAttributeValueEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private BeaninfoPackageImpl() {
-		super(eNS_URI, BeaninfoFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static BeaninfoPackage init() {
-		if (isInited) return (BeaninfoPackage)EPackage.Registry.INSTANCE.getEPackage(BeaninfoPackage.eNS_URI);
-
-		// Obtain or create and register package
-		BeaninfoPackageImpl theBeaninfoPackage = (BeaninfoPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof BeaninfoPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new BeaninfoPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theBeaninfoPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theBeaninfoPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theBeaninfoPackage.freeze();
-
-		return theBeaninfoPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFeatureDecorator() {
-		return featureDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_DisplayName() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_ShortDescription() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Category() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Expert() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Hidden() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Preferred() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_MergeIntrospection() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_AttributesExplicitEmpty() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_ImplicitlySetBits() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_ImplicitDecoratorFlag() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFeatureDecorator_Attributes() {
-		return (EReference)featureDecoratorEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEventSetDecorator() {
-		return eventSetDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEventSetDecorator_InDefaultEventSet() {
-		return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEventSetDecorator_Unicast() {
-		return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEventSetDecorator_ListenerMethodsExplicitEmpty() {
-		return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_AddListenerMethod() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_ListenerMethods() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_ListenerType() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_RemoveListenerMethod() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_EventAdapterClass() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_SerListMthd() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodProxy() {
-		return methodProxyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodProxy_Method() {
-		return (EReference)methodProxyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPropertyDecorator() {
-		return propertyDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_Bound() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_Constrained() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_DesignTime() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_AlwaysIncompatible() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_FilterFlags() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_FieldReadOnly() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_PropertyEditorClass() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_ReadMethod() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_WriteMethod() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_Field() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIndexedPropertyDecorator() {
-		return indexedPropertyDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIndexedPropertyDecorator_IndexedReadMethod() {
-		return (EReference)indexedPropertyDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIndexedPropertyDecorator_IndexedWriteMethod() {
-		return (EReference)indexedPropertyDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBeanDecorator() {
-		return beanDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_MergeSuperProperties() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_MergeSuperMethods() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_MergeSuperEvents() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_IntrospectProperties() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_IntrospectMethods() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_IntrospectEvents() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBeanDecorator_CustomizerClass() {
-		return (EReference)beanDecoratorEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodDecorator() {
-		return methodDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodDecorator_ParmsExplicitEmpty() {
-		return (EAttribute)methodDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodDecorator_ParameterDescriptors() {
-		return (EReference)methodDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodDecorator_SerParmDesc() {
-		return (EReference)methodDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getParameterDecorator() {
-		return parameterDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParameterDecorator_Name() {
-		return (EAttribute)parameterDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getFeatureAttributeValue() {
-		return featureAttributeValueEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeaninfoFactory getBeaninfoFactory() {
-		return (BeaninfoFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		featureDecoratorEClass = createEClass(FEATURE_DECORATOR);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__DISPLAY_NAME);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__SHORT_DESCRIPTION);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__CATEGORY);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__EXPERT);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__HIDDEN);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__PREFERRED);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__MERGE_INTROSPECTION);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__IMPLICITLY_SET_BITS);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG);
-		createEReference(featureDecoratorEClass, FEATURE_DECORATOR__ATTRIBUTES);
-
-		beanDecoratorEClass = createEClass(BEAN_DECORATOR);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_PROPERTIES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_METHODS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_EVENTS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_PROPERTIES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_METHODS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_EVENTS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__DO_BEANINFO);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES);
-		createEReference(beanDecoratorEClass, BEAN_DECORATOR__CUSTOMIZER_CLASS);
-
-		eventSetDecoratorEClass = createEClass(EVENT_SET_DECORATOR);
-		createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET);
-		createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__UNICAST);
-		createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__ADD_LISTENER_METHOD);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_METHODS);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_TYPE);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__SER_LIST_MTHD);
-
-		methodDecoratorEClass = createEClass(METHOD_DECORATOR);
-		createEAttribute(methodDecoratorEClass, METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY);
-		createEReference(methodDecoratorEClass, METHOD_DECORATOR__PARAMETER_DESCRIPTORS);
-		createEReference(methodDecoratorEClass, METHOD_DECORATOR__SER_PARM_DESC);
-
-		parameterDecoratorEClass = createEClass(PARAMETER_DECORATOR);
-		createEAttribute(parameterDecoratorEClass, PARAMETER_DECORATOR__NAME);
-		createEReference(parameterDecoratorEClass, PARAMETER_DECORATOR__PARAMETER);
-
-		propertyDecoratorEClass = createEClass(PROPERTY_DECORATOR);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__BOUND);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__CONSTRAINED);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__DESIGN_TIME);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__FILTER_FLAGS);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__FIELD_READ_ONLY);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__READ_METHOD);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__WRITE_METHOD);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__FIELD);
-
-		indexedPropertyDecoratorEClass = createEClass(INDEXED_PROPERTY_DECORATOR);
-		createEReference(indexedPropertyDecoratorEClass, INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD);
-		createEReference(indexedPropertyDecoratorEClass, INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD);
-
-		methodProxyEClass = createEClass(METHOD_PROXY);
-		createEReference(methodProxyEClass, METHOD_PROXY__METHOD);
-
-		beanEventEClass = createEClass(BEAN_EVENT);
-
-		featureAttributeMapEntryEClass = createEClass(FEATURE_ATTRIBUTE_MAP_ENTRY);
-		createEAttribute(featureAttributeMapEntryEClass, FEATURE_ATTRIBUTE_MAP_ENTRY__KEY);
-		createEAttribute(featureAttributeMapEntryEClass, FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE);
-
-		// Create enums
-		implicitItemEEnum = createEEnum(IMPLICIT_ITEM);
-
-		// Create data types
-		featureAttributeValueEDataType = createEDataType(FEATURE_ATTRIBUTE_VALUE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-		JavaRefPackage theJavaRefPackage = (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
-		// Add supertypes to classes
-		featureDecoratorEClass.getESuperTypes().add(theEcorePackage.getEAnnotation());
-		beanDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		eventSetDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		methodDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		parameterDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		propertyDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		indexedPropertyDecoratorEClass.getESuperTypes().add(this.getPropertyDecorator());
-		methodProxyEClass.getESuperTypes().add(theEcorePackage.getEOperation());
-		beanEventEClass.getESuperTypes().add(theJavaRefPackage.getJavaEvent());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(featureDecoratorEClass, FeatureDecorator.class, "FeatureDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFeatureDecorator_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_ShortDescription(), ecorePackage.getEString(), "shortDescription", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Category(), ecorePackage.getEString(), "category", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Expert(), ecorePackage.getEBoolean(), "expert", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Hidden(), ecorePackage.getEBoolean(), "hidden", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Preferred(), ecorePackage.getEBoolean(), "preferred", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_MergeIntrospection(), ecorePackage.getEBoolean(), "mergeIntrospection", "true", 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_AttributesExplicitEmpty(), ecorePackage.getEBoolean(), "attributesExplicitEmpty", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_ImplicitlySetBits(), ecorePackage.getELong(), "implicitlySetBits", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_ImplicitDecoratorFlag(), this.getImplicitItem(), "implicitDecoratorFlag", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFeatureDecorator_Attributes(), this.getFeatureAttributeMapEntry(), null, "attributes", null, 0, -1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		EOperation op = addEOperation(featureDecoratorEClass, ecorePackage.getEString(), "getName", 0, 1);
-
-		initEClass(beanDecoratorEClass, BeanDecorator.class, "BeanDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBeanDecorator_MergeSuperProperties(), ecorePackage.getEBoolean(), "mergeSuperProperties", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_MergeSuperMethods(), ecorePackage.getEBoolean(), "mergeSuperMethods", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_MergeSuperEvents(), ecorePackage.getEBoolean(), "mergeSuperEvents", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_IntrospectProperties(), ecorePackage.getEBoolean(), "introspectProperties", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_IntrospectMethods(), ecorePackage.getEBoolean(), "introspectMethods", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_IntrospectEvents(), ecorePackage.getEBoolean(), "introspectEvents", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_DoBeaninfo(), ecorePackage.getEBoolean(), "doBeaninfo", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_NotInheritedPropertyNames(), ecorePackage.getEString(), "notInheritedPropertyNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_NotInheritedMethodNames(), ecorePackage.getEString(), "notInheritedMethodNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_NotInheritedEventNames(), ecorePackage.getEString(), "notInheritedEventNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBeanDecorator_CustomizerClass(), theJavaRefPackage.getJavaClass(), null, "customizerClass", null, 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(eventSetDecoratorEClass, EventSetDecorator.class, "EventSetDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEventSetDecorator_InDefaultEventSet(), ecorePackage.getEBoolean(), "inDefaultEventSet", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEventSetDecorator_Unicast(), ecorePackage.getEBoolean(), "unicast", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEventSetDecorator_ListenerMethodsExplicitEmpty(), ecorePackage.getEBoolean(), "listenerMethodsExplicitEmpty", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_AddListenerMethod(), theJavaRefPackage.getMethod(), null, "addListenerMethod", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_ListenerMethods(), this.getMethodProxy(), null, "listenerMethods", null, 1, -1, EventSetDecorator.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_ListenerType(), theJavaRefPackage.getJavaClass(), null, "listenerType", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_RemoveListenerMethod(), theJavaRefPackage.getMethod(), null, "removeListenerMethod", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_EventAdapterClass(), theJavaRefPackage.getJavaClass(), null, "eventAdapterClass", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_SerListMthd(), this.getMethodProxy(), null, "serListMthd", null, 1, -1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodDecoratorEClass, MethodDecorator.class, "MethodDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodDecorator_ParmsExplicitEmpty(), ecorePackage.getEBoolean(), "parmsExplicitEmpty", null, 0, 1, MethodDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodDecorator_ParameterDescriptors(), this.getParameterDecorator(), null, "parameterDescriptors", null, 0, -1, MethodDecorator.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodDecorator_SerParmDesc(), this.getParameterDecorator(), null, "serParmDesc", null, 0, -1, MethodDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(parameterDecoratorEClass, ParameterDecorator.class, "ParameterDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getParameterDecorator_Name(), ecorePackage.getEString(), "name", null, 0, 1, ParameterDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getParameterDecorator_Parameter(), theJavaRefPackage.getJavaParameter(), null, "parameter", null, 0, 1, ParameterDecorator.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(propertyDecoratorEClass, PropertyDecorator.class, "PropertyDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPropertyDecorator_Bound(), ecorePackage.getEBoolean(), "bound", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_Constrained(), ecorePackage.getEBoolean(), "constrained", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_DesignTime(), ecorePackage.getEBoolean(), "designTime", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_AlwaysIncompatible(), ecorePackage.getEBoolean(), "alwaysIncompatible", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_FilterFlags(), ecorePackage.getEString(), "filterFlags", null, 0, -1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_FieldReadOnly(), ecorePackage.getEBoolean(), "fieldReadOnly", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_PropertyEditorClass(), theJavaRefPackage.getJavaClass(), null, "propertyEditorClass", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_ReadMethod(), theJavaRefPackage.getMethod(), null, "readMethod", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_WriteMethod(), theJavaRefPackage.getMethod(), null, "writeMethod", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_Field(), theJavaRefPackage.getField(), null, "field", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		op = addEOperation(propertyDecoratorEClass, theEcorePackage.getEClassifier(), "getPropertyType", 0, 1);
-
-		op = addEOperation(propertyDecoratorEClass, null, "setPropertyType");
-		addEParameter(op, theEcorePackage.getEClassifier(), "propertyType", 0, 1);
-
-		initEClass(indexedPropertyDecoratorEClass, IndexedPropertyDecorator.class, "IndexedPropertyDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getIndexedPropertyDecorator_IndexedReadMethod(), theJavaRefPackage.getMethod(), null, "indexedReadMethod", null, 0, 1, IndexedPropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getIndexedPropertyDecorator_IndexedWriteMethod(), theJavaRefPackage.getMethod(), null, "indexedWriteMethod", null, 0, 1, IndexedPropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodProxyEClass, MethodProxy.class, "MethodProxy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMethodProxy_Method(), theJavaRefPackage.getMethod(), null, "method", null, 1, 1, MethodProxy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(beanEventEClass, BeanEvent.class, "BeanEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(featureAttributeMapEntryEClass, Map.Entry.class, "FeatureAttributeMapEntry", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFeatureAttributeMapEntry_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureAttributeMapEntry_Value(), this.getFeatureAttributeValue(), "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(implicitItemEEnum, ImplicitItem.class, "ImplicitItem");
-		addEEnumLiteral(implicitItemEEnum, ImplicitItem.NOT_IMPLICIT_LITERAL);
-		addEEnumLiteral(implicitItemEEnum, ImplicitItem.IMPLICIT_DECORATOR_LITERAL);
-		addEEnumLiteral(implicitItemEEnum, ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL);
-
-		// Initialize data types
-		initEDataType(featureAttributeValueEDataType, FeatureAttributeValue.class, "FeatureAttributeValue", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_DoBeaninfo() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_NotInheritedPropertyNames() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_NotInheritedMethodNames() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_NotInheritedEventNames() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getParameterDecorator_Parameter() {
-		return (EReference)parameterDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBeanEvent() {
-		return beanEventEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFeatureAttributeMapEntry() {
-		return featureAttributeMapEntryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureAttributeMapEntry_Key() {
-		return (EAttribute)featureAttributeMapEntryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureAttributeMapEntry_Value() {
-		return (EAttribute)featureAttributeMapEntryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getImplicitItem() {
-		return implicitItemEEnum;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java
deleted file mode 100644
index dd7875113..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java
+++ /dev/null
@@ -1,991 +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.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.EventSetDecorator;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.java.*;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Event Set Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isInDefaultEventSet <em>In Default Event Set</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isUnicast <em>Unicast</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getAddListenerMethod <em>Add Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getListenerMethods <em>Listener Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getListenerType <em>Listener Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getRemoveListenerMethod <em>Remove Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getEventAdapterClass <em>Event Adapter Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getSerListMthd <em>Ser List Mthd</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class EventSetDecoratorImpl extends FeatureDecoratorImpl implements EventSetDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long EVENT_ADDLISTENERMETHOD_IMPLICIT = 0x1L;
-	public static final long EVENT_ADAPTERCLASS_IMPLICIT = 0x2L;
-	public static final long EVENT_LISTENERMETHODS_IMPLICIT = 0x4L;
-	public static final long EVENT_LISTENERTYPE_IMPLICIT = 0x8L;
-	public static final long EVENT_REMOVELISTENERMETHOD_IMPLICIT = 0x10L;
-	public static final long EVENT_DEFAULTEVENTSET_IMPLICIT = 0x20L;
-	public static final long EVENT_UNICAST_IMPLICIT = 0x40L;
-	public static final long EVENT_LISTENERMETHODS_DEFAULT = 0x80L;
-
-
-	/**
-	 * The default value of the '{@link #isInDefaultEventSet() <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInDefaultEventSet()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IN_DEFAULT_EVENT_SET_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isInDefaultEventSet() <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInDefaultEventSet()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int IN_DEFAULT_EVENT_SET_EFLAG = 1 << 18;
-
-	/**
-	 * The flag representing whether the In Default Event Set attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int IN_DEFAULT_EVENT_SET_ESETFLAG = 1 << 19;
-
-	/**
-	 * The default value of the '{@link #isUnicast() <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUnicast()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean UNICAST_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isUnicast() <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUnicast()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int UNICAST_EFLAG = 1 << 20;
-
-	/**
-	 * The flag representing whether the Unicast attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int UNICAST_ESETFLAG = 1 << 21;
-
-	/**
-	 * The default value of the '{@link #isListenerMethodsExplicitEmpty() <em>Listener Methods Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isListenerMethodsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isListenerMethodsExplicitEmpty() <em>Listener Methods Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isListenerMethodsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG = 1 << 22;
-
-	/**
-	 * The cached value of the '{@link #getAddListenerMethod() <em>Add Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAddListenerMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method addListenerMethod = null;
-	
-	/**
-	 * The cached value of the '{@link #getListenerType() <em>Listener Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getListenerType()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass listenerType = null;
-	/**
-	 * The cached value of the '{@link #getRemoveListenerMethod() <em>Remove Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemoveListenerMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method removeListenerMethod = null;
-	
-	/**
-	 * The cached value of the '{@link #getEventAdapterClass() <em>Event Adapter Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEventAdapterClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass eventAdapterClass = null;
-
-	/**
-	 * The cached value of the '{@link #getSerListMthd() <em>Ser List Mthd</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSerListMthd()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serListMthd = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected EventSetDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getEventSetDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isInDefaultEventSet() {
-		return (eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInDefaultEventSet(boolean newInDefaultEventSet) {
-		boolean oldInDefaultEventSet = (eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0;
-		if (newInDefaultEventSet) eFlags |= IN_DEFAULT_EVENT_SET_EFLAG; else eFlags &= ~IN_DEFAULT_EVENT_SET_EFLAG;
-		boolean oldInDefaultEventSetESet = (eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0;
-		eFlags |= IN_DEFAULT_EVENT_SET_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET, oldInDefaultEventSet, newInDefaultEventSet, !oldInDefaultEventSetESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetInDefaultEventSet() {
-		boolean oldInDefaultEventSet = (eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0;
-		boolean oldInDefaultEventSetESet = (eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0;
-		if (IN_DEFAULT_EVENT_SET_EDEFAULT) eFlags |= IN_DEFAULT_EVENT_SET_EFLAG; else eFlags &= ~IN_DEFAULT_EVENT_SET_EFLAG;
-		eFlags &= ~IN_DEFAULT_EVENT_SET_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET, oldInDefaultEventSet, IN_DEFAULT_EVENT_SET_EDEFAULT, oldInDefaultEventSetESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetInDefaultEventSet() {
-		return (eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isUnicast() {
-		return (eFlags & UNICAST_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUnicast(boolean newUnicast) {
-		boolean oldUnicast = (eFlags & UNICAST_EFLAG) != 0;
-		if (newUnicast) eFlags |= UNICAST_EFLAG; else eFlags &= ~UNICAST_EFLAG;
-		boolean oldUnicastESet = (eFlags & UNICAST_ESETFLAG) != 0;
-		eFlags |= UNICAST_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST, oldUnicast, newUnicast, !oldUnicastESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetUnicast() {
-		boolean oldUnicast = (eFlags & UNICAST_EFLAG) != 0;
-		boolean oldUnicastESet = (eFlags & UNICAST_ESETFLAG) != 0;
-		if (UNICAST_EDEFAULT) eFlags |= UNICAST_EFLAG; else eFlags &= ~UNICAST_EFLAG;
-		eFlags &= ~UNICAST_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST, oldUnicast, UNICAST_EDEFAULT, oldUnicastESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetUnicast() {
-		return (eFlags & UNICAST_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isListenerMethodsExplicitEmpty() {
-		return (eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setListenerMethodsExplicitEmpty(boolean newListenerMethodsExplicitEmpty) {
-		boolean oldListenerMethodsExplicitEmpty = (eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0;
-		if (newListenerMethodsExplicitEmpty) eFlags |= LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG; else eFlags &= ~LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY, oldListenerMethodsExplicitEmpty, newListenerMethodsExplicitEmpty));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getAddListenerMethod() {
-		if (addListenerMethod != null && addListenerMethod.eIsProxy()) {
-			Method oldAddListenerMethod = addListenerMethod;
-			addListenerMethod = (Method)eResolveProxy((InternalEObject)addListenerMethod);
-			if (addListenerMethod != oldAddListenerMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD, oldAddListenerMethod, addListenerMethod));
-			}
-		}
-		return addListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetAddListenerMethod() {
-		return addListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAddListenerMethod(Method newAddListenerMethod) {
-		Method oldAddListenerMethod = addListenerMethod;
-		addListenerMethod = newAddListenerMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD, oldAddListenerMethod, addListenerMethod));
-	}
-
-	public EList getListenerMethods() {
-		if (!isListenerMethodsExplicitEmpty() && getSerListMthd().isEmpty() && (getImplicitlySetBits()&(EVENT_LISTENERMETHODS_IMPLICIT | EVENT_LISTENERMETHODS_DEFAULT)) == 0) {
-			// Not explicitly empty, it is empty, and we have not implicitly or by defaults made it empty, then create the defaults.
-			createDefaultListenerMethodsList();
-		}
-		return getSerListMthd();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getListenerMethodsGen() {
-		// TODO: implement this method to return the 'Listener Methods' reference list
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getListenerType() {
-		if (listenerType != null && listenerType.eIsProxy()) {
-			JavaClass oldListenerType = listenerType;
-			listenerType = (JavaClass)eResolveProxy((InternalEObject)listenerType);
-			if (listenerType != oldListenerType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE, oldListenerType, listenerType));
-			}
-		}
-		return listenerType;
-	}
-
-	/**
-	 * This is called if method listeners list not explicitly set and there is no feature proxy or
-	 * there is a feature proxy and the proxy has nothing defined.
-	 * <p>
-	 * This is an internal method used by BeanInfo classes. It is not to be used by clients.
-	 */
-	public EList createDefaultListenerMethodsList() {
-		if (!eIsSet(EcorePackage.eINSTANCE.getEAnnotation_EModelElement()))
-			return this.getSerListMthd();	// We are not attached, can't determine the list yet.
-		EList mthdsList = this.getSerListMthd();		
-			
-		JavaClass eventObjectClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.EventObject", getEModelElement().eResource().getResourceSet()); //$NON-NLS-1$
-		
-		mthdsList.clear();
-		
-		// This is a little tricky. Need to get the methods for the listener type, and
-		// then go through the methods and filter out the non-event ones.
-		JavaClass lt = getListenerType();
-		if (lt == null)
-			return mthdsList;	// Couldn't get the listener type for some reason, so leave as is.
-		setImplicitlySetBits(getImplicitlySetBits()|EVENT_LISTENERMETHODS_DEFAULT);	// Mark as we implicitly filled it in.
-		
-		BeaninfoFactory bfact = BeaninfoFactory.eINSTANCE;
-		List ms = lt.getPublicMethodsExtended();
-		int msize = ms.size();
-		for (int i=0; i<msize; i++) {
-			Method method = (Method) ms.get(i);
-			List parms = method.getParameters();
-			if (parms.size() != 1)
-				continue;	// Must have only one parm.
-			if (!eventObjectClass.isAssignableFrom(((JavaParameter) parms.get(0)).getEType()))
-				continue;	// Parm does not inherit from java.util.EventObject
-				
-			// We need a method proxy, and a method decorator.
-			MethodProxy mproxy = bfact.createMethodProxy();
-			mproxy.setMethod(method);
-			mproxy.setName(method.getName());			
-			MethodDecorator md = bfact.createMethodDecorator();
-			md.setImplicitDecoratorFlag(ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL);
-			md.setEModelElement(mproxy);			
-			mthdsList.add(mproxy);
-		}
-		return mthdsList;
-	}	
-	
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetListenerType() {
-		return listenerType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setListenerType(JavaClass newListenerType) {
-		JavaClass oldListenerType = listenerType;
-		listenerType = newListenerType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE, oldListenerType, listenerType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getRemoveListenerMethod() {
-		if (removeListenerMethod != null && removeListenerMethod.eIsProxy()) {
-			Method oldRemoveListenerMethod = removeListenerMethod;
-			removeListenerMethod = (Method)eResolveProxy((InternalEObject)removeListenerMethod);
-			if (removeListenerMethod != oldRemoveListenerMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD, oldRemoveListenerMethod, removeListenerMethod));
-			}
-		}
-		return removeListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetRemoveListenerMethod() {
-		return removeListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemoveListenerMethod(Method newRemoveListenerMethod) {
-		Method oldRemoveListenerMethod = removeListenerMethod;
-		removeListenerMethod = newRemoveListenerMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD, oldRemoveListenerMethod, removeListenerMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getEventAdapterClass() {
-		if (eventAdapterClass != null && eventAdapterClass.eIsProxy()) {
-			JavaClass oldEventAdapterClass = eventAdapterClass;
-			eventAdapterClass = (JavaClass)eResolveProxy((InternalEObject)eventAdapterClass);
-			if (eventAdapterClass != oldEventAdapterClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS, oldEventAdapterClass, eventAdapterClass));
-			}
-		}
-		return eventAdapterClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetEventAdapterClass() {
-		return eventAdapterClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEventAdapterClass(JavaClass newEventAdapterClass) {
-		JavaClass oldEventAdapterClass = eventAdapterClass;
-		eventAdapterClass = newEventAdapterClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS, oldEventAdapterClass, eventAdapterClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSerListMthd() {
-		if (serListMthd == null) {
-			serListMthd = new EObjectContainmentEList(MethodProxy.class, this, BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD);
-		}
-		return serListMthd;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-					return ((InternalEList)getSerListMthd()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				return isInDefaultEventSet() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				return isUnicast() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				return isListenerMethodsExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				if (resolve) return getAddListenerMethod();
-				return basicGetAddListenerMethod();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				return getListenerMethods();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				if (resolve) return getListenerType();
-				return basicGetListenerType();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				if (resolve) return getRemoveListenerMethod();
-				return basicGetRemoveListenerMethod();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				if (resolve) return getEventAdapterClass();
-				return basicGetEventAdapterClass();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				return getSerListMthd();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				setInDefaultEventSet(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				setUnicast(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				setListenerMethodsExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				setAddListenerMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				getListenerMethods().clear();
-				getListenerMethods().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				setListenerType((JavaClass)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				setRemoveListenerMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				setEventAdapterClass((JavaClass)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				getSerListMthd().clear();
-				getSerListMthd().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				unsetInDefaultEventSet();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				unsetUnicast();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				setListenerMethodsExplicitEmpty(LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				setAddListenerMethod((Method)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				getListenerMethods().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				setListenerType((JavaClass)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				setRemoveListenerMethod((Method)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				setEventAdapterClass((JavaClass)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				getSerListMthd().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/*
-	 * This is overridden so that we can do special is set tests:
-	 * 1) parameter descriptors: check if serParmDesc exists and not empty, since parameter descriptors is derived.
-	 * 2) serParmDesc: if flag set to default parm desc, then answer not set, else do normal isSet test. That way if set by default it won't serialize
-	 *    out the unneeded default parms. They can be reconstructed quickly when needed.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				return eIsSetGen(BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd());	// Let default serListMthd is set work.
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				if ((getImplicitlySetBits() & EVENT_LISTENERMETHODS_DEFAULT) != 0)
-					return false;	// Not considered set if initialized by default.
-				else
-					return eIsSetGen(eFeature);	// Not set by default, so check true setting.
-			default:
-				return eIsSetGen(eFeature);	// Everything else use the gen method.
-		}
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				return isSetInDefaultEventSet();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				return isSetUnicast();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				return ((eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0) != LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				return addListenerMethod != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				return !getListenerMethods().isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				return listenerType != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				return removeListenerMethod != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				return eventAdapterClass != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				return serListMthd != null && !serListMthd.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (inDefaultEventSet: ");
-		if ((eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0) result.append((eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0); else result.append("<unset>");
-		result.append(", unicast: ");
-		if ((eFlags & UNICAST_ESETFLAG) != 0) result.append((eFlags & UNICAST_EFLAG) != 0); else result.append("<unset>");
-		result.append(", listenerMethodsExplicitEmpty: ");
-		result.append((eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0);
-		result.append(')');
-		return result.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java
deleted file mode 100644
index 0b8f067cb..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java
+++ /dev/null
@@ -1,308 +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.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.BasicEMap;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Attribute Map Entry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl#getTypedKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl#getTypedValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureAttributeMapEntryImpl extends EObjectImpl implements BasicEMap.Entry {
-	
-	/**
-	 * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String KEY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected String key = KEY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final FeatureAttributeValue VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureAttributeValue value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureAttributeMapEntryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getFeatureAttributeMapEntry();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTypedKey() {
-		return key;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedKey(String newKey) {
-		String oldKey = key;
-		key = newKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY, oldKey, key));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureAttributeValue getTypedValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedValue(FeatureAttributeValue newValue) {
-		FeatureAttributeValue oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				return getTypedKey();
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				return getTypedValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				setTypedKey((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				setTypedValue((FeatureAttributeValue)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				setTypedKey(KEY_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				setTypedValue(VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (key: ");
-		result.append(key);
-		result.append(", value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int hash = -1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHash() {
-		if (hash == -1) {
-			Object theKey = getKey();
-			hash = (theKey == null ? 0 : theKey.hashCode());
-		}
-		return hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHash(int hash) {
-		this.hash = hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getKey() {
-		return getTypedKey();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKey(Object key) {
-		setTypedKey((String)key);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getValue() {
-		return getTypedValue();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object setValue(Object value) {
-		Object oldValue = getValue();
-		setTypedValue((FeatureAttributeValue)value);
-		return oldValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getEMap() {
-		EObject container = eContainer();
-		return container == null ? null : (EMap)container.eGet(eContainmentFeature());
-	}
-
-} //FeatureAttributeMapEntryImpl
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java
deleted file mode 100644
index ccede12ce..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java
+++ /dev/null
@@ -1,1058 +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.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EAnnotationImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.FeatureDecorator;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getShortDescription <em>Short Description</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isExpert <em>Expert</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isHidden <em>Hidden</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isPreferred <em>Preferred</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isMergeIntrospection <em>Merge Introspection</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getImplicitlySetBits <em>Implicitly Set Bits</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureDecoratorImpl extends EAnnotationImpl implements FeatureDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 * Note: To make it easier to make changes Feature goes from high bits down, while the
-	 * subclasses go from low-bits up. That way if a change is made to add something of
-	 * interest to Feature, all of the subclasses don't need to have their bits re-ordered.
-	 * Since these are bits, it doesn't matter which ones to use.
-	 */
-	public static final long FEATURE_DISPLAYNAME_IMPLICIT = 0x8000000000000000L;
-	public static final long FEATURE_SHORTDESC_IMPLICIT = 0x4000000000000000L;
-	public static final long FEATURE_CATEGORY_IMPLICIT = 0x2000000000000000L;
-	public static final long FEATURE_EXPERT_IMPLICIT = 0x1000000000000000L;
-	public static final long FEATURE_HIDDEN_IMPLICIT = 0x800000000000000L;
-	public static final long FEATURE_PREFERRED_IMPLICIT = 0x400000000000000L;
-	public static final long FEATURE_ATTRIBUTES_IMPLICIT = 0x200000000000000L; 
-	
-	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	 
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-	/**
-	 * The flag representing whether the Display Name attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int DISPLAY_NAME_ESETFLAG = 1 << 8;
-
-	/**
-	 * The default value of the '{@link #getShortDescription() <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShortDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SHORT_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getShortDescription() <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShortDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String shortDescription = SHORT_DESCRIPTION_EDEFAULT;
-	/**
-	 * The flag representing whether the Short Description attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int SHORT_DESCRIPTION_ESETFLAG = 1 << 9;
-
-	/**
-	 * The default value of the '{@link #getCategory() <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CATEGORY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCategory() <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected String category = CATEGORY_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isExpert() <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExpert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXPERT_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isExpert() <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExpert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int EXPERT_EFLAG = 1 << 10;
-
-	/**
-	 * The flag representing whether the Expert attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int EXPERT_ESETFLAG = 1 << 11;
-
-	/**
-	 * The default value of the '{@link #isHidden() <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHidden()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HIDDEN_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isHidden() <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHidden()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int HIDDEN_EFLAG = 1 << 12;
-
-	/**
-	 * The flag representing whether the Hidden attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int HIDDEN_ESETFLAG = 1 << 13;
-
-	/**
-	 * The default value of the '{@link #isPreferred() <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPreferred()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PREFERRED_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isPreferred() <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPreferred()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PREFERRED_EFLAG = 1 << 14;
-
-	/**
-	 * The flag representing whether the Preferred attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PREFERRED_ESETFLAG = 1 << 15;
-
-	/**
-	 * The default value of the '{@link #isMergeIntrospection() <em>Merge Introspection</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeIntrospection()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_INTROSPECTION_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isMergeIntrospection() <em>Merge Introspection</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeIntrospection()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_INTROSPECTION_EFLAG = 1 << 16;
-
-	/**
-	 * The default value of the '{@link #isAttributesExplicitEmpty() <em>Attributes Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAttributesExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isAttributesExplicitEmpty() <em>Attributes Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAttributesExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ATTRIBUTES_EXPLICIT_EMPTY_EFLAG = 1 << 17;
-
-	/**
-	 * The default value of the '{@link #getImplicitlySetBits() <em>Implicitly Set Bits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitlySetBits()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final long IMPLICITLY_SET_BITS_EDEFAULT = 0L;
-
-	/**
-	 * The cached value of the '{@link #getImplicitlySetBits() <em>Implicitly Set Bits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitlySetBits()
-	 * @generated
-	 * @ordered
-	 */
-	protected long implicitlySetBits = IMPLICITLY_SET_BITS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getImplicitDecoratorFlag() <em>Implicit Decorator Flag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitDecoratorFlag()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ImplicitItem IMPLICIT_DECORATOR_FLAG_EDEFAULT = ImplicitItem.NOT_IMPLICIT_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getImplicitDecoratorFlag() <em>Implicit Decorator Flag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitDecoratorFlag()
-	 * @generated
-	 * @ordered
-	 */
-	protected ImplicitItem implicitDecoratorFlag = IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap attributes = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureDecoratorImpl() {
-		super();
-		eFlags |= MERGE_INTROSPECTION_EFLAG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getFeatureDecorator();
-	}
-
-	public String getDisplayName() {
-		return isSetDisplayName() ? getDisplayNameGen() : getName();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDisplayNameGen() {
-		return displayName;
-	}
-
-	public String getName() {
-		ENamedElement ne = (ENamedElement) getEModelElement();
-		if (ne != null)
-			return ne.getName();	// The name from the owner of the feature has to be the name of feature.
-		else
-			return "?";	// Don't know what it is. //$NON-NLS-1$
-	}
-	
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		boolean oldDisplayNameESet = (eFlags & DISPLAY_NAME_ESETFLAG) != 0;
-		eFlags |= DISPLAY_NAME_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME, oldDisplayName, displayName, !oldDisplayNameESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDisplayName() {
-		String oldDisplayName = displayName;
-		boolean oldDisplayNameESet = (eFlags & DISPLAY_NAME_ESETFLAG) != 0;
-		displayName = DISPLAY_NAME_EDEFAULT;
-		eFlags &= ~DISPLAY_NAME_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME, oldDisplayName, DISPLAY_NAME_EDEFAULT, oldDisplayNameESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDisplayName() {
-		return (eFlags & DISPLAY_NAME_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getShortDescription() {
-		return shortDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setShortDescription(String newShortDescription) {
-		String oldShortDescription = shortDescription;
-		shortDescription = newShortDescription;
-		boolean oldShortDescriptionESet = (eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0;
-		eFlags |= SHORT_DESCRIPTION_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION, oldShortDescription, shortDescription, !oldShortDescriptionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetShortDescription() {
-		String oldShortDescription = shortDescription;
-		boolean oldShortDescriptionESet = (eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0;
-		shortDescription = SHORT_DESCRIPTION_EDEFAULT;
-		eFlags &= ~SHORT_DESCRIPTION_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION, oldShortDescription, SHORT_DESCRIPTION_EDEFAULT, oldShortDescriptionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetShortDescription() {
-		return (eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCategory() {
-		return category;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCategory(String newCategory) {
-		String oldCategory = category;
-		category = newCategory;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__CATEGORY, oldCategory, category));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isExpert() {
-		return (eFlags & EXPERT_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpert(boolean newExpert) {
-		boolean oldExpert = (eFlags & EXPERT_EFLAG) != 0;
-		if (newExpert) eFlags |= EXPERT_EFLAG; else eFlags &= ~EXPERT_EFLAG;
-		boolean oldExpertESet = (eFlags & EXPERT_ESETFLAG) != 0;
-		eFlags |= EXPERT_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__EXPERT, oldExpert, newExpert, !oldExpertESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetExpert() {
-		boolean oldExpert = (eFlags & EXPERT_EFLAG) != 0;
-		boolean oldExpertESet = (eFlags & EXPERT_ESETFLAG) != 0;
-		if (EXPERT_EDEFAULT) eFlags |= EXPERT_EFLAG; else eFlags &= ~EXPERT_EFLAG;
-		eFlags &= ~EXPERT_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__EXPERT, oldExpert, EXPERT_EDEFAULT, oldExpertESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetExpert() {
-		return (eFlags & EXPERT_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHidden() {
-		return (eFlags & HIDDEN_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHidden(boolean newHidden) {
-		boolean oldHidden = (eFlags & HIDDEN_EFLAG) != 0;
-		if (newHidden) eFlags |= HIDDEN_EFLAG; else eFlags &= ~HIDDEN_EFLAG;
-		boolean oldHiddenESet = (eFlags & HIDDEN_ESETFLAG) != 0;
-		eFlags |= HIDDEN_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__HIDDEN, oldHidden, newHidden, !oldHiddenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetHidden() {
-		boolean oldHidden = (eFlags & HIDDEN_EFLAG) != 0;
-		boolean oldHiddenESet = (eFlags & HIDDEN_ESETFLAG) != 0;
-		if (HIDDEN_EDEFAULT) eFlags |= HIDDEN_EFLAG; else eFlags &= ~HIDDEN_EFLAG;
-		eFlags &= ~HIDDEN_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__HIDDEN, oldHidden, HIDDEN_EDEFAULT, oldHiddenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetHidden() {
-		return (eFlags & HIDDEN_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isPreferred() {
-		return (eFlags & PREFERRED_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPreferred(boolean newPreferred) {
-		boolean oldPreferred = (eFlags & PREFERRED_EFLAG) != 0;
-		if (newPreferred) eFlags |= PREFERRED_EFLAG; else eFlags &= ~PREFERRED_EFLAG;
-		boolean oldPreferredESet = (eFlags & PREFERRED_ESETFLAG) != 0;
-		eFlags |= PREFERRED_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__PREFERRED, oldPreferred, newPreferred, !oldPreferredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetPreferred() {
-		boolean oldPreferred = (eFlags & PREFERRED_EFLAG) != 0;
-		boolean oldPreferredESet = (eFlags & PREFERRED_ESETFLAG) != 0;
-		if (PREFERRED_EDEFAULT) eFlags |= PREFERRED_EFLAG; else eFlags &= ~PREFERRED_EFLAG;
-		eFlags &= ~PREFERRED_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__PREFERRED, oldPreferred, PREFERRED_EDEFAULT, oldPreferredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetPreferred() {
-		return (eFlags & PREFERRED_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeIntrospection() {
-		return (eFlags & MERGE_INTROSPECTION_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeIntrospection(boolean newMergeIntrospection) {
-		boolean oldMergeIntrospection = (eFlags & MERGE_INTROSPECTION_EFLAG) != 0;
-		if (newMergeIntrospection) eFlags |= MERGE_INTROSPECTION_EFLAG; else eFlags &= ~MERGE_INTROSPECTION_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION, oldMergeIntrospection, newMergeIntrospection));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isAttributesExplicitEmpty() {
-		return (eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAttributesExplicitEmpty(boolean newAttributesExplicitEmpty) {
-		boolean oldAttributesExplicitEmpty = (eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0;
-		if (newAttributesExplicitEmpty) eFlags |= ATTRIBUTES_EXPLICIT_EMPTY_EFLAG; else eFlags &= ~ATTRIBUTES_EXPLICIT_EMPTY_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY, oldAttributesExplicitEmpty, newAttributesExplicitEmpty));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public long getImplicitlySetBits() {
-		return implicitlySetBits;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicitlySetBits(long newImplicitlySetBits) {
-		long oldImplicitlySetBits = implicitlySetBits;
-		implicitlySetBits = newImplicitlySetBits;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS, oldImplicitlySetBits, implicitlySetBits));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ImplicitItem getImplicitDecoratorFlag() {
-		return implicitDecoratorFlag;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicitDecoratorFlag(ImplicitItem newImplicitDecoratorFlag) {
-		ImplicitItem oldImplicitDecoratorFlag = implicitDecoratorFlag;
-		implicitDecoratorFlag = newImplicitDecoratorFlag == null ? IMPLICIT_DECORATOR_FLAG_EDEFAULT : newImplicitDecoratorFlag;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG, oldImplicitDecoratorFlag, implicitDecoratorFlag));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getAttributes() {
-		if (attributes == null) {
-			attributes = new EcoreEMap(BeaninfoPackage.eINSTANCE.getFeatureAttributeMapEntry(), FeatureAttributeMapEntryImpl.class, this, BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES);
-		}
-		return attributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (displayName: ");
-		if ((eFlags & DISPLAY_NAME_ESETFLAG) != 0) result.append(displayName); else result.append("<unset>");
-		result.append(", shortDescription: ");
-		if ((eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0) result.append(shortDescription); else result.append("<unset>");
-		result.append(", category: ");
-		result.append(category);
-		result.append(", expert: ");
-		if ((eFlags & EXPERT_ESETFLAG) != 0) result.append((eFlags & EXPERT_EFLAG) != 0); else result.append("<unset>");
-		result.append(", hidden: ");
-		if ((eFlags & HIDDEN_ESETFLAG) != 0) result.append((eFlags & HIDDEN_EFLAG) != 0); else result.append("<unset>");
-		result.append(", preferred: ");
-		if ((eFlags & PREFERRED_ESETFLAG) != 0) result.append((eFlags & PREFERRED_EFLAG) != 0); else result.append("<unset>");
-		result.append(", mergeIntrospection: ");
-		result.append((eFlags & MERGE_INTROSPECTION_EFLAG) != 0);
-		result.append(", attributesExplicitEmpty: ");
-		result.append((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0);
-		result.append(", implicitlySetBits: ");
-		result.append(implicitlySetBits);
-		result.append(", implicitDecoratorFlag: ");
-		result.append(implicitDecoratorFlag);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-	
-	/**
-	 * Called by overrides to eIsSet to test if source is set. This is because for the 
-	 * FeatureDecorator and subclasses, setting source to the classname is considered
-	 * to be not set since that is the new default for each class level. By doing this
-	 * when serializing it won't waste space and time adding a copy of the source string
-	 * to the serialized output and then creating a NEW copy on each decorator loaded
-	 * from an XMI file. 
-	 * 
-	 * @return <code>true</code> if source is not null and not equal to class name (less the "Impl" at the end).
-	 * 
-	 * @since 1.1.0
-	 */
-	protected boolean isSourceSet() {
-		return source != null && !eClass().getInstanceClassName().equals(source);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java
deleted file mode 100644
index 17a457fec..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java
+++ /dev/null
@@ -1,664 +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.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Indexed Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl#getIndexedReadMethod <em>Indexed Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl#getIndexedWriteMethod <em>Indexed Write Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class IndexedPropertyDecoratorImpl extends PropertyDecoratorImpl implements IndexedPropertyDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long INDEXED_READMETHOD_IMPLICIT = 0x100000L;	// Start kind of high so as to allow PropertyDecorator to increase without conflig.
-	public static final long INDEXED_WRITEMETHOD_IMPLICIT = 0x200000L;
-	
-	/**
-	 * The cached value of the '{@link #getIndexedReadMethod() <em>Indexed Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndexedReadMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method indexedReadMethod = null;
-	/**
-	 * The flag representing whether the Indexed Read Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int INDEXED_READ_METHOD_ESETFLAG = 1 << 29;
-
-	/**
-	 * The cached value of the '{@link #getIndexedWriteMethod() <em>Indexed Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndexedWriteMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method indexedWriteMethod = null;
-	
-	/**
-	 * The flag representing whether the Indexed Write Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int INDEXED_WRITE_METHOD_ESETFLAG = 1 << 30;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected IndexedPropertyDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getIndexedReadMethod() {
-		if (indexedReadMethod != null && indexedReadMethod.eIsProxy()) {
-			Method oldIndexedReadMethod = indexedReadMethod;
-			indexedReadMethod = (Method)eResolveProxy((InternalEObject)indexedReadMethod);
-			if (indexedReadMethod != oldIndexedReadMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, indexedReadMethod));
-			}
-		}
-		return indexedReadMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIndexedReadMethod(Method newIndexedReadMethod) {
-		Method oldIndexedReadMethod = indexedReadMethod;
-		indexedReadMethod = newIndexedReadMethod;
-		boolean oldIndexedReadMethodESet = (eFlags & INDEXED_READ_METHOD_ESETFLAG) != 0;
-		eFlags |= INDEXED_READ_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, indexedReadMethod, !oldIndexedReadMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIndexedReadMethod() {
-		Method oldIndexedReadMethod = indexedReadMethod;
-		boolean oldIndexedReadMethodESet = (eFlags & INDEXED_READ_METHOD_ESETFLAG) != 0;
-		indexedReadMethod = null;
-		eFlags &= ~INDEXED_READ_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, null, oldIndexedReadMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIndexedReadMethod() {
-		return (eFlags & INDEXED_READ_METHOD_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getIndexedWriteMethod() {
-		if (indexedWriteMethod != null && indexedWriteMethod.eIsProxy()) {
-			Method oldIndexedWriteMethod = indexedWriteMethod;
-			indexedWriteMethod = (Method)eResolveProxy((InternalEObject)indexedWriteMethod);
-			if (indexedWriteMethod != oldIndexedWriteMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, indexedWriteMethod));
-			}
-		}
-		return indexedWriteMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIndexedWriteMethod(Method newIndexedWriteMethod) {
-		Method oldIndexedWriteMethod = indexedWriteMethod;
-		indexedWriteMethod = newIndexedWriteMethod;
-		boolean oldIndexedWriteMethodESet = (eFlags & INDEXED_WRITE_METHOD_ESETFLAG) != 0;
-		eFlags |= INDEXED_WRITE_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, indexedWriteMethod, !oldIndexedWriteMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIndexedWriteMethod() {
-		Method oldIndexedWriteMethod = indexedWriteMethod;
-		boolean oldIndexedWriteMethodESet = (eFlags & INDEXED_WRITE_METHOD_ESETFLAG) != 0;
-		indexedWriteMethod = null;
-		eFlags &= ~INDEXED_WRITE_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, null, oldIndexedWriteMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIndexedWriteMethod() {
-		return (eFlags & INDEXED_WRITE_METHOD_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				return isBound() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				return isConstrained() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				return isDesignTime() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				return isAlwaysIncompatible() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				return getFilterFlags();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				return isFieldReadOnly() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				if (resolve) return getPropertyEditorClass();
-				return basicGetPropertyEditorClass();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				if (resolve) return getReadMethod();
-				return basicGetReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				if (resolve) return getWriteMethod();
-				return basicGetWriteMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				if (resolve) return getField();
-				return basicGetField();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				if (resolve) return getIndexedReadMethod();
-				return basicGetIndexedReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				if (resolve) return getIndexedWriteMethod();
-				return basicGetIndexedWriteMethod();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				setBound(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				setConstrained(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				setDesignTime(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				setAlwaysIncompatible(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				getFilterFlags().clear();
-				getFilterFlags().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				setFieldReadOnly(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				setPropertyEditorClass((JavaClass)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				setReadMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				setWriteMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				setField((Field)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				setIndexedReadMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				setIndexedWriteMethod((Method)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				unsetBound();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				unsetConstrained();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				unsetDesignTime();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				setAlwaysIncompatible(ALWAYS_INCOMPATIBLE_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				getFilterFlags().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				setFieldReadOnly(FIELD_READ_ONLY_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				setPropertyEditorClass((JavaClass)null);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				unsetReadMethod();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				unsetWriteMethod();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				unsetField();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				unsetIndexedReadMethod();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				unsetIndexedWriteMethod();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				return isSetBound();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				return isSetConstrained();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				return isSetDesignTime();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				return ((eFlags & ALWAYS_INCOMPATIBLE_EFLAG) != 0) != ALWAYS_INCOMPATIBLE_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				return filterFlags != null && !filterFlags.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				return ((eFlags & FIELD_READ_ONLY_EFLAG) != 0) != FIELD_READ_ONLY_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				return propertyEditorClass != null;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				return isSetReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				return isSetWriteMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				return isSetField();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				return isSetIndexedReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				return isSetIndexedWriteMethod();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetIndexedReadMethod() {
-		return indexedReadMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetIndexedWriteMethod() {
-		return indexedWriteMethod;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java
deleted file mode 100644
index eb852634c..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java
+++ /dev/null
@@ -1,592 +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.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import java.util.*;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoFactory;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.MethodDecorator;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-import org.eclipse.jem.internal.beaninfo.ParameterDecorator;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#getParameterDescriptors <em>Parameter Descriptors</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#getSerParmDesc <em>Ser Parm Desc</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class MethodDecoratorImpl extends FeatureDecoratorImpl implements MethodDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long METHOD_PARAMETERS_IMPLICIT = 0x1L;
-	public static final long METHOD_PARAMETERS_DEFAULT = 02L;	// Special, means were created by default and not by implicit (from beaninfo).
-
-	/**
-	 * The default value of the '{@link #isParmsExplicitEmpty() <em>Parms Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isParmsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PARMS_EXPLICIT_EMPTY_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isParmsExplicitEmpty() <em>Parms Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isParmsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PARMS_EXPLICIT_EMPTY_EFLAG = 1 << 18;
-
-	/**
-	 * The cached value of the '{@link #getSerParmDesc() <em>Ser Parm Desc</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSerParmDesc()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serParmDesc = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected MethodDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getMethodDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isParmsExplicitEmpty() {
-		return (eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParmsExplicitEmpty(boolean newParmsExplicitEmpty) {
-		boolean oldParmsExplicitEmpty = (eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0;
-		if (newParmsExplicitEmpty) eFlags |= PARMS_EXPLICIT_EMPTY_EFLAG; else eFlags &= ~PARMS_EXPLICIT_EMPTY_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY, oldParmsExplicitEmpty, newParmsExplicitEmpty));
-	}
-
-	/*
-	 * This is called if parms list not explicitly set and it was empty from BeanInfo or
-	 * this is from reflection. This becomes the default list based upon the method
-	 * we are attached to.
-	 */
-	private EList createDefaultParmsList() {
-		EList parmsList = this.getSerParmDesc();
-		parmsList.clear();
-		
-		setImplicitlySetBits(getImplicitlySetBits()|METHOD_PARAMETERS_DEFAULT);	// Mark as we implicitly filled it in.
-		List p = getMethodParameters();
-		if (p == null)
-			return parmsList;	// Couldn't get the list for some reason, so leave as is.
-		int psize = p.size();
-		for (int i=0; i<psize; i++) {
-			ParameterDecorator pd = BeaninfoFactory.eINSTANCE.createParameterDecorator();
-			JavaParameter jp = (JavaParameter) p.get(i);
-			pd.setName(jp.getName());
-			pd.setImplicitlySetBits(ParameterDecoratorImpl.PARAMETER_NAME_IMPLICIT);
-			pd.setParameter(jp);
-			parmsList.add(pd);
-		}
-		return parmsList;
-	}
-	
-	/*
-	 * Initialize the ParameterDecorators to hook up the JavaParameter they are describing.
-	 * This is called from ParameterDecorator when it finds that its JavaParameter has not been set.
-	 * This means that it was explicitly added and we need to setup the parms.
-	 * <p>
-	 * Note this an internal method for BeanInfo. It is not meant to be called by clients.
-	 */
-	void initializeParameters() {
-		if (this.serParmDesc == null)
-			return;
-		List mp = getMethodParameters();
-		if (mp.isEmpty())
-			return;	// Nothing that can be described.
-		int psize = Math.min(this.serParmDesc.size(), mp.size());
-		for (int i=0; i < psize; i++)
-			((ParameterDecorator) this.serParmDesc.get(i)).setParameter((JavaParameter) mp.get(i));
-	}
-
-
-	/*
-	 * Get the jem parameters from the method (jem method)
-	 */
-	private List getMethodParameters() {
-		// Get the method
-		Method m = null;
-		Object d = getEModelElement();
-		if (d instanceof Method)
-			m = (Method) d;
-		else 
-			if (d instanceof MethodProxy)
-				m = ((MethodProxy) d).getMethod();
-			else
-				return Collections.EMPTY_LIST;	// Not decorating correct object.
-		if (m == null)
-			return Collections.EMPTY_LIST;	// Couldn't find the method.
-		List p = m.getParameters();
-		return p;
-	}
-			
-			
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (parmsExplicitEmpty: ");
-		result.append((eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0);
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors()
-	 */
-	public EList getParameterDescriptors() {
-		if (!isParmsExplicitEmpty() && getSerParmDesc().isEmpty() && (getImplicitlySetBits()&(METHOD_PARAMETERS_IMPLICIT | METHOD_PARAMETERS_DEFAULT)) == 0) {
-			// Not explicitly empty, it is empty, and we have not implicitly or by defaults made it empty, then create the defaults.
-			createDefaultParmsList();
-		}
-		return getSerParmDesc();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getParameterDescriptorsGen() {
-		// TODO: implement this method to return the 'Parameter Descriptors' reference list
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSerParmDesc() {
-		if (serParmDesc == null) {
-			serParmDesc = new EObjectContainmentEList(ParameterDecorator.class, this, BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC);
-		}
-		return serParmDesc;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-					return ((InternalEList)getSerParmDesc()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				return isParmsExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				return getParameterDescriptors();
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				return getSerParmDesc();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				setParmsExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				getParameterDescriptors().clear();
-				getParameterDescriptors().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				getSerParmDesc().clear();
-				getSerParmDesc().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				setParmsExplicitEmpty(PARMS_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				getParameterDescriptors().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				getSerParmDesc().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/*
-	 * This is overridden so that we can do special is set tests:
-	 * 1) parameter descriptors: check if serParmDesc exists and not empty, since parameter descriptors is derived.
-	 * 2) serParmDesc: if flag set to default parm desc, then answer not set, else do normal isSet test. That way if set by default it won't serialize
-	 *    out the unneeded default parms. They can be reconstructed quickly when needed.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-					return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				return eIsSetGen(BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc());	// Let default serParmDesc is set work.
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				if ((getImplicitlySetBits() & METHOD_PARAMETERS_DEFAULT) != 0)
-					return false;	// Not considered set if initialized by default.
-				else
-					return eIsSetGen(eFeature);	// Not set by default, so check true setting.
-			default:
-				return eIsSetGen(eFeature);	// Everything else use the gen method.
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				return ((eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0) != PARMS_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				return !getParameterDescriptors().isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				return serParmDesc != null && !serParmDesc.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java
deleted file mode 100644
index 192994a3c..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java
+++ /dev/null
@@ -1,166 +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.impl;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EOperationImpl;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-import org.eclipse.jem.java.Method;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Proxy</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl#getMethod <em>Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class MethodProxyImpl extends EOperationImpl implements MethodProxy {
-	/**
-	 * The cached value of the '{@link #getMethod() <em>Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method method = null;
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected MethodProxyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.Literals.METHOD_PROXY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getMethod() {
-		if (method != null && method.eIsProxy()) {
-			InternalEObject oldMethod = (InternalEObject)method;
-			method = (Method)eResolveProxy(oldMethod);
-			if (method != oldMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.METHOD_PROXY__METHOD, oldMethod, method));
-			}
-		}
-		return method;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetMethod() {
-		return method;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethod(Method newMethod) {
-		Method oldMethod = method;
-		method = newMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.METHOD_PROXY__METHOD, oldMethod, method));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				if (resolve) return getMethod();
-				return basicGetMethod();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				setMethod((Method)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				setMethod((Method)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				return method != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java
deleted file mode 100644
index 10b21040c..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java
+++ /dev/null
@@ -1,522 +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.impl;
-
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.ParameterDecorator;
-import org.eclipse.jem.java.JavaParameter;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl#getParameter <em>Parameter</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-public class ParameterDecoratorImpl extends FeatureDecoratorImpl implements ParameterDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long PARAMETER_NAME_IMPLICIT = 0x1L;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ParameterDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getParameterDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getParameter() <em>Parameter</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParameter()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaParameter parameter = null;
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PARAMETER_DECORATOR__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 * Flag for if we tried to link up this parameter to java parm.
-	 */
-	private boolean triedOnce;
-	
-	/**
-	 * The JavaParameter that this ParameterDecorator is decorating.
-	 */
-	public JavaParameter getParameter() {
-		if (!eIsSet(BeaninfoPackage.eINSTANCE.getParameterDecorator_Parameter()) && !triedOnce) {
-			// Need to try to fill in the parameter setting.
-			triedOnce = true;
-			EObject container = eContainer();	// See if we are in a MethodDecorator.
-			if (container instanceof MethodDecoratorImpl)
-				((MethodDecoratorImpl) container).initializeParameters();
-		}
-		
-		return getParameterGen();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaParameter getParameterGen() {
-		if (parameter != null && parameter.eIsProxy()) {
-			JavaParameter oldParameter = parameter;
-			parameter = (JavaParameter)eResolveProxy((InternalEObject)parameter);
-			if (parameter != oldParameter) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER, oldParameter, parameter));
-			}
-		}
-		return parameter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaParameter basicGetParameter() {
-		return parameter;
-	}
-
-	public void setParameter(JavaParameter newParameter) {
-		if (newParameter == null)
-			triedOnce = false;
-		setParameterGen(newParameter);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParameterGen(JavaParameter newParameter) {
-		JavaParameter oldParameter = parameter;
-		parameter = newParameter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER, oldParameter, parameter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				return getName();
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				if (resolve) return getParameter();
-				return basicGetParameter();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				setName((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				setParameter((JavaParameter)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				setParameter((JavaParameter)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				return parameter != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java
deleted file mode 100644
index 19101b683..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java
+++ /dev/null
@@ -1,1177 +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.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.PropertyDecorator;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isBound <em>Bound</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isConstrained <em>Constrained</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isDesignTime <em>Design Time</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isAlwaysIncompatible <em>Always Incompatible</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getFilterFlags <em>Filter Flags</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isFieldReadOnly <em>Field Read Only</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getPropertyEditorClass <em>Property Editor Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getReadMethod <em>Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getWriteMethod <em>Write Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class PropertyDecoratorImpl extends FeatureDecoratorImpl implements PropertyDecorator{
-
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long PROPERTY_EDITOR_CLASS_IMPLICIT = 0x1L;
-	public static final long PROPERTY_TYPE_IMPLICIT = 0x2L;
-	public static final long PROPERTY_READMETHOD_IMPLICIT = 0x4L;
-	public static final long PROPERTY_WRITEMETHOD_IMPLICIT = 0x8L;
-	public static final long PROPERTY_BOUND_IMPLICIT = 0x10L;
-	public static final long PROPERTY_CONSTRAINED_IMPLICIT = 0x20L;
-	public static final long PROPERTY_DESIGNTIME_IMPLICIT = 0x40L;
-	public static final long PROPERTY_FIELD_IMPLICIT = 0x80L;
-	
-	
-	/**
-	 * The default value of the '{@link #isBound() <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isBound()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean BOUND_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isBound() <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isBound()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int BOUND_EFLAG = 1 << 18;
-
-	/**
-	 * The flag representing whether the Bound attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int BOUND_ESETFLAG = 1 << 19;
-
-	/**
-	 * The default value of the '{@link #isConstrained() <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isConstrained()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CONSTRAINED_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isConstrained() <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isConstrained()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int CONSTRAINED_EFLAG = 1 << 20;
-
-	/**
-	 * The flag representing whether the Constrained attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int CONSTRAINED_ESETFLAG = 1 << 21;
-
-	/**
-	 * The default value of the '{@link #isDesignTime() <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDesignTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DESIGN_TIME_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isDesignTime() <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDesignTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int DESIGN_TIME_EFLAG = 1 << 22;
-
-	/**
-	 * The flag representing whether the Design Time attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int DESIGN_TIME_ESETFLAG = 1 << 23;
-
-	/**
-	 * The default value of the '{@link #isAlwaysIncompatible() <em>Always Incompatible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAlwaysIncompatible()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ALWAYS_INCOMPATIBLE_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isAlwaysIncompatible() <em>Always Incompatible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAlwaysIncompatible()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ALWAYS_INCOMPATIBLE_EFLAG = 1 << 24;
-
-	/**
-	 * The cached value of the '{@link #getFilterFlags() <em>Filter Flags</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFilterFlags()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList filterFlags = null;
-	/**
-	 * The default value of the '{@link #isFieldReadOnly() <em>Field Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFieldReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FIELD_READ_ONLY_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isFieldReadOnly() <em>Field Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFieldReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int FIELD_READ_ONLY_EFLAG = 1 << 25;
-
-	/**
-	 * The cached value of the '{@link #getPropertyEditorClass() <em>Property Editor Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPropertyEditorClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass propertyEditorClass = null;
-	/**
-	 * The cached value of the '{@link #getReadMethod() <em>Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReadMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method readMethod = null;
-	/**
-	 * The flag representing whether the Read Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int READ_METHOD_ESETFLAG = 1 << 26;
-
-	/**
-	 * The cached value of the '{@link #getWriteMethod() <em>Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWriteMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method writeMethod = null;
-	
-	/**
-	 * The flag representing whether the Write Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int WRITE_METHOD_ESETFLAG = 1 << 27;
-
-	/**
-	 * The cached value of the '{@link #getField() <em>Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getField()
-	 * @generated
-	 * @ordered
-	 */
-	protected Field field = null;
-
-	/**
-	 * The flag representing whether the Field reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int FIELD_ESETFLAG = 1 << 28;
-
-	/**
-	 * This it the property type. If null, then it will
-	 * query against model element owner.
-	 * 
-	 * @since 1.2.0
-	 */
-	protected EClassifier propertyType;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected PropertyDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getPropertyDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isBound() {
-		return (eFlags & BOUND_EFLAG) != 0;
-	}
-
-	public EClassifier getPropertyType() {
-		if (propertyType == null) {
-			EStructuralFeature feature = (EStructuralFeature) getEModelElement();
-			return (feature != null) ? feature.getEType() : null;
-		} else
-			return propertyType;
-	}
-
-	public void setPropertyType(EClassifier propertyType) {
-		this.propertyType = propertyType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBound(boolean newBound) {
-		boolean oldBound = (eFlags & BOUND_EFLAG) != 0;
-		if (newBound) eFlags |= BOUND_EFLAG; else eFlags &= ~BOUND_EFLAG;
-		boolean oldBoundESet = (eFlags & BOUND_ESETFLAG) != 0;
-		eFlags |= BOUND_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__BOUND, oldBound, newBound, !oldBoundESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBound() {
-		boolean oldBound = (eFlags & BOUND_EFLAG) != 0;
-		boolean oldBoundESet = (eFlags & BOUND_ESETFLAG) != 0;
-		if (BOUND_EDEFAULT) eFlags |= BOUND_EFLAG; else eFlags &= ~BOUND_EFLAG;
-		eFlags &= ~BOUND_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__BOUND, oldBound, BOUND_EDEFAULT, oldBoundESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBound() {
-		return (eFlags & BOUND_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isConstrained() {
-		return (eFlags & CONSTRAINED_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConstrained(boolean newConstrained) {
-		boolean oldConstrained = (eFlags & CONSTRAINED_EFLAG) != 0;
-		if (newConstrained) eFlags |= CONSTRAINED_EFLAG; else eFlags &= ~CONSTRAINED_EFLAG;
-		boolean oldConstrainedESet = (eFlags & CONSTRAINED_ESETFLAG) != 0;
-		eFlags |= CONSTRAINED_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED, oldConstrained, newConstrained, !oldConstrainedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetConstrained() {
-		boolean oldConstrained = (eFlags & CONSTRAINED_EFLAG) != 0;
-		boolean oldConstrainedESet = (eFlags & CONSTRAINED_ESETFLAG) != 0;
-		if (CONSTRAINED_EDEFAULT) eFlags |= CONSTRAINED_EFLAG; else eFlags &= ~CONSTRAINED_EFLAG;
-		eFlags &= ~CONSTRAINED_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED, oldConstrained, CONSTRAINED_EDEFAULT, oldConstrainedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetConstrained() {
-		return (eFlags & CONSTRAINED_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDesignTime() {
-		return (eFlags & DESIGN_TIME_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDesignTime(boolean newDesignTime) {
-		boolean oldDesignTime = (eFlags & DESIGN_TIME_EFLAG) != 0;
-		if (newDesignTime) eFlags |= DESIGN_TIME_EFLAG; else eFlags &= ~DESIGN_TIME_EFLAG;
-		boolean oldDesignTimeESet = (eFlags & DESIGN_TIME_ESETFLAG) != 0;
-		eFlags |= DESIGN_TIME_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME, oldDesignTime, newDesignTime, !oldDesignTimeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDesignTime() {
-		boolean oldDesignTime = (eFlags & DESIGN_TIME_EFLAG) != 0;
-		boolean oldDesignTimeESet = (eFlags & DESIGN_TIME_ESETFLAG) != 0;
-		if (DESIGN_TIME_EDEFAULT) eFlags |= DESIGN_TIME_EFLAG; else eFlags &= ~DESIGN_TIME_EFLAG;
-		eFlags &= ~DESIGN_TIME_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME, oldDesignTime, DESIGN_TIME_EDEFAULT, oldDesignTimeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDesignTime() {
-		return (eFlags & DESIGN_TIME_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isAlwaysIncompatible() {
-		return (eFlags & ALWAYS_INCOMPATIBLE_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAlwaysIncompatible(boolean newAlwaysIncompatible) {
-		boolean oldAlwaysIncompatible = (eFlags & ALWAYS_INCOMPATIBLE_EFLAG) != 0;
-		if (newAlwaysIncompatible) eFlags |= ALWAYS_INCOMPATIBLE_EFLAG; else eFlags &= ~ALWAYS_INCOMPATIBLE_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE, oldAlwaysIncompatible, newAlwaysIncompatible));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getFilterFlags() {
-		if (filterFlags == null) {
-			filterFlags = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS);
-		}
-		return filterFlags;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFieldReadOnly() {
-		return (eFlags & FIELD_READ_ONLY_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldReadOnly(boolean newFieldReadOnly) {
-		boolean oldFieldReadOnly = (eFlags & FIELD_READ_ONLY_EFLAG) != 0;
-		if (newFieldReadOnly) eFlags |= FIELD_READ_ONLY_EFLAG; else eFlags &= ~FIELD_READ_ONLY_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY, oldFieldReadOnly, newFieldReadOnly));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getPropertyEditorClass() {
-		if (propertyEditorClass != null && propertyEditorClass.eIsProxy()) {
-			JavaClass oldPropertyEditorClass = propertyEditorClass;
-			propertyEditorClass = (JavaClass)eResolveProxy((InternalEObject)propertyEditorClass);
-			if (propertyEditorClass != oldPropertyEditorClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS, oldPropertyEditorClass, propertyEditorClass));
-			}
-		}
-		return propertyEditorClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPropertyEditorClass(JavaClass newPropertyEditorClass) {
-		JavaClass oldPropertyEditorClass = propertyEditorClass;
-		propertyEditorClass = newPropertyEditorClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS, oldPropertyEditorClass, propertyEditorClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getReadMethod() {
-		if (readMethod != null && readMethod.eIsProxy()) {
-			Method oldReadMethod = readMethod;
-			readMethod = (Method)eResolveProxy((InternalEObject)readMethod);
-			if (readMethod != oldReadMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD, oldReadMethod, readMethod));
-			}
-		}
-		return readMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReadMethod(Method newReadMethod) {
-		Method oldReadMethod = readMethod;
-		readMethod = newReadMethod;
-		boolean oldReadMethodESet = (eFlags & READ_METHOD_ESETFLAG) != 0;
-		eFlags |= READ_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD, oldReadMethod, readMethod, !oldReadMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetReadMethod() {
-		Method oldReadMethod = readMethod;
-		boolean oldReadMethodESet = (eFlags & READ_METHOD_ESETFLAG) != 0;
-		readMethod = null;
-		eFlags &= ~READ_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD, oldReadMethod, null, oldReadMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetReadMethod() {
-		return (eFlags & READ_METHOD_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getWriteMethod() {
-		if (writeMethod != null && writeMethod.eIsProxy()) {
-			Method oldWriteMethod = writeMethod;
-			writeMethod = (Method)eResolveProxy((InternalEObject)writeMethod);
-			if (writeMethod != oldWriteMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD, oldWriteMethod, writeMethod));
-			}
-		}
-		return writeMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWriteMethod(Method newWriteMethod) {
-		Method oldWriteMethod = writeMethod;
-		writeMethod = newWriteMethod;
-		boolean oldWriteMethodESet = (eFlags & WRITE_METHOD_ESETFLAG) != 0;
-		eFlags |= WRITE_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD, oldWriteMethod, writeMethod, !oldWriteMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetWriteMethod() {
-		Method oldWriteMethod = writeMethod;
-		boolean oldWriteMethodESet = (eFlags & WRITE_METHOD_ESETFLAG) != 0;
-		writeMethod = null;
-		eFlags &= ~WRITE_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD, oldWriteMethod, null, oldWriteMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetWriteMethod() {
-		return (eFlags & WRITE_METHOD_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Field getField() {
-		if (field != null && field.eIsProxy()) {
-			Field oldField = field;
-			field = (Field)eResolveProxy((InternalEObject)field);
-			if (field != oldField) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__FIELD, oldField, field));
-			}
-		}
-		return field;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Field basicGetField() {
-		return field;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setField(Field newField) {
-		Field oldField = field;
-		field = newField;
-		boolean oldFieldESet = (eFlags & FIELD_ESETFLAG) != 0;
-		eFlags |= FIELD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__FIELD, oldField, field, !oldFieldESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetField() {
-		Field oldField = field;
-		boolean oldFieldESet = (eFlags & FIELD_ESETFLAG) != 0;
-		field = null;
-		eFlags &= ~FIELD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__FIELD, oldField, null, oldFieldESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetField() {
-		return (eFlags & FIELD_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (bound: ");
-		if ((eFlags & BOUND_ESETFLAG) != 0) result.append((eFlags & BOUND_EFLAG) != 0); else result.append("<unset>");
-		result.append(", constrained: ");
-		if ((eFlags & CONSTRAINED_ESETFLAG) != 0) result.append((eFlags & CONSTRAINED_EFLAG) != 0); else result.append("<unset>");
-		result.append(", designTime: ");
-		if ((eFlags & DESIGN_TIME_ESETFLAG) != 0) result.append((eFlags & DESIGN_TIME_EFLAG) != 0); else result.append("<unset>");
-		result.append(", alwaysIncompatible: ");
-		result.append((eFlags & ALWAYS_INCOMPATIBLE_EFLAG) != 0);
-		result.append(", filterFlags: ");
-		result.append(filterFlags);
-		result.append(", fieldReadOnly: ");
-		result.append((eFlags & FIELD_READ_ONLY_EFLAG) != 0);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetPropertyEditorClass() {
-		return propertyEditorClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetReadMethod() {
-		return readMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetWriteMethod() {
-		return writeMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
-				return isBound() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
-				return isConstrained() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
-				return isDesignTime() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				return isAlwaysIncompatible() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
-				return getFilterFlags();
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				return isFieldReadOnly() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				if (resolve) return getPropertyEditorClass();
-				return basicGetPropertyEditorClass();
-			case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
-				if (resolve) return getReadMethod();
-				return basicGetReadMethod();
-			case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
-				if (resolve) return getWriteMethod();
-				return basicGetWriteMethod();
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
-				if (resolve) return getField();
-				return basicGetField();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
-				setBound(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
-				setConstrained(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
-				setDesignTime(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				setAlwaysIncompatible(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
-				getFilterFlags().clear();
-				getFilterFlags().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				setFieldReadOnly(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				setPropertyEditorClass((JavaClass)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
-				setReadMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
-				setWriteMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
-				setField((Field)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
-				unsetBound();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
-				unsetConstrained();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
-				unsetDesignTime();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				setAlwaysIncompatible(ALWAYS_INCOMPATIBLE_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
-				getFilterFlags().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				setFieldReadOnly(FIELD_READ_ONLY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				setPropertyEditorClass((JavaClass)null);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
-				unsetReadMethod();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
-				unsetWriteMethod();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
-				unsetField();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
-				return isSetBound();
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
-				return isSetConstrained();
-			case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
-				return isSetDesignTime();
-			case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				return ((eFlags & ALWAYS_INCOMPATIBLE_EFLAG) != 0) != ALWAYS_INCOMPATIBLE_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
-				return filterFlags != null && !filterFlags.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				return ((eFlags & FIELD_READ_ONLY_EFLAG) != 0) != FIELD_READ_ONLY_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				return propertyEditorClass != null;
-			case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
-				return isSetReadMethod();
-			case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
-				return isSetWriteMethod();
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
-				return isSetField();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isWriteable()
-	 */
-	public boolean isWriteable() {
-		return getWriteMethod() != null || (getField() != null && !isFieldReadOnly()); 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isReadable()
-	 */
-	public boolean isReadable() {
-		return getReadMethod() != null || getField() != null;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
deleted file mode 100644
index 3b63c764f..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
+++ /dev/null
@@ -1,155 +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.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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
deleted file mode 100644
index 724b0d811..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
deleted file mode 100644
index b235382cc..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
deleted file mode 100644
index 860b55f96..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
+++ /dev/null
@@ -1,785 +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.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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
deleted file mode 100644
index 9d392fca3..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
deleted file mode 100644
index e067449fa..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
+++ /dev/null
@@ -1,129 +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.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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
deleted file mode 100644
index 88d291615..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.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.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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
deleted file mode 100644
index 7e731ceba..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
deleted file mode 100644
index 4b37be9ed..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
deleted file mode 100644
index 5b2f370bb..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.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.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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
deleted file mode 100644
index 3e032412d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
deleted file mode 100644
index 98298394a..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.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/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
deleted file mode 100644
index 9f112910d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.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.beaninfo/build.properties b/plugins/org.eclipse.jem.beaninfo/build.properties
deleted file mode 100644
index 9aeb843e2..000000000
--- a/plugins/org.eclipse.jem.beaninfo/build.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-src.excludes = **/.cvsignore
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               .options,\
-               META-INF/,\
-               vm/beaninfovm.jar,\
-               .
-jars.compile.order = .,\
-                     vm/beaninfovm.jar
-src.includes = about.html,\
-               model/,\
-               rose/,\
-               proxy.jars,\
-               schema/
-source.. = beaninfoCommon/,beaninfo/
-source.vm/beaninfovm.jar = vm_beaninfovm/
-output.vm/beaninfovm.jar = bin_vm_beaninfovm/
-output.. = bin/
-
diff --git a/plugins/org.eclipse.jem.beaninfo/model/beaninfo.ecore b/plugins/org.eclipse.jem.beaninfo/model/beaninfo.ecore
deleted file mode 100644
index cc925768c..000000000
--- a/plugins/org.eclipse.jem.beaninfo/model/beaninfo.ecore
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="beaninfo"
-    nsURI="http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore" nsPrefix="org.eclipse.jem.internal.beaninfo.beaninfo">
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureDecorator" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EAnnotation">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to FeatureDescriptor in java.&#xD;&#xA;&lt;p>&#xD;&#xA;Note: If any attribute is explicitly set then the BeanInfo/Reflection will not be merged into the decorator. This provides a way of overriding the BeanInfos. Also for any many-valued attribute, if it is desired to have it explicitly empty and not have BeanInfo fill it in, there will be another attribute named of the form &quot;attibutueExplicitEmpty&quot; If this is true then the BeanInfo will not merge in and will leave it empty.&#xD;&#xA;&lt;p>&#xD;&#xA;These comments about merging apply to all subclasses of this decorator too. "/>
-    </eAnnotations>
-    <eOperations name="getName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="shortDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="expert" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hidden" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preferred" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeIntrospection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Should the introspection results be merged into this decorator. If this is set to false, then the introspection results are ignored for this particular decorator. This is an internal feature simply to allow desired override capabilities. Customers would use it to prevent ANY introspection/reflection from occurring."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributesExplicitEmpty"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The attributes are explicitly set as empty and not retrieved from the beaninfo/reflection. Customers should set this if they want the list of attributes to be empty and not merged with the BeanInfo results. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="implicitlySetBits" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A bitflag for which attributes have been set by BeanInfo/Reflection.&#xD;&#xA;&lt;p>&#xD;&#xA;This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="implicitDecoratorFlag"
-        eType="#//ImplicitItem">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Is this decorator/feature implicit. This means created by Introspection/Reflection and not by customer.&#xD;&#xA;&lt;p>&#xD;&#xA;This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
-        eType="#//FeatureAttributeMapEntry" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Feature attributes. Key/value pairs. If it is desired that the feature attributes is explicitly empty and not have BeanInfo/reflection set it, set attributesExplicitEmpty to true."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BeanDecorator" eSuperTypes="#//FeatureDecorator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to BeanDecorator in java."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeSuperProperties" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Should the properties of super types be merged when asking for eAllAttributes/eAllReferences."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeSuperMethods" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Should the methods of super types be merged when asking for eAllBehaviors."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeSuperEvents" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Should the events of super types be merged when asking for eAllEvents."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="introspectProperties" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Should the properties from the introspection be added to the class. This allows properties to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="introspectMethods" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Should the methods from the introspection be added to the class. This allows methods to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="introspectEvents" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Should the events from the introspection be added to the class. This allows events to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="doBeaninfo" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This means do we go and get the beaninfo from the remote vm. If false, then it will not try to get the beaninfo. This doesn't prevent introspection through reflection. That is controled by the separate introspect... attributes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notInheritedPropertyNames"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the list of inherited property names to not use in getAllProperties(). These names are properties that should not be inherited and should not show through. If the inherited property is not on the list then it will show in getAllProperties().&#xD;&#xA;&lt;p>&#xD;&#xA;This list will be empty if all properties are inherited or if the mergeSuperProperties flag is false.&#xD;&#xA;&lt;p>&#xD;&#xA;Note: This attribute is not meant to be changed by clients. It is an internal attribute."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notInheritedMethodNames"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the list of inherited method names to not use in eAllOperations(). These names are operations that should not be inherited and should not show through. If the inherited operation is not on the list then it will show in getAllOperations().&#xD;&#xA;&lt;p>&#xD;&#xA;This list will be empty if all operations are inherited or if the mergeSuperBehaviors flag is false."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notInheritedEventNames"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the list of inherited event names to not use in getAllEvents(). These names are events that should not be inherited and should not show through. If the inherited event is not on the list then it will show in getAllEvents().&#xD;&#xA;&lt;p>&#xD;&#xA;This list will be empty if all events are inherited or if the mergeSuperEvents flag is false."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="customizerClass" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EventSetDecorator" eSuperTypes="#//FeatureDecorator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to EventSetDecorator in java."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inDefaultEventSet" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unicast" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="listenerMethodsExplicitEmpty"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Set true if the listenerMethods feature is explicitly set as empty and is not to have listener methods merged in from BeanInfo or reflection."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="addListenerMethod" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="listenerMethods" lowerBound="1"
-        upperBound="-1" eType="#//MethodProxy" volatile="true" transient="true" derived="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="listener methods. If it is desired that the list be explicitly empty and not have BeanInfo set it, then set listenerMethodsExplicitEmpty to true.&#xD;&#xA;&lt;p>&#xD;&#xA;ListenerMethods will be decorated with MethodDecorators.&#xD;&#xA;&lt;p>&#xD;&#xA;Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on &quot;serListMthd&quot; notifications instead."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="listenerType" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="removeListenerMethod" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eventAdapterClass" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="For some listener interfaces an adapter class is provided that implements default no-op methods, e.g. java.awt.event.FocusEvent which has java.awt.event.FocusAdapter. The Adapter class is provided in a key/value pair on the java.beans.EventSetDescriptor with a key defined in a static final constants EVENTADAPTERCLASS = &quot;eventAdapterClass&quot;."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serListMthd" lowerBound="1"
-        upperBound="-1" eType="#//MethodProxy" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is a private feature. It is used internally only. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodDecorator" eSuperTypes="#//FeatureDecorator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to MethodDecorator in java."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parmsExplicitEmpty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Set true if the parms feature is explicitly set as empty and is not to have parameters merged in from BeanInfo or reflection."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameterDescriptors" upperBound="-1"
-        eType="#//ParameterDecorator" volatile="true" transient="true" derived="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the parameter descriptors list.&#xD;&#xA;&lt;p>&#xD;&#xA;Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on &quot;serParmDesc&quot; notifications instead."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serParmDesc" upperBound="-1"
-        eType="#//ParameterDecorator" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is a private feature. It is used internally only. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ParameterDecorator" eSuperTypes="#//FeatureDecorator">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name is explicit here because unlike the other feature decorators, the name does not come from the object being decorated."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaParameter"
-        transient="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The JavaParameter that this ParameterDecorator is decorating. Can't use eDecorates in this."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PropertyDecorator" eSuperTypes="#//FeatureDecorator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to PropertyDecorator in java."/>
-    </eAnnotations>
-    <eOperations name="getPropertyType" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClassifier">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Get the property type."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="setPropertyType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Set the property type."/>
-      </eAnnotations>
-      <eParameters name="propertyType" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClassifier"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bound" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="constrained" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="designTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If not set, then normal default processing.&#xD;&#xA;&#xD;&#xA;If set true, then this property is a design time property. This means it will show up in the property sheet, but it won't be able to be connected to at runtime. It may not even be a true bean property but instead the builder will know how to handle it.&#xD;&#xA;&#xD;&#xA;If set false, then this property will not show up on the property sheet, but will be able to be connected to for runtime."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alwaysIncompatible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If set true, then when multiple objects are selected, this property is always incompatible with each other. So in this case the property will not show up on the property sheet if more than one object has been selected."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filterFlags" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldReadOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Is this field read-only (i.e. is a &quot;final&quot; field). This is only referenced if the field reference is set."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="propertyEditorClass" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="readMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="writeMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Field"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If this is set, then this property is a field and not a getter/setter property. This is an extension that the Visual Editor uses to the BeanInfo model."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IndexedPropertyDecorator" eSuperTypes="#//PropertyDecorator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to IndexedPropertyDecorator"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="indexedReadMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="indexedWriteMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
-        unsettable="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodProxy" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EOperation">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This is just a wrapper of a java Method. It allows access to the method but doesn't duplicate the interface for it.&#xD;&#xA;&lt;p>&#xD;&#xA;MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.&#xD;&#xA;&lt;p>&#xD;&#xA;MethodProxies would also have MethodDecorators."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="method" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BeanEvent" eSuperTypes="../../org.eclipse.jem/model/java.ecore#//JavaEvent">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Event from Introspection/Reflection.&#xD;&#xA;&lt;p>&#xD;&#xA;The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureAttributeMapEntry" instanceClassName="java.util.Map$Entry">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//FeatureAttributeValue"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="FeatureAttributeValue" instanceClassName="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This is the attribute value for feature attribute. It can only represent the following:&#xD;&#xA;&#xD;&#xA;- String&#xD;&#xA;- primitives&#xD;&#xA;- array (type Object) containing mixture of Strings and primitives (as the object types)&#xD;&#xA;- array (type String)&#xD;&#xA;- array (type primitive)&#xD;&#xA;&#xD;&#xA;Anything else cannot be represented."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ImplicitItem">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This enum is an internal enum. It is used by BeanInfo for cache maintenance.&#xD;&#xA;&lt;p>&#xD;&#xA;This enum is not meant to be used by clients."/>
-    </eAnnotations>
-    <eLiterals name="NOT_IMPLICIT">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Means this decorator is not implicit. That is it was created by customer."/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="IMPLICIT_DECORATOR" value="1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This means that the decorator is implicit. That is it was not created by the customer."/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="IMPLICIT_DECORATOR_AND_FEATURE" value="2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This means the decorator and the feature where implicit. That is they were not created by the customer."/>
-      </eAnnotations>
-    </eLiterals>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jem.beaninfo/model/introspect.genmodel b/plugins/org.eclipse.jem.beaninfo/model/introspect.genmodel
deleted file mode 100644
index 52616c491..000000000
--- a/plugins/org.eclipse.jem.beaninfo/model/introspect.genmodel
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jem.beaninfo/beaninfo"
-    editDirectory="/org.eclipse.jem.beaninfo.edit/src" editorDirectory="/org.eclipse.jem.beaninfo.editor/src"
-    modelPluginID="" modelName="Beaninfo" editPluginClass="org.eclipse.jem.internal.beaninfo.provider.BeaninfoEditPlugin"
-    editorPluginClass="org.eclipse.jem.internal.beaninfo.presentation.BeaninfoEditorPlugin"
-    updateClasspath="false" booleanFlagsField="eFlags" booleanFlagsReservedBits="8"
-    importerID="org.eclipse.emf.importer.rose" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.jem/model/javaModel.genmodel#//java">
-  <foreignModel>..\rose\introspect.mdl</foreignModel>
-  <foreignModel>WorkspaceRoot</foreignModel>
-  <foreignModel>../..</foreignModel>
-  <genPackages prefix="Beaninfo" basePackage="org.eclipse.jem.internal" adapterFactory="false"
-      ecorePackage="beaninfo.ecore#/">
-    <genEnums ecoreEnum="beaninfo.ecore#//ImplicitItem">
-      <genEnumLiterals ecoreEnumLiteral="beaninfo.ecore#//ImplicitItem/NOT_IMPLICIT"/>
-      <genEnumLiterals ecoreEnumLiteral="beaninfo.ecore#//ImplicitItem/IMPLICIT_DECORATOR"/>
-      <genEnumLiterals ecoreEnumLiteral="beaninfo.ecore#//ImplicitItem/IMPLICIT_DECORATOR_AND_FEATURE"/>
-    </genEnums>
-    <genDataTypes ecoreDataType="beaninfo.ecore#//FeatureAttributeValue"/>
-    <genClasses ecoreClass="beaninfo.ecore#//FeatureDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/displayName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/shortDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/category"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/expert"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/hidden"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/preferred"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/mergeIntrospection"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/attributesExplicitEmpty"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/implicitlySetBits"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/implicitDecoratorFlag"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//FeatureDecorator/attributes"/>
-      <genOperations ecoreOperation="beaninfo.ecore#//FeatureDecorator/getName"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//BeanDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/mergeSuperProperties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/mergeSuperMethods"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/mergeSuperEvents"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/introspectProperties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/introspectMethods"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/introspectEvents"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/doBeaninfo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/notInheritedPropertyNames"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/notInheritedMethodNames"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/notInheritedEventNames"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//BeanDecorator/customizerClass"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//EventSetDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//EventSetDecorator/inDefaultEventSet"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//EventSetDecorator/unicast"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//EventSetDecorator/listenerMethodsExplicitEmpty"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/addListenerMethod"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/listenerMethods"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/listenerType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/removeListenerMethod"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/eventAdapterClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/serListMthd"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//MethodDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//MethodDecorator/parmsExplicitEmpty"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//MethodDecorator/parameterDescriptors"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//MethodDecorator/serParmDesc"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//ParameterDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//ParameterDecorator/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//ParameterDecorator/parameter"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//PropertyDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/bound"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/constrained"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/designTime"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/alwaysIncompatible"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/filterFlags"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/fieldReadOnly"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/propertyEditorClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/readMethod"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/writeMethod"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/field"/>
-      <genOperations ecoreOperation="beaninfo.ecore#//PropertyDecorator/getPropertyType"/>
-      <genOperations ecoreOperation="beaninfo.ecore#//PropertyDecorator/setPropertyType">
-        <genParameters ecoreParameter="beaninfo.ecore#//PropertyDecorator/setPropertyType/propertyType"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//IndexedPropertyDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//IndexedPropertyDecorator/indexedReadMethod"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//IndexedPropertyDecorator/indexedWriteMethod"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//MethodProxy">
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//MethodProxy/method"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//BeanEvent"/>
-    <genClasses ecoreClass="beaninfo.ecore#//FeatureAttributeMapEntry">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureAttributeMapEntry/key"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureAttributeMapEntry/value"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jem.beaninfo/plugin.properties b/plugins/org.eclipse.jem.beaninfo/plugin.properties
deleted file mode 100644
index f7f55ad18..000000000
--- a/plugins/org.eclipse.jem.beaninfo/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo/plugin.properties,v $
-# $Revision: 1.7 $  $Date: 2005/08/24 20:31:29 $
-#
-
-
-pluginName=Java EMF Model BeanInfo (Introspection) Support
-providerName = Eclipse.org
-beaninfoNatureName=Java Model BeanInfo Nature
-registrations.extensionpoint.name=BeanInfo extension registrations
diff --git a/plugins/org.eclipse.jem.beaninfo/plugin.xml b/plugins/org.eclipse.jem.beaninfo/plugin.xml
deleted file mode 100644
index a8f1f1d0c..000000000
--- a/plugins/org.eclipse.jem.beaninfo/plugin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension-point id="registrations" name="%registrations.extensionpoint.name" schema="schema/registrations.exsd"/>
-
-   <extension
-         id="BeanInfoNature"
-         name="%beaninfoNatureName"
-         point="org.eclipse.core.resources.natures">
-      <runtime>
-         <run
-               class="org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature">
-         </run>
-      </runtime>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore"
-            class="org.eclipse.jem.internal.beaninfo.BeaninfoPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.team.core.fileTypes">
-      <fileTypes
-            type="text"
-            extension="beaninfoConfig">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="override">
-      </fileTypes>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.beaninfo/proxy.jars b/plugins/org.eclipse.jem.beaninfo/proxy.jars
deleted file mode 100644
index 176820a6f..000000000
--- a/plugins/org.eclipse.jem.beaninfo/proxy.jars
+++ /dev/null
@@ -1,2 +0,0 @@
-vm/beaninfovm.jar=/org.eclipse.jem.beaninfo/bin_vm_beaninfovm/
-beaninfocommon.jar=/org.eclipse.jem.beaninfo/bin_beaninfocommon/
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/rose/.cvsignore b/plugins/org.eclipse.jem.beaninfo/rose/.cvsignore
deleted file mode 100644
index 1be3a373d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/rose/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.md~
-*.ca~
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/rose/beaninfo.cat b/plugins/org.eclipse.jem.beaninfo/rose/beaninfo.cat
deleted file mode 100644
index dd227ce40..000000000
--- a/plugins/org.eclipse.jem.beaninfo/rose/beaninfo.cat
+++ /dev/null
@@ -1,3301 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Class_Category "beaninfo"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"basePackage"
-	    value      	(value Text "org.eclipse.jem.internal.beaninfo")))
-    quid       	"3A799ABB0353"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "FeatureDecorator"
-	    quid       	"3A799B3E01E9"
-	    documentation 	
-|Equivalent to FeatureDescriptor in java.
-|<p>
-|Note: If any attribute is explicitly set then the BeanInfo/Reflection will not be merged into the decorator. This provides a way of overriding the BeanInfos. Also for any many-valued attribute, if it is desired to have it explicitly empty and not have BeanInfo fill it in, there will be another attribute named of the form "attibutueExplicitEmpty" If this is true then the BeanInfo will not merge in and will leave it empty.
-|<p>
-|These comments about merging apply to all subclasses of this decorator too. 
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3DFA185900DC"
-		    supplier   	"Logical View::ecore::EAnnotation"
-		    quidu      	"3D98A1C701AB"))
-	    operations 	(list Operations
-		(object Operation "getName"
-		    quid       	"3B867D0D0184"
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "displayName"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79CFCC0131"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "shortDescription"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79CFD501E8"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "category"
-		    attributes 	(list Attribute_Set)
-		    quid       	"3BA2797102DC"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "expert"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79CFE700FE"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "hidden"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79D0050328"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "preferred"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79D0240318"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "mergeIntrospection"
-		    quid       	"3A82C0A60389"
-		    documentation 	"Should the introspection results be merged into this decorator. If this is set to false, then the introspection results are ignored for this particular decorator. This is an internal feature simply to allow desired override capabilities. Customers would use it to prevent ANY introspection/reflection from occurring."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "attributesExplicitEmpty"
-		    quid       	"3C9B49320265"
-		    documentation 	"The attributes are explicitly set as empty and not retrieved from the beaninfo/reflection. Customers should set this if they want the list of attributes to be empty and not merged with the BeanInfo results. "
-		    type       	"boolean"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "implicitlySetBits"
-		    quid       	"41E5815D02B9"
-		    documentation 	
-|A bitflag for which attributes have been set by BeanInfo/Reflection.
-|<p>
-|This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-		    
-		    type       	"long")
-		(object ClassAttribute "implicitDecoratorFlag"
-		    quid       	"41E5A05D021A"
-		    documentation 	
-|Is this decorator/feature implicit. This means created by Introspection/Reflection and not by customer.
-|<p>
-|This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-		    
-		    type       	"ImplicitItem"
-		    quidu      	"41E59E5D0296")))
-	(object Class "BeanDecorator"
-	    quid       	"3A79D0DF02D1"
-	    documentation 	"Equivalent to BeanDecorator in java."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DE8E007F"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "mergeSuperProperties"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A82B73E0200"
-		    documentation 	"Should the properties of super types be merged when asking for eAllAttributes/eAllReferences."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "mergeSuperMethods"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A82B9940015"
-		    documentation 	"Should the methods of super types be merged when asking for eAllBehaviors."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "mergeSuperEvents"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A82B99F0165"
-		    documentation 	"Should the events of super types be merged when asking for eAllEvents."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "introspectProperties"
-		    quid       	"3A8427EC00A6"
-		    documentation 	"Should the properties from the introspection be added to the class. This allows properties to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "introspectMethods"
-		    quid       	"3A84287501B1"
-		    documentation 	"Should the methods from the introspection be added to the class. This allows methods to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "introspectEvents"
-		    quid       	"3A842877000F"
-		    documentation 	"Should the events from the introspection be added to the class. This allows events to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "doBeaninfo"
-		    quid       	"3C9A46FC027C"
-		    documentation 	"This means do we go and get the beaninfo from the remote vm. If false, then it will not try to get the beaninfo. This doesn't prevent introspection through reflection. That is controled by the separate introspect... attributes."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "notInheritedPropertyNames"
-		    quid       	"41EED50B0185"
-		    documentation 	
-|This is the list of inherited property names to not use in getAllProperties(). These names are properties that should not be inherited and should not show through. If the inherited property is not on the list then it will show in getAllProperties().
-|<p>
-|This list will be empty if all properties are inherited or if the mergeSuperProperties flag is false.
-|<p>
-|Note: This attribute is not meant to be changed by clients. It is an internal attribute.
-		    
-		    stereotype 	"0..*"
-		    type       	"String")
-		(object ClassAttribute "notInheritedMethodNames"
-		    quid       	"41F02C5F0399"
-		    documentation 	
-|This is the list of inherited method names to not use in eAllOperations(). These names are operations that should not be inherited and should not show through. If the inherited operation is not on the list then it will show in getAllOperations().
-|<p>
-|This list will be empty if all operations are inherited or if the mergeSuperBehaviors flag is false.
-		    
-		    stereotype 	"0..*"
-		    type       	"String")
-		(object ClassAttribute "notInheritedEventNames"
-		    quid       	"41F02D0A0312"
-		    documentation 	
-|This is the list of inherited event names to not use in getAllEvents(). These names are events that should not be inherited and should not show through. If the inherited event is not on the list then it will show in getAllEvents().
-|<p>
-|This list will be empty if all events are inherited or if the mergeSuperEvents flag is false.
-		    
-		    stereotype 	"0..*"
-		    type       	"String")))
-	(object Class "EventSetDecorator"
-	    quid       	"3A79D1D2004F"
-	    documentation 	"Equivalent to EventSetDecorator in java."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DEA200EC"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "inDefaultEventSet"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79D94F004C"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "unicast"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79D9580167"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "listenerMethodsExplicitEmpty"
-		    quid       	"3CB1AF7D0286"
-		    documentation 	"Set true if the listenerMethods feature is explicitly set as empty and is not to have listener methods merged in from BeanInfo or reflection."
-		    type       	"boolean"
-		    exportControl 	"Implementation")))
-	(object Class "MethodDecorator"
-	    quid       	"3A79D35E0027"
-	    documentation 	"Equivalent to MethodDecorator in java."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DEA603E1"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "parmsExplicitEmpty"
-		    quid       	"3B86ABE80092"
-		    documentation 	"Set true if the parms feature is explicitly set as empty and is not to have parameters merged in from BeanInfo or reflection."
-		    type       	"boolean"
-		    exportControl 	"Implementation")))
-	(object Class "ParameterDecorator"
-	    quid       	"3A79D9C20304"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DEBB01C4"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3B86A6700099"
-		    documentation 	"The name is explicit here because unlike the other feature decorators, the name does not come from the object being decorated."
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "PropertyDecorator"
-	    quid       	"3A79DA68010E"
-	    documentation 	"Equivalent to PropertyDecorator in java."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DE9702BD"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"))
-	    operations 	(list Operations
-		(object Operation "getPropertyType"
-		    quid       	"3B8CF526039D"
-		    documentation 	"Get the property type."
-		    result     	"EClassifier"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3ACE4FEE0371")
-		(object Operation "setPropertyType"
-		    quid       	"4329D1CE030E"
-		    documentation 	"Set the property type."
-		    parameters 	(list Parameters
-			(object Parameter "propertyType"
-			    quid       	"4329D1E20168"
-			    type       	"EClassifier"
-			    quidu      	"3ACE4FEE0371"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "bound"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DC250303"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "constrained"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DC2C00A0"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "designTime"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3BA27455019B"
-		    documentation 	
-|If not set, then normal default processing.
-|
-|If set true, then this property is a design time property. This means it will show up in the property sheet, but it won't be able to be connected to at runtime. It may not even be a true bean property but instead the builder will know how to handle it.
-|
-|If set false, then this property will not show up on the property sheet, but will be able to be connected to for runtime.
-		    
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "alwaysIncompatible"
-		    quid       	"3BA27A1700BE"
-		    documentation 	"If set true, then when multiple objects are selected, this property is always incompatible with each other. So in this case the property will not show up on the property sheet if more than one object has been selected."
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "filterFlags"
-		    quid       	"3BA3B18F0036"
-		    stereotype 	"0..*"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "fieldReadOnly"
-		    quid       	"4207E101018E"
-		    documentation 	
-|Is this field read-only (i.e. is a "final" field). This is only referenced if the field reference is set.
-		    
-		    type       	"boolean"
-		    exportControl 	"Public")))
-	(object Class "IndexedPropertyDecorator"
-	    quid       	"3A79DC450309"
-	    documentation 	"Equivalent to IndexedPropertyDecorator"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DE840388"
-		    supplier   	"Logical View::beaninfo::PropertyDecorator"
-		    quidu      	"3A79DA68010E")))
-	(object Class "MethodProxy"
-	    quid       	"3A8984C901C3"
-	    documentation 	
-|This is just a wrapper of a java Method. It allows access to the method but doesn't duplicate the interface for it.
-|<p>
-|MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.
-|<p>
-|MethodProxies would also have MethodDecorators.
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3DFA19B600DE"
-		    supplier   	"Logical View::ecore::EOperation"
-		    quidu      	"3904DAA200A0")))
-	(object Class "BeanEvent"
-	    quid       	"3CB09CA90212"
-	    documentation 	
-|Event from Introspection/Reflection.
-|<p>
-|The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator.
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3CB09CB6038D"
-		    supplier   	"Logical View::java::JavaEvent"
-		    quidu      	"3C62FAF103C8")))
-	(object Class "FeatureAttributeMapEntry"
-	    quid       	"404CC85501F5"
-	    stereotype 	"MapEntry"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "key"
-		    quid       	"404CC8B70304"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "value"
-		    attributes 	(list Attribute_Set)
-		    quid       	"41E58414010A"
-		    type       	"FeatureAttributeValue"
-		    quidu      	"41E582F800BB"
-		    exportControl 	"Public")))
-	(object Class "FeatureAttributeValue"
-	    quid       	"41E582F800BB"
-	    documentation 	
-|This is the attribute value for feature attribute. It can only represent the following:
-|
-|- String
-|- primitives
-|- array (type Object) containing mixture of Strings and primitives (as the object types)
-|- array (type String)
-|- array (type primitive)
-|
-|Anything else cannot be represented.
-	    
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue"
-		    quid       	"41E583B503CA"
-		    stereotype 	"javaclass")))
-	(object Class "ImplicitItem"
-	    quid       	"41E59E5D0296"
-	    documentation 	
-|This enum is an internal enum. It is used by BeanInfo for cache maintenance.
-|<p>
-|This enum is not meant to be used by clients.
-	    
-	    stereotype 	"enumeration"
-	    exportControl 	"Protected"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "NOT_IMPLICIT"
-		    quid       	"41E59F2A00EC"
-		    documentation 	"Means this decorator is not implicit. That is it was created by customer.")
-		(object ClassAttribute "IMPLICIT_DECORATOR"
-		    quid       	"41E59F7200B4"
-		    documentation 	"This means that the decorator is implicit. That is it was not created by the customer.")
-		(object ClassAttribute "IMPLICIT_DECORATOR_AND_FEATURE"
-		    quid       	"41E59FA303B7"
-		    documentation 	"This means the decorator and the feature where implicit. That is they were not created by the customer.")))
-	(object Association "$UNNAMED$0"
-	    quid       	"3A79CF6C0378"
-	    roles      	(list role_list
-		(object Role "attributes"
-		    attributes 	(list Attribute_Set)
-		    quid       	"3A79CF6E00BE"
-		    documentation 	"Feature attributes. Key/value pairs. If it is desired that the feature attributes is explicitly empty and not have BeanInfo/reflection set it, set attributesExplicitEmpty to true."
-		    label      	"attributes"
-		    supplier   	"Logical View::beaninfo::FeatureAttributeMapEntry"
-		    quidu      	"404CC85501F5"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$1"
-		    quid       	"3A79CF6E00C8"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$2"
-	    quid       	"3A79D1350248"
-	    roles      	(list role_list
-		(object Role "customizerClass"
-		    attributes 	(list Attribute_Set)
-		    quid       	"3A79D13601D2"
-		    label      	"customizerClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$3"
-		    quid       	"3A79D13601E6"
-		    supplier   	"Logical View::beaninfo::BeanDecorator"
-		    quidu      	"3A79D0DF02D1")))
-	(object Association "$UNNAMED$4"
-	    quid       	"3A79D3080128"
-	    roles      	(list role_list
-		(object Role "addListenerMethod"
-		    quid       	"3A79D3090346"
-		    label      	"addListenerMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$5"
-		    quid       	"3A79D309035A"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F")))
-	(object Association "$UNNAMED$6"
-	    quid       	"3A79D3E10364"
-	    roles      	(list role_list
-		(object Role "listenerMethods"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE)
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isVolatile"
-			    value      	TRUE))
-		    quid       	"3A79D3E6007D"
-		    documentation 	
-|listener methods. If it is desired that the list be explicitly empty and not have BeanInfo set it, then set listenerMethodsExplicitEmpty to true.
-|<p>
-|ListenerMethods will be decorated with MethodDecorators.
-|<p>
-|Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serListMthd" notifications instead.
-		    
-		    label      	"listenerMethods"
-		    supplier   	"Logical View::beaninfo::MethodProxy"
-		    quidu      	"3A8984C901C3"
-		    client_cardinality 	(value cardinality "1..n")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$7"
-		    quid       	"3A79D3E60091"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F"))
-	    derived    	TRUE)
-	(object Association "$UNNAMED$8"
-	    quid       	"3A79D4A80158"
-	    roles      	(list role_list
-		(object Role "listenerType"
-		    quid       	"3A79D4AA038B"
-		    label      	"listenerType"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$9"
-		    quid       	"3A79D4AA03B4"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F")))
-	(object Association "$UNNAMED$10"
-	    quid       	"3A79D4DF020B"
-	    roles      	(list role_list
-		(object Role "removeListenerMethod"
-		    quid       	"3A79D4E10395"
-		    label      	"removeListenerMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$11"
-		    quid       	"3A79D4E103A9"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F")))
-	(object Association "$UNNAMED$12"
-	    quid       	"3A79DA1A02F7"
-	    roles      	(list role_list
-		(object Role "parameterDescriptors"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE)
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isVolatile"
-			    value      	TRUE))
-		    quid       	"3A79DA1C0231"
-		    documentation 	
-|This is the parameter descriptors list.
-|<p>
-|Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serParmDesc" notifications instead.
-		    
-		    label      	"parameterDescriptors"
-		    supplier   	"Logical View::beaninfo::ParameterDecorator"
-		    quidu      	"3A79D9C20304"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$13"
-		    quid       	"3A79DA1C0232"
-		    supplier   	"Logical View::beaninfo::MethodDecorator"
-		    quidu      	"3A79D35E0027"))
-	    derived    	TRUE)
-	(object Association "$UNNAMED$14"
-	    quid       	"3A79DB0B0339"
-	    roles      	(list role_list
-		(object Role "propertyEditorClass"
-		    quid       	"3A79DB0E013F"
-		    label      	"propertyEditorClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$15"
-		    quid       	"3A79DB0E0171"
-		    supplier   	"Logical View::beaninfo::PropertyDecorator"
-		    quidu      	"3A79DA68010E")))
-	(object Association "$UNNAMED$16"
-	    quid       	"3A79DBBD0000"
-	    roles      	(list role_list
-		(object Role "readMethod"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DBBF0071"
-		    label      	"readMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$17"
-		    quid       	"3A79DBBF0085"
-		    supplier   	"Logical View::beaninfo::PropertyDecorator"
-		    quidu      	"3A79DA68010E")))
-	(object Association "$UNNAMED$18"
-	    quid       	"3A79DBDF02D0"
-	    roles      	(list role_list
-		(object Role "writeMethod"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DBE101F7"
-		    label      	"writeMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$19"
-		    quid       	"3A79DBE1020B"
-		    supplier   	"Logical View::beaninfo::PropertyDecorator"
-		    quidu      	"3A79DA68010E")))
-	(object Association "$UNNAMED$20"
-	    quid       	"3A79DE34036F"
-	    roles      	(list role_list
-		(object Role "indexedReadMethod"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DE3503CA"
-		    label      	"indexedReadMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$21"
-		    quid       	"3A79DE3503DE"
-		    supplier   	"Logical View::beaninfo::IndexedPropertyDecorator"
-		    quidu      	"3A79DC450309")))
-	(object Association "$UNNAMED$22"
-	    quid       	"3A79DE540180"
-	    roles      	(list role_list
-		(object Role "indexedWriteMethod"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DE5503D0"
-		    label      	"indexedWriteMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$23"
-		    quid       	"3A79DE5503E4"
-		    supplier   	"Logical View::beaninfo::IndexedPropertyDecorator"
-		    quidu      	"3A79DC450309")))
-	(object Association "$UNNAMED$24"
-	    quid       	"3A89865B01D5"
-	    roles      	(list role_list
-		(object Role "method"
-		    quid       	"3A89865C01AE"
-		    label      	"method"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$25"
-		    quid       	"3A89865C01CC"
-		    supplier   	"Logical View::beaninfo::MethodProxy"
-		    quidu      	"3A8984C901C3")))
-	(object Association "$UNNAMED$26"
-	    quid       	"3C9A6EDD02C2"
-	    roles      	(list role_list
-		(object Role "parameter"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE))
-		    quid       	"3C9A6EDE01FB"
-		    documentation 	"The JavaParameter that this ParameterDecorator is decorating. Can't use eDecorates in this."
-		    label      	"parameter"
-		    supplier   	"Logical View::java::JavaParameter"
-		    quidu      	"3654AD780280"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$27"
-		    quid       	"3C9A6EDE0205"
-		    supplier   	"Logical View::beaninfo::ParameterDecorator"
-		    quidu      	"3A79D9C20304")))
-	(object Association "$UNNAMED$28"
-	    quid       	"41F016E7002E"
-	    roles      	(list role_list
-		(object Role "serParmDesc"
-		    quid       	"41F016E802A7"
-		    documentation 	"This is a private feature. It is used internally only. "
-		    label      	"serParmDesc"
-		    supplier   	"Logical View::beaninfo::ParameterDecorator"
-		    quidu      	"3A79D9C20304"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    exportControl 	"Private"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$29"
-		    quid       	"41F016E802B1"
-		    supplier   	"Logical View::beaninfo::MethodDecorator"
-		    quidu      	"3A79D35E0027"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$30"
-	    quid       	"41F11E710387"
-	    roles      	(list role_list
-		(object Role "eventAdapterClass"
-		    quid       	"41F11E730249"
-		    documentation 	
-|For some listener interfaces an adapter class is provided that implements default no-op methods, e.g. java.awt.event.FocusEvent which has java.awt.event.FocusAdapter. The Adapter class is provided in a key/value pair on the java.beans.EventSetDescriptor with a key defined in a static final constants EVENTADAPTERCLASS = "eventAdapterClass".
-		    
-		    label      	"eventAdapterClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$31"
-		    quid       	"41F11E73025D"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F")))
-	(object Association "$UNNAMED$32"
-	    quid       	"41F1278A01A5"
-	    roles      	(list role_list
-		(object Role "serListMthd"
-		    quid       	"41F1278B021F"
-		    documentation 	"This is a private feature. It is used internally only. "
-		    label      	"serListMthd"
-		    supplier   	"Logical View::beaninfo::MethodProxy"
-		    quidu      	"3A8984C901C3"
-		    client_cardinality 	(value cardinality "1..n")
-		    Containment 	"By Value"
-		    exportControl 	"Private"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$33"
-		    quid       	"41F1278B0229"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$34"
-	    quid       	"4207D83F01DA"
-	    roles      	(list role_list
-		(object Role "field"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"4207D8400290"
-		    documentation 	"If this is set, then this property is a field and not a getter/setter property. This is an extension that the Visual Editor uses to the BeanInfo model."
-		    label      	"field"
-		    supplier   	"Logical View::java::Field"
-		    quidu      	"3654AF8F0280"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$35"
-		    quid       	"4207D8400292"
-		    supplier   	"Logical View::beaninfo::PropertyDecorator"
-		    quidu      	"3A79DA68010E"))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Main"
-	    quid       	"3A799AC8038E"
-	    title      	"Main"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	94
-	    items      	(list diagram_item_list
-		(object NoteView @1
-		    location   	(3232, 1712)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(2950, 1624)
-			fill_color 	13434879
-			nlines     	3
-			max_width  	528
-			label      	"ListenerMethods will be decorated with MethodDecorators.")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	588
-		    height     	188)
-		(object NoteView @2
-		    location   	(3392, 2784)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(3076, 2568)
-			fill_color 	13434879
-			nlines     	8
-			max_width  	596
-			label      	
-|MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.
-|
-|MethodProxies would also have MethodDecorators.
-			)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	656
-		    height     	444)
-		(object ClassView "Class" "Logical View::java::JavaEvent" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1248, 2688)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(1114, 2614)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	268
-			justify    	0
-			label      	"JavaEvent")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777088
-		    quidu      	"3C62FAF103C8"
-		    width      	286
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::BeanEvent" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1232, 2992)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(1096, 2941)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	272
-			justify    	0
-			label      	"BeanEvent")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3CB09CA90212"
-		    width      	290
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @5
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CB09CB6038D"
-		    client     	@4
-		    supplier   	@3
-		    line_style 	0)
-		(object NoteView @6
-		    location   	(1856, 2944)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@6
-			location   	(1561, 2815)
-			fill_color 	13434879
-			nlines     	5
-			max_width  	555
-			label      	"The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator.")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	615
-		    height     	270)
-		(object ClassView "Class" "Logical View::ecore::EAnnotation" @7
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1056, 128)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@7
-			location   	(906, 54)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	300
-			justify    	0
-			label      	"EAnnotation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"3D98A1C701AB"
-		    width      	318
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::ecore::EOperation" @8
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2848, 2272)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@8
-			location   	(2702, 2198)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	292
-			justify    	0
-			label      	"EOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"3904DAA200A0"
-		    width      	310
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::FeatureAttributeMapEntry" @9
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2224, 176)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@9
-			location   	(1887, 92)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	674
-			justify    	0
-			label      	"FeatureAttributeMapEntry")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@9
-			location   	(1887, 42)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	674
-			justify    	0
-			label      	"<<MapEntry>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"404CC85501F5"
-		    compartment 	(object Compartment
-			Parent_View 	@9
-			location   	(1887, 153)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	3
-			max_width  	581)
-		    width      	692
-		    height     	292
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::FeatureDecorator" @10
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(1072, 656)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@10
-			location   	(665, 325)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	814
-			justify    	0
-			label      	"FeatureDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A799B3E01E9"
-		    compartment 	(object Compartment
-			Parent_View 	@10
-			location   	(665, 386)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	12
-			max_width  	700)
-		    width      	832
-		    height     	686
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @11
-		    location   	(1072, 1105)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@10
-		    vertices   	(list Points
-			(1072, 1105)
-			(1072, 999)))
-		(object InheritView "" @12
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3DFA185900DC"
-		    client     	@10
-		    supplier   	@7
-		    line_style 	0)
-		(object AssociationViewNew "$UNNAMED$0" @13
-		    location   	(1682, 401)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79CF6C0378"
-		    roleview_list 	(list RoleViews
-			(object RoleView "attributes" @14
-			    Parent_View 	@13
-			    location   	(626, -63)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @15
-				Parent_View 	@14
-				location   	(1747, 309)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	207
-				justify    	0
-				label      	"+attributes"
-				pctDist    	0.457012
-				height     	62
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79CF6E00BE"
-			    client     	@13
-			    supplier   	@9
-			    line_style 	0
-			    label      	(object SegLabel @16
-				Parent_View 	@14
-				location   	(1812, 396)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.584653
-				height     	45
-				orientation 	1))
-			(object RoleView "$UNNAMED$1" @17
-			    Parent_View 	@13
-			    location   	(626, -63)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79CF6E00C8"
-			    client     	@13
-			    supplier   	@10
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::beaninfo::FeatureAttributeValue" @18
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(3456, 176)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@18
-			location   	(2683, 117)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	1546
-			justify    	0
-			label      	"FeatureAttributeValue")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@18
-			location   	(2683, 67)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	1546
-			justify    	0
-			label      	"<<datatype>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"41E582F800BB"
-		    compartment 	(object Compartment
-			Parent_View 	@18
-			location   	(2683, 178)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	1493)
-		    width      	1564
-		    height     	242
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::ImplicitItem" @19
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2288, 656)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@19
-			location   	(1815, 547)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	946
-			justify    	0
-			label      	"ImplicitItem")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@19
-			location   	(1815, 497)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	946
-			justify    	0
-			label      	"<<enumeration>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12615935
-		    quidu      	"41E59E5D0296"
-		    compartment 	(object Compartment
-			Parent_View 	@19
-			location   	(1815, 608)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	4
-			max_width  	812)
-		    width      	964
-		    height     	342
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::JavaParameter" @20
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(4304, 1792)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@20
-			location   	(4125, 1718)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	358
-			justify    	0
-			label      	"JavaParameter")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777088
-		    quidu      	"3654AD780280"
-		    width      	376
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::ParameterDecorator" @21
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(4864, 1360)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@21
-			location   	(4631, 1279)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	466
-			justify    	0
-			label      	"ParameterDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79D9C20304"
-		    compartment 	(object Compartment
-			Parent_View 	@21
-			location   	(4631, 1340)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	294)
-		    width      	484
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$26" @22
-		    location   	(4578, 1579)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C9A6EDD02C2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "parameter" @23
-			    Parent_View 	@22
-			    location   	(1666, -21)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @24
-				Parent_View 	@23
-				location   	(4540, 1659)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	215
-				justify    	0
-				label      	"+parameter"
-				pctDist    	0.386598
-				height     	41
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C9A6EDE01FB"
-			    client     	@22
-			    supplier   	@20
-			    line_style 	0
-			    label      	(object SegLabel @25
-				Parent_View 	@23
-				location   	(4480, 1588)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.412371
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$27" @26
-			    Parent_View 	@22
-			    location   	(1666, -21)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C9A6EDE0205"
-			    client     	@22
-			    supplier   	@21
-			    line_style 	0)))
-		(object InheritView "" @27
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DEBB01C4"
-		    client     	@21
-		    supplier   	@10
-		    line_style 	3
-		    origin_attachment 	(4658, 1267)
-		    terminal_attachment 	(4658, 1105)
-		    drawSupplier 	@11)
-		(object ClassView "Class" "Logical View::beaninfo::MethodDecorator" @28
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(3712, 1360)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@28
-			location   	(3362, 1279)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	700
-			justify    	0
-			label      	"MethodDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79D35E0027"
-		    compartment 	(object Compartment
-			Parent_View 	@28
-			location   	(3362, 1340)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	594)
-		    width      	718
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @29
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DEA603E1"
-		    client     	@28
-		    supplier   	@10
-		    line_style 	3
-		    origin_attachment 	(3694, 1267)
-		    terminal_attachment 	(3694, 1105)
-		    drawSupplier 	@11)
-		(object AssociationViewNew "$UNNAMED$12" @30
-		    location   	(4314, 1490)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DA1A02F7"
-		    roleview_list 	(list RoleViews
-			(object RoleView "parameterDescriptors" @31
-			    Parent_View 	@30
-			    location   	(2842, 594)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @32
-				Parent_View 	@31
-				location   	(4389, 1427)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	427
-				justify    	0
-				label      	"+parameterDescriptors"
-				pctDist    	0.308262
-				height     	69
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DA1C0231"
-			    client     	@30
-			    supplier   	@21
-			    vertices   	(list Points
-				(4314, 1490)
-				(4373, 1503)
-				(4621, 1429))
-			    line_style 	0
-			    label      	(object SegLabel @33
-				Parent_View 	@31
-				location   	(4555, 1491)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.745977
-				height     	41
-				orientation 	1))
-			(object RoleView "$UNNAMED$13" @34
-			    Parent_View 	@30
-			    location   	(2842, 594)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DA1C0232"
-			    client     	@30
-			    supplier   	@28
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$28" @35
-		    location   	(4385, 1273)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"41F016E7002E"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serParmDesc" @36
-			    Parent_View 	@35
-			    location   	(1265, -71)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @37
-				Parent_View 	@36
-				location   	(4534, 1252)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	285
-				justify    	0
-				label      	"-serParmDesc"
-				pctDist    	0.595893
-				height     	48
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F016E802A7"
-			    client     	@35
-			    supplier   	@21
-			    line_style 	0
-			    label      	(object SegLabel @38
-				Parent_View 	@36
-				location   	(4590, 1364)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.904386
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$29" @39
-			    Parent_View 	@35
-			    location   	(1265, -71)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F016E802B1"
-			    client     	@35
-			    supplier   	@28
-			    vertices   	(list Points
-				(4385, 1273)
-				(4326, 1263)
-				(4071, 1302))
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::java::Method" @40
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(2592, 3264)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@40
-			location   	(2492, 3190)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	200
-			justify    	0
-			label      	"Method")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"3654AE910271"
-		    width      	218
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::MethodProxy" @41
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2560, 2768)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@41
-			location   	(2398, 2717)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	324
-			justify    	0
-			label      	"MethodProxy")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A8984C901C3"
-		    width      	342
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AttachView "" @42
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@2
-		    supplier   	@41
-		    line_style 	0)
-		(object AssociationViewNew "$UNNAMED$24" @43
-		    location   	(2575, 3004)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A89865B01D5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "method" @44
-			    Parent_View 	@43
-			    location   	(271, 1084)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @45
-				Parent_View 	@44
-				location   	(2539, 3072)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	162
-				justify    	0
-				label      	"+method"
-				pctDist    	0.376068
-				height     	41
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A89865C01AE"
-			    client     	@43
-			    supplier   	@40
-			    line_style 	0
-			    label      	(object SegLabel @46
-				Parent_View 	@44
-				location   	(2639, 3158)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "$UNNAMED$25" @47
-			    Parent_View 	@43
-			    location   	(271, 1084)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A89865C01CC"
-			    client     	@43
-			    supplier   	@41
-			    line_style 	0)))
-		(object InheritView "" @48
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3DFA19B600DE"
-		    client     	@41
-		    supplier   	@8
-		    line_style 	0)
-		(object AttachView "" @49
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@6
-		    supplier   	@4
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::beaninfo::IndexedPropertyDecorator" @50
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(752, 2288)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@50
-			location   	(460, 2237)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	584
-			justify    	0
-			label      	"IndexedPropertyDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79DC450309"
-		    width      	602
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::BeanDecorator" @51
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(512, 1456)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@51
-			location   	(7, 1150)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	1010
-			justify    	0
-			label      	"BeanDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79D0DF02D1"
-		    compartment 	(object Compartment
-			Parent_View 	@51
-			location   	(7, 1211)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	11
-			max_width  	868)
-		    width      	1028
-		    height     	636
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @52
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DE8E007F"
-		    client     	@51
-		    supplier   	@10
-		    line_style 	3
-		    origin_attachment 	(381, 1137)
-		    terminal_attachment 	(381, 1105)
-		    drawSupplier 	@11)
-		(object ClassView "Class" "Logical View::beaninfo::EventSetDecorator" @53
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2848, 1424)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@53
-			location   	(2395, 1268)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	906
-			justify    	0
-			label      	"EventSetDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79D1D2004F"
-		    compartment 	(object Compartment
-			Parent_View 	@53
-			location   	(2395, 1329)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	4
-			max_width  	778)
-		    width      	924
-		    height     	336
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @54
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DEA200EC"
-		    client     	@53
-		    supplier   	@10
-		    line_style 	3
-		    origin_attachment 	(2831, 1255)
-		    terminal_attachment 	(2831, 1105)
-		    drawSupplier 	@11)
-		(object AssociationViewNew "$UNNAMED$6" @55
-		    location   	(2692, 2148)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79D3E10364"
-		    roleview_list 	(list RoleViews
-			(object RoleView "listenerMethods" @56
-			    Parent_View 	@55
-			    location   	(1828, 1252)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @57
-				Parent_View 	@56
-				location   	(2580, 2585)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	324
-				justify    	0
-				label      	"+listenerMethods"
-				pctDist    	0.790503
-				height     	19
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D3E6007D"
-			    client     	@55
-			    supplier   	@41
-			    line_style 	0
-			    label      	(object SegLabel @58
-				Parent_View 	@56
-				location   	(2598, 2522)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.676961
-				height     	14
-				orientation 	1))
-			(object RoleView "$UNNAMED$7" @59
-			    Parent_View 	@55
-			    location   	(1828, 1252)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D3E60091"
-			    client     	@55
-			    supplier   	@53
-			    line_style 	0)))
-		(object AttachView "" @60
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@1
-		    supplier   	@55
-		    line_style 	0)
-		(object AssociationViewNew "$UNNAMED$32" @61
-		    location   	(2525, 2221)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"41F1278A01A5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serListMthd" @62
-			    Parent_View 	@61
-			    location   	(269, 813)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @63
-				Parent_View 	@62
-				location   	(2296, 2688)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	229
-				justify    	0
-				label      	"-serListMthd"
-				pctDist    	0.765012
-				height     	39
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F1278B021F"
-			    client     	@61
-			    supplier   	@41
-			    vertices   	(list Points
-				(2525, 2221)
-				(2303, 2771)
-				(2388, 2769))
-			    line_style 	0
-			    label      	(object SegLabel @64
-				Parent_View 	@62
-				location   	(2239, 2587)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.657692
-				height     	129
-				orientation 	1))
-			(object RoleView "$UNNAMED$33" @65
-			    Parent_View 	@61
-			    location   	(269, 813)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F1278B0229"
-			    client     	@61
-			    supplier   	@53
-			    line_style 	0)))
-		(object AttachView "" @66
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@6
-		    supplier   	@53
-		    vertices   	(list Points
-			(1878, 2808)
-			(2016, 2021)
-			(2612, 1592))
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::java::Method" @67
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    location   	(1664, 2096)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@67
-			location   	(1564, 2022)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	200
-			justify    	0
-			label      	"Method")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"3654AE910271"
-		    width      	218
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$20" @68
-		    location   	(1315, 2289)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DE34036F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "indexedReadMethod" @69
-			    Parent_View 	@68
-			    location   	(563, 401)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @70
-				Parent_View 	@69
-				location   	(1421, 2275)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	404
-				justify    	0
-				label      	"+indexedReadMethod"
-				pctDist    	0.385248
-				height     	14
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DE3503CA"
-			    client     	@68
-			    supplier   	@67
-			    vertices   	(list Points
-				(1315, 2289)
-				(1375, 2289)
-				(1554, 2168))
-			    line_style 	0
-			    label      	(object SegLabel @71
-				Parent_View 	@69
-				location   	(1249, 2238)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	-0.240775
-				height     	52
-				orientation 	0))
-			(object RoleView "$UNNAMED$21" @72
-			    Parent_View 	@68
-			    location   	(563, 401)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DE3503DE"
-			    client     	@68
-			    supplier   	@50
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$22" @73
-		    location   	(1442, 2361)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DE540180"
-		    roleview_list 	(list RoleViews
-			(object RoleView "indexedWriteMethod" @74
-			    Parent_View 	@73
-			    location   	(690, 473)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @75
-				Parent_View 	@74
-				location   	(1597, 2374)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	409
-				justify    	0
-				label      	"+indexedWriteMethod"
-				pctDist    	0.501177
-				height     	37
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DE5503D0"
-			    client     	@73
-			    supplier   	@67
-			    vertices   	(list Points
-				(1442, 2361)
-				(1632, 2382)
-				(1654, 2182))
-			    line_style 	0
-			    label      	(object SegLabel @76
-				Parent_View 	@74
-				location   	(1639, 2306)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.681972
-				height     	2
-				orientation 	0))
-			(object RoleView "$UNNAMED$23" @77
-			    Parent_View 	@73
-			    location   	(690, 473)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DE5503E4"
-			    client     	@73
-			    supplier   	@50
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$4" @78
-		    location   	(1898, 1691)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79D3080128"
-		    roleview_list 	(list RoleViews
-			(object RoleView "addListenerMethod" @79
-			    Parent_View 	@78
-			    location   	(1034, 795)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @80
-				Parent_View 	@79
-				location   	(1561, 1824)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	385
-				justify    	0
-				label      	"+addListenerMethod"
-				pctDist    	0.627386
-				height     	90
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D3090346"
-			    client     	@78
-			    supplier   	@67
-			    vertices   	(list Points
-				(1898, 1691)
-				(1647, 1763)
-				(1658, 2009))
-			    line_style 	0
-			    label      	(object SegLabel @81
-				Parent_View 	@79
-				location   	(1699, 1853)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.694068
-				height     	48
-				orientation 	0))
-			(object RoleView "$UNNAMED$5" @82
-			    Parent_View 	@78
-			    location   	(1034, 795)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D309035A"
-			    client     	@78
-			    supplier   	@53
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$10" @83
-		    location   	(2162, 1812)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79D4DF020B"
-		    roleview_list 	(list RoleViews
-			(object RoleView "removeListenerMethod" @84
-			    Parent_View 	@83
-			    location   	(1298, 916)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @85
-				Parent_View 	@84
-				location   	(2115, 1846)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	448
-				justify    	0
-				label      	"+removeListenerMethod"
-				pctDist    	0.129058
-				height     	6
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D4E10395"
-			    client     	@83
-			    supplier   	@67
-			    line_style 	0
-			    label      	(object SegLabel @86
-				Parent_View 	@84
-				location   	(1839, 2058)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "$UNNAMED$11" @87
-			    Parent_View 	@83
-			    location   	(1298, 916)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D4E103A9"
-			    client     	@83
-			    supplier   	@53
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::java::JavaClass" @88
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    location   	(240, 2192)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@88
-			location   	(106, 2118)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	268
-			justify    	0
-			label      	"JavaClass")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"36549FCC00FA"
-		    width      	286
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$2" @89
-		    location   	(332, 1939)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79D1350248"
-		    roleview_list 	(list RoleViews
-			(object RoleView "customizerClass" @90
-			    Parent_View 	@89
-			    location   	(92, 1043)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @91
-				Parent_View 	@90
-				location   	(298, 2044)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	328
-				justify    	0
-				label      	"+customizerClass"
-				pctDist    	0.631674
-				height     	4
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D13601D2"
-			    client     	@89
-			    supplier   	@88
-			    line_style 	0
-			    label      	(object SegLabel @92
-				Parent_View 	@90
-				location   	(326, 1989)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.284188
-				height     	12
-				orientation 	0))
-			(object RoleView "$UNNAMED$3" @93
-			    Parent_View 	@89
-			    location   	(92, 1043)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D13601E6"
-			    client     	@89
-			    supplier   	@51
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$8" @94
-		    location   	(1384, 1854)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79D4A80158"
-		    roleview_list 	(list RoleViews
-			(object RoleView "listenerType" @95
-			    Parent_View 	@94
-			    location   	(520, 958)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @96
-				Parent_View 	@95
-				location   	(782, 2066)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	259
-				justify    	0
-				label      	"+listenerType"
-				pctDist    	0.610677
-				height     	33
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D4AA038B"
-			    client     	@94
-			    supplier   	@88
-			    line_style 	0
-			    label      	(object SegLabel @97
-				Parent_View 	@95
-				location   	(977, 2061)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.429590
-				height     	83
-				orientation 	0))
-			(object RoleView "$UNNAMED$9" @98
-			    Parent_View 	@94
-			    location   	(520, 958)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D4AA03B4"
-			    client     	@94
-			    supplier   	@53
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$30" @99
-		    location   	(1392, 1913)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"41F11E710387"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eventAdapterClass" @100
-			    Parent_View 	@99
-			    location   	(-864, 505)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @101
-				Parent_View 	@100
-				location   	(771, 2132)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	367
-				justify    	0
-				label      	"+eventAdapterClass"
-				pctDist    	0.629702
-				height     	10
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F11E730249"
-			    client     	@99
-			    supplier   	@88
-			    vertices   	(list Points
-				(1392, 1913)
-				(766, 2124)
-				(383, 2172))
-			    line_style 	0
-			    label      	(object SegLabel @102
-				Parent_View 	@100
-				location   	(494, 2197)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.898257
-				height     	38
-				orientation 	0))
-			(object RoleView "$UNNAMED$31" @103
-			    Parent_View 	@99
-			    location   	(-864, 505)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F11E73025D"
-			    client     	@99
-			    supplier   	@53
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::java::Field" @104
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(816, 2672)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@104
-			location   	(720, 2597)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	192
-			justify    	0
-			label      	"Field")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777088
-		    quidu      	"3654AF8F0280"
-		    width      	210
-		    height     	174
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::PropertyDecorator" @105
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(1808, 1456)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@105
-			location   	(1316, 1200)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	984
-			justify    	0
-			label      	"PropertyDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79DA68010E"
-		    compartment 	(object Compartment
-			Parent_View 	@105
-			location   	(1316, 1261)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	9
-			max_width  	838)
-		    width      	1002
-		    height     	536
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @106
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DE840388"
-		    client     	@50
-		    supplier   	@105
-		    line_style 	0)
-		(object InheritView "" @107
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DE9702BD"
-		    client     	@105
-		    supplier   	@10
-		    line_style 	3
-		    origin_attachment 	(1772, 1188)
-		    terminal_attachment 	(1772, 1105)
-		    drawSupplier 	@11)
-		(object AssociationViewNew "$UNNAMED$16" @108
-		    location   	(1003, 1968)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DBBD0000"
-		    roleview_list 	(list RoleViews
-			(object RoleView "readMethod" @109
-			    Parent_View 	@108
-			    location   	(235, 1072)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @110
-				Parent_View 	@109
-				location   	(1308, 2033)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	254
-				justify    	0
-				label      	"+readMethod"
-				pctDist    	0.553714
-				height     	7
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DBBF0071"
-			    client     	@108
-			    supplier   	@67
-			    line_style 	0
-			    label      	(object SegLabel @111
-				Parent_View 	@109
-				location   	(1471, 2131)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.873365
-				height     	72
-				orientation 	1))
-			(object RoleView "$UNNAMED$17" @112
-			    Parent_View 	@108
-			    location   	(235, 1072)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DBBF0085"
-			    client     	@108
-			    supplier   	@105
-			    vertices   	(list Points
-				(1003, 1968)
-				(909, 1950)
-				(1316, 1724))
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$18" @113
-		    location   	(1035, 2106)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DBDF02D0"
-		    roleview_list 	(list RoleViews
-			(object RoleView "writeMethod" @114
-			    Parent_View 	@113
-			    location   	(267, 1210)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @115
-				Parent_View 	@114
-				location   	(1325, 2090)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	254
-				justify    	0
-				label      	"+writeMethod"
-				pctDist    	0.560930
-				height     	12
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DBE101F7"
-			    client     	@113
-			    supplier   	@67
-			    line_style 	0
-			    label      	(object SegLabel @116
-				Parent_View 	@114
-				location   	(1503, 2056)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.901632
-				height     	43
-				orientation 	0))
-			(object RoleView "$UNNAMED$19" @117
-			    Parent_View 	@113
-			    location   	(267, 1210)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DBE1020B"
-			    client     	@113
-			    supplier   	@105
-			    vertices   	(list Points
-				(1035, 2106)
-				(975, 2107)
-				(1462, 1724))
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$14" @118
-		    location   	(844, 1907)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DB0B0339"
-		    roleview_list 	(list RoleViews
-			(object RoleView "propertyEditorClass" @119
-			    Parent_View 	@118
-			    location   	(76, 1011)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @120
-				Parent_View 	@119
-				location   	(778, 1967)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	392
-				justify    	0
-				label      	"+propertyEditorClass"
-				pctDist    	0.166430
-				height     	26
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DB0E013F"
-			    client     	@118
-			    supplier   	@88
-			    line_style 	0
-			    label      	(object SegLabel @121
-				Parent_View 	@119
-				location   	(1123, 1915)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	-0.490182
-				height     	126
-				orientation 	0))
-			(object RoleView "$UNNAMED$15" @122
-			    Parent_View 	@118
-			    location   	(76, 1011)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DB0E0171"
-			    client     	@118
-			    supplier   	@105
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$34" @123
-		    location   	(1296, 2186)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"4207D83F01DA"
-		    roleview_list 	(list RoleViews
-			(object RoleView "field" @124
-			    Parent_View 	@123
-			    location   	(-112, 778)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @125
-				Parent_View 	@124
-				location   	(938, 2513)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	112
-				justify    	0
-				label      	"+field"
-				pctDist    	0.892515
-				height     	57
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"4207D8400290"
-			    client     	@123
-			    supplier   	@104
-			    vertices   	(list Points
-				(1296, 2186)
-				(1103, 2463)
-				(921, 2593))
-			    line_style 	0
-			    label      	(object SegLabel @126
-				Parent_View 	@124
-				location   	(1046, 2557)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.780986
-				height     	43
-				orientation 	0))
-			(object RoleView "$UNNAMED$35" @127
-			    Parent_View 	@123
-			    location   	(-112, 778)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"4207D8400292"
-			    client     	@123
-			    supplier   	@105
-			    line_style 	0)))))))
diff --git a/plugins/org.eclipse.jem.beaninfo/rose/introspect.mdl b/plugins/org.eclipse.jem.beaninfo/rose/introspect.mdl
deleted file mode 100644
index c7ca9efff..000000000
--- a/plugins/org.eclipse.jem.beaninfo/rose/introspect.mdl
+++ /dev/null
@@ -1,556 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Java"
-	    name       	"IDE"
-	    value      	"Internal Editor")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply3"
-	    value      	""))
-    quid       	"3A79EBA50331"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3A7999AD0297"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3A7999B702F6"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3A7999AD028E"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3A7999AD02A1"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "ecore"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WorkspaceRoot\\org.eclipse.emf.ecore\\model\\org.eclipse.emf.Ecore.cat"
-		quid       	"39A5ED04004E")
-	    (object Class_Category "java"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WorkspaceRoot\\org.eclipse.jem\\rose\\edocjava2.cat"
-		quid       	"36549F2C004E")
-	    (object Class_Category "beaninfo"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WorkspaceRoot\\org.eclipse.jem.beaninfo\\rose\\beaninfo.cat"
-		quid       	"3A799ABB0353"))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3A7999B70309"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::beaninfo" @1
-			location   	(272, 224)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@1
-			    location   	(128, 140)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"beaninfo")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3A799ABB0353"
-			width      	300
-			height     	180)))
-	    (object ClassDiagram "Dependencies (Don't edit)"
-		quid       	"3B869C9102E4"
-		title      	"Dependencies (Don't edit)"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::ecore" @2
-			location   	(256, 240)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@2
-			    location   	(112, 156)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"ecore")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	16776960
-			quidu      	"39A5ED04004E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::java" @3
-			location   	(896, 256)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(749, 222)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	294
-			    justify    	0
-			    label      	"java")
-			stereotype 	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(749, 172)
-			    fill_color 	13434879
-			    anchor     	10
-			    nlines     	1
-			    max_width  	294
-			    justify    	0
-			    label      	"<<metamodel>>")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	16776960
-			quidu      	"36549F2C004E"
-			width      	306
-			height     	180)
-		    (object NoteView @4
-			location   	(688, 688)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@4
-			    location   	(280, 532)
-			    fill_color 	13434879
-			    nlines     	7
-			    max_width  	780
-			    label      	"These are packages (cat files) that this model depends on. They must not be edited in here. They are only be edited by the model that owns them.")
-			line_color 	3342489
-			fill_color 	16744703
-			width      	840
-			height     	325)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3A7999AD02A1"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3A7999B702F5"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3A7999AD02A2"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3A7999AD02A4"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"constraints"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlContentKind"
-			value      	("ContentKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"ContentKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Empty"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Mixed"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"ElementOnly"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	""))))
-	quid       	"3A7999AD02A3"))
diff --git a/plugins/org.eclipse.jem.beaninfo/schema/registrations.exsd b/plugins/org.eclipse.jem.beaninfo/schema/registrations.exsd
deleted file mode 100644
index 6a90380d5..000000000
--- a/plugins/org.eclipse.jem.beaninfo/schema/registrations.exsd
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jem.beaninfo">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jem.beaninfo" id="registrations" name="BeanInfo Extension Registrations"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to register contributors, beaninfo, and overrides for BeanInfo contributions.
-&lt;p&gt;An important concept is visibility of a container, plugin, or project to the top-level project. The top-level project is the project being introspected. For a container, plugin, or project to be visible to that project, the container, plugin, or project must be in the classpath of the top-level project, or it must be exported from a visible project or plugin. Once a non-visible project/plugin is reached, any projects, containers, or plugins that it may contain are not considered to be visible.
-&lt;p&gt;The registrations are identified with the container id and/or plugin id. If that container or plugin is visible, then that registration will be processed for the top-level project. If the container/plugin is found more than once in the build path of the top-level project, it will only be processed once.
-&lt;p&gt;There are three forms of registrations.
-&lt;ul&gt;
-&lt;li&gt;BeanInfo registrations. These supply standard BeanInfo and overrides.
-&lt;li&gt;&lt;samp&gt;IClasspathContainer&lt;/samp&gt; that implements &lt;samp&gt;IBeanInfoContributor&lt;/samp&gt;.
-&lt;li&gt;An explicit contributor that implements &lt;samp&gt;IBeanInfoContributor&lt;/samp&gt;.
-&lt;/ul&gt;
-&lt;p&gt;It runs through the visible BeanInfo registrations. 
-&lt;p&gt;
-The IClasspathContainer registration isn&apos;t specified as part of this extension point. For all visible containers, if the classpath container (from JDT) also implements IBeanInfoContributor, then it will be called to contribute to the BeanInfo.
-&lt;p&gt;Then it runs through the visible explicit contributors. Note that if the explicit contributor also implements &lt;samp&gt;org.eclipse.jem.internal.proxy.core.IConfigurationContributor&lt;/samp&gt; it will also be called for proxy contributions. This allows for special setup required by any contributed BeanInfo for the launched proxy registry. This shouldn&apos;t normally be necessary because normal classpath updates to include the BeanInfo jar will be done by the IBeanInfoContributor itself through the BeanInfo registration callback.
-&lt;p&gt;The order of processing for the overrides will be to first run through the specified overrides (through Beaninfo registrations). Then it runs through the visible containers that implement IBeanInfoContributor, and then finally it runs through the explicit IBeanInfoContributors. This order is chosen because the overrides files are not dynamic so they need to be applied in a consistent way. The contributors are dynamic and can handle change.
-&lt;p&gt;The only order guarantee is that contributions from this extension point will be processed in plugin order of where the extension was declared. For example if there was an extension declared in plugin A and in plugin B, and plugin B requires plugin A, then the extensions declarations in plugin A will be processed before the extension declarations in plugin B.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="registration" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="contributor" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="registration">
-      <annotation>
-         <documentation>
-            This is a registration for a container or plugin. It supplies the BeanInfo and the overrides.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="beaninfo" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="override" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="container" type="string">
-            <annotation>
-               <documentation>
-                  contributor is for a container. The value is the container id (e.g. &lt;b&gt;&quot;JRE_CONTAINER&quot;&lt;/b&gt;). This will match &quot;/JRE_CONTAINER&quot; or &quot;/JRE_CONTAINER/...&quot;. Or &lt;b&gt;&quot;JRE_CONTAINER/XYZ&quot;&lt;/b&gt; would match &quot;/JRE_CONTAINER/XYZ/...&quot;.
-&lt;p&gt;
-You can also use a regular expression. An expression such as &lt;b&gt;&quot;SWT_CONTAINER/.*/JFACE&quot;&lt;/b&gt; will match &quot;/SWT_CONTAINER/PDE/JFACE&quot; but will not match &quot;/SWT_CONTAINER&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="plugin" type="string">
-            <annotation>
-               <documentation>
-                  contributor is for a plugin. The value is the plugin id (e.g. &quot;org.eclipse.swt&quot;).
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="contributor">
-      <annotation>
-         <documentation>
-            This is a contributor for the visible container/plugin defined by container and plugin attributes.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="container" type="string">
-            <annotation>
-               <documentation>
-                  contributor is for a container. The value is the container id (e.g. &lt;b&gt;&quot;JRE_CONTAINER&quot;&lt;/b&gt;). This will match &quot;/JRE_CONTAINER&quot; or &quot;/JRE_CONTAINER/...&quot;. Or &lt;b&gt;&quot;JRE_CONTAINER/XYZ&quot;&lt;/b&gt; would match &quot;/JRE_CONTAINER/XYZ/...&quot;.
-&lt;p&gt;
-You can also use a regular expression. An expression such as &lt;b&gt;&quot;SWT_CONTAINER/.*/JFACE&quot;&lt;/b&gt; will match &quot;/SWT_CONTAINER/PDE/JFACE&quot; but will not match &quot;/SWT_CONTAINER&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="plugin" type="string">
-            <annotation>
-               <documentation>
-                  contributor is for a plugin. The value is the plugin id (e.g. &quot;org.eclipse.swt&quot;).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the class that implements this contributor. The class must implement IBeanInfoContributor.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="beaninfo">
-      <annotation>
-         <documentation>
-            Provide a BeanInfo jar from this or some other plugin, and provide search path packages.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="searchpath" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="path" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the path to the BeanInfo jar from within this or some other plugin. If it is within this plugin, there should be no leading &apos;/&apos;. There can be subfolders though, e.g. &lt;samp&gt;xyz/qxr.jar&lt;/samp&gt;. If it is within another plugin, then it must be fully-qualified with leading &apos;/&apos; followed by plugin id, followed by a &apos;/&apos; and then the path to the jar relative to that plugin, e.g. &lt;samp&gt;/org.xyz/qxr/ddd.jar&lt;/samp&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="searchpath">
-      <annotation>
-         <documentation>
-            This is a search path. It gives the package to add to the search path for BeanInfo.
-It refers to packages within the BeanInfo jar contributed by the &lt;samp&gt;beaninfo&lt;/samp&gt; element that it is found within.
-There really should be at least one search path. The only way this jar could contribute BeanInfo and not need something added to the search path is if the BeanInfos are in the same package as the bean itself. This is not a recommended way of supplying BeanInfo.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="package" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the java package to search into for BeanInfo. If there are more than one search paths in this &lt;samp&gt;beaninfo&lt;/samp&gt; element, then they will be searched in the order found in the element.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="override">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="package"/>
-         </appInfo>
-         <documentation>
-            This describes an override file for BeanInfo. An override file is an XMI file that is read when a class is first introspected. It happens before the actual introspection. It allows overrides to the Java EMF model class (&lt;samp&gt;JavaClass&lt;/samp&gt;) that can be done through standard BeanInfo. These are annotations that are specific to the Visual Editor implementation in Eclipse. The annotations have no meaning to the standard BeanInfo specification so they are supplied here instead. They provide a much enriched experience in the Visual Editor by providing classes that run in the editor.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="package" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the name of a package or a package fragment. When this package or package fragment matches the package or fragment of a class being introspected, the specified override file from the given path will be applied. For example if the package was &lt;samp&gt;javax.swing&lt;/samp&gt; and the path was &quot;xyz&quot;, then for class &quot;javax.swing.Container&quot; it will look for file &quot;xyz/Container.override&quot;, and if found, it will apply it. If it was &lt;samp&gt;javax.swing.text.JTextComponent&lt;/samp&gt; it will look for file &quot;xyz/text/JTextComponent.override&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the path relative to the plugin where this extension is declared for the folder to search for the override files. See the package attribute description above for how this works.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a registration:
-&lt;p&gt;
-&lt;pre&gt;
-  &lt;extension point=&quot;org.eclipse.jem.beaninfo.registration&quot;&gt;
-    &lt;registration container=&quot;VE_CONTAINER&quot;&gt;
-      &lt;beaninfo path=&quot;xyzbeaninfo.jar&quot;&gt;
-        &lt;searchpath package=&quot;com.xyz.beaninfo&quot;/&gt;
-        &lt;searchpath package=&quot;com.xyz.qxr.beaninfo&quot;/&gt;
-      &lt;/beaninfo&gt;
-      &lt;override package=&quot;com.xyz&quot; path=&quot;overrides/e&quot;/&gt;
-    &lt;/registration&gt;
-    &lt;contributor plugin=&quot;org.eclipse.ve&quot; class=&quot;com.xyz.myContributor&quot;/&gt;
-  &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-&lt;p&gt;
-This says that if container &quot;VE_CONTAINER&quot; is visible to the project being introspected, then then BeanInfo jar &quot;xyzbeaninfo.jar&quot; (found in the plugin that declared this extension) will be looked into for BeanInfos. The two packages listed will be added to the search path of packages.
-&lt;p&gt;
-The override says that, again for &quot;VE_CONTAINER&quot; visible, for any classes that start with &quot;com.xyz&quot;, then the override file (classname.override) will be searched for in the directory &quot;overrides/e&quot;. For example, if the class was &lt;samp&gt;com.xyz.ABC&lt;/samp&gt; it will look for override file &quot;overrides/e/ABC.override&quot;. If the class was &lt;samp&gt;com.xyz.qxr.ABC&lt;/samp&gt; it will for file &quot;overrides/e/qxr/ABC.override&quot;.
-&lt;p&gt;
-Finally if plugin &quot;org.eclipse.ve&quot; is visible to the project, then &lt;samp&gt;com.xyz.myContributor&lt;/samp&gt; will be used to contribute to the BeanInfo.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The &lt;samp&gt;class&lt;/samp&gt; attribute must be a class that implements the &lt;samp&gt;org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor&lt;/samp&gt; interface.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2004 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
deleted file mode 100644
index b51b63053..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
+++ /dev/null
@@ -1,850 +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.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_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
deleted file mode 100644
index 1ef9a4691..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/Attic/basebeaninfonls.properties,v $
-# $Revision: 1.7 $  $Date: 2007/03/14 17:26:47 $
-#
-
-
-#
-# 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_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
deleted file mode 100644
index 95c451820..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/Attic/beaninfo.properties,v $
-# $Revision: 1.6 $  $Date: 2007/03/14 17:26:47 $
-#
-
-
-#
-# 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_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
deleted file mode 100644
index 3c99de2db..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
+++ /dev/null
@@ -1,77 +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.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_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
deleted file mode 100644
index b53aa8a72..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
+++ /dev/null
@@ -1,145 +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.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_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
deleted file mode 100644
index 9888393fd..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
+++ /dev/null
@@ -1,201 +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.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_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
deleted file mode 100644
index 42100e47d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
+++ /dev/null
@@ -1,91 +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.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_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
deleted file mode 100644
index a56159c1e..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
+++ /dev/null
@@ -1,135 +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.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_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
deleted file mode 100644
index 1344589c0..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
+++ /dev/null
@@ -1,863 +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.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_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
deleted file mode 100644
index 04d2cb68f..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
deleted file mode 100644
index bd2d85cbb..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
deleted file mode 100644
index 8e09fcdf5..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
+++ /dev/null
@@ -1,37 +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.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_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
deleted file mode 100644
index 75d5eee64..000000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
+++ /dev/null
@@ -1,83 +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.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.proxy/.classpath b/plugins/org.eclipse.jem.proxy/.classpath
deleted file mode 100644
index 4dae10245..000000000
--- a/plugins/org.eclipse.jem.proxy/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="proxyCommon"/>
-	<classpathentry kind="src" path="initParser"/>
-	<classpathentry kind="src" path="remoteCommon"/>
-	<classpathentry kind="src" output="vm_bin" path="vm_remotevm"/>
-	<classpathentry kind="src" path="proxy"/>
-	<classpathentry kind="src" path="proxyRemote"/>
-	<classpathentry kind="src" path="proxyide"/>
-	<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"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.proxy/.cvsignore b/plugins/org.eclipse.jem.proxy/.cvsignore
deleted file mode 100644
index f4ef7c372..000000000
--- a/plugins/org.eclipse.jem.proxy/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-common_bin
-vm_bin
-javaCompiler.vm_remotevm.jar.args
-javaCompiler...args
diff --git a/plugins/org.eclipse.jem.proxy/.options b/plugins/org.eclipse.jem.proxy/.options
deleted file mode 100644
index 95c080f85..000000000
--- a/plugins/org.eclipse.jem.proxy/.options
+++ /dev/null
@@ -1,9 +0,0 @@
-org.eclipse.jem.proxy/remote/debug/debugvm=false
-org.eclipse.jem.proxy/remote/debug/ioconsole=false
-org.eclipse.jem.proxy/remote/debug/vmtraceout=false
-org.eclipse.jem.proxy/remote/debug/notimeouts=false
-org.eclipse.jem.proxy/debug/traceexpressions=false
-org.eclipse.jem.proxy/debug/traceexpressionstimethreshold=100
-org.eclipse.jem.proxy/debug/logtrace=default
-org.eclipse.jem.proxy/debug/logtracefile=default
-org.eclipse.jem.proxy/debug/loglevel=default
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/.project b/plugins/org.eclipse.jem.proxy/.project
deleted file mode 100644
index 0f334e31a..000000000
--- a/plugins/org.eclipse.jem.proxy/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.proxy</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b7d372579..000000000
--- a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Apr 15 21:15:15 EDT 2007
-eclipse.preferences.version=1
-encoding//proxyCommon/org/eclipse/jem/internal/proxy/common/messages.properties=8859_1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 97edd2d25..000000000
--- a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,292 +0,0 @@
-#Mon Mar 12 17:19:57 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
-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.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.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.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.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.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 855e13665..000000000
--- a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:18 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 78eace43b..000000000
--- a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jun 16 11:08:13 EDT 2005
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.jem.proxy/vm_bin
diff --git a/plugins/org.eclipse.jem.proxy/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.proxy/META-INF/MANIFEST.MF
deleted file mode 100644
index 93c8752dd..000000000
--- a/plugins/org.eclipse.jem.proxy/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem.proxy; singleton:=true
-Bundle-Version: 2.0.100.qualifier
-Bundle-Activator: org.eclipse.jem.internal.proxy.core.ProxyPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.internal.proxy.awt,
- org.eclipse.jem.internal.proxy.common,
- org.eclipse.jem.internal.proxy.common.remote,
- org.eclipse.jem.internal.proxy.core,
- org.eclipse.jem.internal.proxy.ide,
- org.eclipse.jem.internal.proxy.ide.awt,
- org.eclipse.jem.internal.proxy.initParser,
- org.eclipse.jem.internal.proxy.initParser.tree,
- org.eclipse.jem.internal.proxy.remote,
- org.eclipse.jem.internal.proxy.remote.awt,
- org.eclipse.jem.internal.proxy.vm.remote
-Require-Bundle: org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.pde.core;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.3.0,4.0.0)";resolution:=optional
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jem.proxy/about.html b/plugins/org.eclipse.jem.proxy/about.html
deleted file mode 100644
index 266717d26..000000000
--- a/plugins/org.eclipse.jem.proxy/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.proxy/build.properties b/plugins/org.eclipse.jem.proxy/build.properties
deleted file mode 100644
index b449a7a33..000000000
--- a/plugins/org.eclipse.jem.proxy/build.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               vm/remotevm.jar,\
-               .options,\
-               about.html,\
-               META-INF/,\
-               .
-src.includes = about.html,\
-               schema/,\
-               proxy.jars
-jars.compile.order = .,\
-                     vm/remotevm.jar
-source.vm/remotevm.jar = vm_remotevm/
-output.vm/remotevm.jar = vm_bin/
-output.. = bin/
-source.. = proxyCommon/,\
-           initParser/,\
-           remoteCommon/,\
-           proxy/,\
-           proxyRemote/,\
-           proxyide/
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ArrayArguments.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ArrayArguments.java
deleted file mode 100644
index 05dd886a1..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ArrayArguments.java
+++ /dev/null
@@ -1,136 +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.proxy.initParser;
-/*
-
-
- */
-
-import java.io.StringWriter;
-import java.lang.reflect.Array;
-import java.util.*;
-/**
- * This represents the arguments in a multi dimensional array with construction parameters, e.g.
- * new int[][] { { 2 ,3 } , { 4 ,5 }}
- * the arguments of the constructor will be instance of ArrayArguments 
- */
-public class ArrayArguments extends Expression {
-	
-	Static fType;
-	List arguments = new ArrayList(2);
-	boolean argsClosed;
-	boolean insideArgsOpenedParen;
-	boolean insideArgsClosedParen;
-	
-public Expression push(char[] token, char tokenDelimiter) {
-	
-	// If the args are opened and a token was supplied then it must be an argument
-	//if ( argsOpened && ( tokenDelimiter == DelimiterCloseParen || tokenDelimiter == DelimiterComma || 
-	//tokenDelimiter == DelimiterSpace || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterPeriod)) {
-	if (!argsClosed){	
-		if ( arguments.size() > 0 ){
-			Expression openArgument = (Expression)arguments.get(arguments.size()-1);
-			if ( !openArgument.isComplete() ) {
-				openArgument.push(token,tokenDelimiter);
-				// If the argument is complete and we received a ) then the message is complete
-				if ( openArgument.isComplete() && tokenDelimiter == DelimiterCloseElipse){
-					argsClosed = true;
-				}
-				return this;
-			}
-		}	
-		
-		// We must have a new argument - process accordingly	
-		Expression newArgument = null;
-		if (!insideArgsOpenedParen && tokenDelimiter == DelimiterOpenParen){
-			insideArgsOpenedParen = true;
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-
-		}
-		if ( token.length > 0 || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterSingleQuote || tokenDelimiter == OperMinus ) {
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-		}
-		// If the token after the argument is a ) then the message is being closed
-		if ( !insideArgsOpenedParen  && tokenDelimiter == DelimiterCloseElipse ) {
-			argsClosed = true;
-			return this;
-		}
-		if ( insideArgsOpenedParen  && tokenDelimiter == DelimiterCloseElipse ) {
-			insideArgsClosedParen  = true;
-			argsClosed = true;
-			return this;
-		}
-	}
-	return this;
-}
-/**
- * In the case of the expression new int[][] { {2,3} , {4,5} } then we are the 2,3 or the 4,5
- * to evaluate we must return an array of ints based on our size.  The type we return is determined by the initial 
- * constructor who will have given this to us as our fType
- */	
-public Object evaluate() throws Exception {
-
-	Object result = Array.newInstance(fType.getPrimitiveTypeClass(),arguments.size());
-	for (int i = 0; i < arguments.size(); i++) {
-		Object argumentValue = ((Expression)arguments.get(i)).evaluate();
-		Array.set(result,i,argumentValue);
-	}
-	return result;
-}
-
-public Class getTypeClass() throws Exception {
-	return null;
-}
-
-public boolean isComplete() {
-	return argsClosed;
-}
-
-public boolean isPrimitive() throws Exception {
-	return false;
-}
-public void setType(Static type) {
-	fType = type;
-}
-public void contributeArgumentNumber(List argumentNumberList){
-	
-	// Add the number of arguments we have to the list
-	argumentNumberList.add(new Integer(arguments.size()));
-	// If our arguments are themselves array arguments ( which will occur in an array of 3 or more dimensions )
-	// then we should cascade this message to our argument so that the total array depth is known
-	if ( arguments.size() > 0 ) {
-		Object firstArgument = arguments.get(0);
-		if ( firstArgument instanceof ArrayArguments ) {
-//			((ArrayArguments)firstArgument)contributeArgumentNumber(argumentNumberList);
-		}
-	}
-	
-}
-public String toString(){
-	StringWriter writer = new StringWriter();
-	writer.write("Args("); //$NON-NLS-1$
-	writer.write(new Integer(arguments.size()).toString());
-	writer.write(")-"); //$NON-NLS-1$
-	writer.write(arguments.toString());
-	return writer.toString();
-}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
-	 */
-	protected String getTypeClassName() {
-		return "";	// Not applicable //$NON-NLS-1$
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Block.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Block.java
deleted file mode 100644
index 98c72fb68..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Block.java
+++ /dev/null
@@ -1,113 +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.proxy.initParser;
-/*
-
-
- */
-
-/**
- */
-public class Block extends Expression {
-	
-	protected boolean fIsClosed = false;
-	protected boolean fIsComplete = false;
-	protected boolean fMessageOrField = false;
-	
-	public Block(Expression anExpression){
-		currentExpression = anExpression;
-	}
-
-	public Block(ClassLoader fClassLoader){
-		currentExpression = new Statement(fClassLoader);
-	}
-
-	public Object evaluate() throws Exception {
-		return currentExpression.evaluate();
-	}
-
-	public boolean isComplete() {
-		return fIsComplete;
-	}
-
-	public Class getTypeClass() throws Exception {
-		return currentExpression.getTypeClass();
-	}
-
-
-	public Expression push(char[] token, char tokenDelimiter) {
-			
-		// If we are closed (i.e. completed with a )) and we get a ) or , then we are all finished up
-		// We should not forward this token to the expression, as it isComplete
-		if ((fIsClosed || currentExpression.isComplete()) && (tokenDelimiter == DelimiterCloseParen || tokenDelimiter == DelimiterComma)){
-			fIsComplete = true;
-			return this;
-		}
-		
-		// If we are a message of field and we get a ( we are message or a field otherwise
-		if (fMessageOrField){
-			fMessageOrField = false;
-			// The problem now is that we are a block of an expression and we need to create a message
-			// where we are the receiver.  However we are on the stack and going to be popped when the message finishes
-			// so we must alter ourself to be a block whose current expression is message whose argument
-			// is a copy of us
-			if ( tokenDelimiter == DelimiterOpenParen){
-				Message message = new Message(currentExpression,token,fClassLoader);
-				currentExpression = message;
-				return message;
-			} else {
-				Field field = new Field(currentExpression,token,fClassLoader);
-				currentExpression = field;
-				return field;
-			}
-		}
-		
-		// If we are closed and we get a . then we must begin a message or field expression
-		if (currentExpression.isComplete() && tokenDelimiter == DelimiterPeriod ){
-			fMessageOrField = true;
-			return this;
-		}
-		
-		Expression result = currentExpression.push(token,tokenDelimiter);
-		// If the result if a push then push the stack
-		if ( result != currentExpression ) {
-			pushExpressionStack(result);	
-		}
-		// If our current expression is complete and we are receiving a close parent then we are closed
-		if (currentExpression.isComplete() && tokenDelimiter == DelimiterCloseParen){
-			fIsClosed = true;
-
-		}
-		// If we are here the current expression is still processing tokens so we should return it
-		return currentExpression;
-	}
-
-	public boolean isPrimitive() throws Exception {
-		return false;
-	}
-	public String toString(){
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("Block("); //$NON-NLS-1$
-		if ( currentExpression != null ) {
-			buffer.append(currentExpression.toString());
-		}
-		buffer.append(')');
-		return buffer.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
-	 */
-	protected String getTypeClassName() {
-		return currentExpression.getTypeClassName();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/BooleanLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/BooleanLiteral.java
deleted file mode 100644
index e8a15f708..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/BooleanLiteral.java
+++ /dev/null
@@ -1,63 +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.proxy.initParser;
-/*
-
-
- */
-
-
-public class BooleanLiteral extends Expression {
-	public boolean value;
-public BooleanLiteral(boolean aValue){
-
-	value = aValue;
-
-}
-
-public boolean isComplete(){
-	return true;
-}
-/**
- * evaluate method comment.
- */
-public Object evaluate() {
-	return new Boolean(value);
-}
-/**
- * evaluate method comment.
- */
-public Class getTypeClass(){
-	return Boolean.TYPE;
-}
-/**
- * true or false cannot consume any kind of expression so we must return null
- */
-public Expression push(char[] token , char delimiter){
-
-	return null;	
-
-}
-
-/**
- * This is primitive
- */
-public boolean isPrimitive() {
-	return true;
-}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
-	 */
-	protected String getTypeClassName() {
-		return Boolean.TYPE.getName();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessArrayTypesException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessArrayTypesException.java
deleted file mode 100644
index 5defcb9ec..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessArrayTypesException.java
+++ /dev/null
@@ -1,29 +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.proxy.initParser;
-/*
-
-
- */
-
-/**
- * Exception to indicate that the initStringParser can't deal with arrays right now
- */
-public class CannotProcessArrayTypesException extends RuntimeException {
-
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 * 
-	 * @since 1.1.0
-	 */
-	private static final long serialVersionUID = -4245984020065761634L;
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessInnerClassesException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessInnerClassesException.java
deleted file mode 100644
index 5cbecd1c2..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessInnerClassesException.java
+++ /dev/null
@@ -1,29 +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.proxy.initParser;
-/*
-
-
- */
-
-/**
- * This exception is thrown to indicate that inner classes cannot be processed
- */
-public class CannotProcessInnerClassesException extends RuntimeException {
-
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 * 
-	 * @since 1.1.0
-	 */
-	private static final long serialVersionUID = 8290504580738499445L;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Cast.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Cast.java
deleted file mode 100644
index ef70b80dd..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Cast.java
+++ /dev/null
@@ -1,173 +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.proxy.initParser;
-/*
-
-
- */
-
-
-import java.util.HashMap;
-
-public class Cast extends Expression {
-	protected static final int BYTE_TYPE = 0;
-	protected static final int SHORT_TYPE = 1;
-	protected static final int INT_TYPE = 2;
-	protected static final int LONG_TYPE = 3;
-	protected static final int FLOAT_TYPE = 4;
-	protected static final int DOUBLE_TYPE = 5;
-	
-	protected static final HashMap sTypeLookup;
-	static {
-		sTypeLookup = new HashMap(6);
-		sTypeLookup.put(Byte.TYPE, new Integer(BYTE_TYPE));
-		sTypeLookup.put(Short.TYPE, new Integer(SHORT_TYPE));
-		sTypeLookup.put(Integer.TYPE, new Integer(INT_TYPE));
-		sTypeLookup.put(Long.TYPE, new Integer(LONG_TYPE));
-		sTypeLookup.put(Float.TYPE, new Integer(FLOAT_TYPE));
-		sTypeLookup.put(Double.TYPE, new Integer(DOUBLE_TYPE));
-	}
-		
-	protected Static fCastType;
-	protected boolean fIsClosed = false;
-	
-	public Cast(Static castType, ClassLoader aClassLoader) {
-		fCastType = castType;
-		fClassLoader = aClassLoader;
-	}
-	
-	public boolean isPrimitive() throws Exception {
-		return getTypeClass().isPrimitive();
-	}
-	
-	/**
-	 * The type of a Cast expression is the type of the cast type.
-	 */
-	public Class getTypeClass() throws Exception {
-		return fCastType.getTypeClass();
-	}
-	
-	
-	public boolean isComplete() {
-		return currentExpression != null && currentExpression.isComplete();
-	}
-	
-	/**
-	 * If the type is primitive, then we need to
-	 * convert the value, otherwise just pass
-	 * the value on.
-	 *
-	 * This is important for primitives because if your
-	 * entire initialization string was simply "(short) 3"
-	 * then a Short value must be returned so that the
-	 * correct kind of primitive proxy is created.
-	 */
-	public Object evaluate() throws Exception {
-		if (getTypeClass() == currentExpression.getTypeClass())
-			return currentExpression.evaluate();	// They're the same, so just return it.
-		if (getTypeClass().isPrimitive()) {
-			// Can only cast a primitive to a primitive, except null can't be cast to a primitive.
-			if (!currentExpression.getTypeClass().isPrimitive() || currentExpression.getTypeClass() == Void.TYPE)
-				throw new EvaluationException(new ClassCastException(currentExpression.getTypeClass().getName()));			
-			// boolean only allows boolean cast.
-			if (fCastType.getTypeClass() == Boolean.TYPE || currentExpression.getTypeClass() == Boolean.TYPE)
-				throw new EvaluationException(new ClassCastException(currentExpression.getTypeClass().getName()));
-			if (fCastType.getTypeClass() == Character.TYPE) {
-				// So we have either a Character or a number as the value. Cast that.				
-				return new Character((char) ((Number) currentExpression.evaluate()).intValue());
-			} else {
-				Number value = null;
-				// See if the value is character or a number.
-				if (currentExpression.getTypeClass() == Character.TYPE)
-					value = new Integer(((Character) currentExpression.evaluate()).charValue());
-				else
-					value = (Number) currentExpression.evaluate();
-				switch (((Integer) sTypeLookup.get(fCastType.getTypeClass())).intValue()) {
-					case BYTE_TYPE:
-						return new Byte(value.byteValue());
-					case SHORT_TYPE:
-						return new Short(value.shortValue());
-					case INT_TYPE:
-						return new Integer(value.intValue());
-					case LONG_TYPE:
-						return new Long(value.longValue());
-					case FLOAT_TYPE:
-						return new Float(value.floatValue());
-					case DOUBLE_TYPE:
-						return new Double(value.doubleValue());
-					default:
-						return null;	// Shouldn't occur. Just satisifies compiler.
-				}
-			}
-			
-		} else
-			return currentExpression.evaluate();
-	}
-	/**
-	 * A cast expression always pushes onto the cast value
-	 */
-	public Expression push(char[] token , char tokenDelimiter) {
-		// If we don't have a class yet then we are within the statement to try and deterine the type being cast to
-		if(fCastType.getPrimitiveTypeClass() == null && !fIsClosed){
-			fCastType.push(token,tokenDelimiter);
-			// If the type was completed and we have a ) then close us
-			if(fCastType.getPrimitiveTypeClass() != null && tokenDelimiter == DelimiterCloseParen){
-				fIsClosed = true;
-			}
-			return this;			
-		}
-		
-		if (!fIsClosed) {
-			// The cast is not closed, but we have a static class.  This class must therefore keep processing the tokens as it could be a method or message send
-			Expression result =  fCastType.push(token,tokenDelimiter);
-			result.parenthesisLevel++;
-			return result; 
-		}
-		
-		// If we have no expression push onto the cast value		
-		if(currentExpression == null){
-			currentExpression = new Statement(fClassLoader);
-			currentExpression = currentExpression.push(token,tokenDelimiter);
-			return this;
-		} 
-		Expression result = currentExpression.push(token, tokenDelimiter);
-		// If the result if a push then push the stack
-		if ( result.isComplete() ) {
-			popExpressionStack();
-		} else if ( result != currentExpression ) {
-			pushExpressionStack(result);
-		}		
-		return this;
-	}
-	public String toString(){
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("Cast("); //$NON-NLS-1$
-		if (fCastType != null){
-			buffer.append(fCastType.toString());
-		} else {
-			buffer.append("???"); //$NON-NLS-1$
-		}
-		buffer.append(") "); //$NON-NLS-1$
-		if ( currentExpression != null){
-			buffer.append(currentExpression.toString());
-		} else {
-			buffer.append("???");			 //$NON-NLS-1$
-		}
-		return buffer.toString();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
-	 */
-	protected String getTypeClassName() {
-		return fCastType.getTypeClassName();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java
deleted file mode 100644
index 88ad26c39..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java
+++ /dev/null
@@ -1,114 +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.proxy.initParser;
-/*
-
-
- */
-
-import java.text.MessageFormat;
-
-
-
-public class CharLiteral extends Expression {
-	protected boolean isComplete;
-	public char value;
-	public StringBuffer valueBuffer = new StringBuffer();
-	protected boolean isEscaped = false;
-
-/**
- * constructor
- */
-public CharLiteral(){
-}
-	
-/**
- * evaluate method comment.
- */
-public Object evaluate() throws Exception {
-	if (valueBuffer.length() == 1)
-		return new Character(valueBuffer.charAt(0));
-	else
-		throw new EvaluationException(
-			new IllegalArgumentException(MessageFormat.format(ProxyInitParserMessages.getString("CharTooComplicated_EXC_"), //$NON-NLS-1$
-				new Object[] {valueBuffer.toString()})));
-}
-
-public boolean isComplete(){
-	return isComplete;
-}
-/**
- * We must evaluate ourself and return the type of the result
- */
- 
-public Class getTypeClass() {
-	return Character.TYPE;
-}
-
-protected String getTypeClassName() {
-	return Character.TYPE.getName();
-}
-/**
- *This string might be broken into a few tokens
- *so we need a StringBuffer 
- */
-public Expression push(char[] token , char delimiter){
-	
-	if (isEscaped) {
-		isEscaped = false;
-		if (token.length != 0) {
-			// Had an escape followed by stuff, so not a true esc for our current definition
-			valueBuffer.append(DelimiterEscape);
-		} else {
-			if (delimiter == DelimiterSingleQuote || delimiter == DelimiterEscape)
-				valueBuffer.append(delimiter);	// It was a true escape.
-			else {
-				valueBuffer.append(DelimiterEscape);	// If wasn't a true escape
-				valueBuffer.append(delimiter);
-			}
-			return this;
-		}
-	}
-	
-	valueBuffer.append(token);
-	
-	if (delimiter == DelimiterSingleQuote){		
-		isComplete =true;
-		return this;
-	}
-	
-	// If the delimiter is an escape character remember it so we can escape
-	// the next token, otherwise treat it as a literal
-	if (delimiter == DelimiterEscape ){
-		isEscaped = true;
-	} else {
-		valueBuffer.append(delimiter);
-	}
-	return this;
-}
-
-/**
- * chars are primitives.
- */
-public boolean isPrimitive() {
-	return true;
-}
-public String toString(){
-	StringBuffer buffer = new StringBuffer();
-	buffer.append("Char('"); //$NON-NLS-1$
-	if ( valueBuffer != null ) {
-		buffer.append(valueBuffer.toString());
-	}
-	buffer.append(')');
-	return buffer.toString();
-}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Constructor.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Constructor.java
deleted file mode 100644
index 0094e4837..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Constructor.java
+++ /dev/null
@@ -1,339 +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.proxy.initParser;
-/*
-
-
- */
-
-
-import java.util.*;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-/**
- * Insert the type's description here.
- * Creation date: (11/01/00 8:52:36 PM)
- * @author: Administrator
- */
-public class Constructor extends Expression {
-	public boolean argsOpened = false;
-	public boolean argsClosed = false;
-	public boolean trailingPeriod = false;
-	public ArrayList arguments = new ArrayList(2);
-	public Static type;
-	protected boolean fIsComplete;
-	public boolean insideArgsOpenedParen = false;
-	public boolean insideArgsClosedParen = false;
-	public boolean isString = false;
-	public java.lang.reflect.Constructor ctor;
-/**
- * Constructor constructor comment.
- */
-public Constructor(ClassLoader aClassLoader) {
-	super();
-	fClassLoader = aClassLoader;
-}
-
-public boolean isComplete(){
-	return fIsComplete;
-}
-
-/**
- * Invoke the construtor
- */
-public Object evaluate() throws Exception {
-
-	if ( type.isArray() ) {
-		// For arrays we get the array that is actually held inside the static
-		// To instantiate the array it is possible that the static knows the array size, e.g. new int[2]
-		// or else it must be given this from the number of arguments we have, e.g. new int[] { 2 , 3 }
-		if ( arguments.size() > 0 ) {
-			type.setArrayArguments(arguments);
-		}
-		Object result = type.evaluate();
-		// Deal with array initialization arguments
-		return result;
-	} else {
-		// For non arrays we find the method and invoke it on the type
-		cacheCtor();
-		// Get the array of arguments
-		Object[] args = new Object[arguments.size()];
-		Iterator itr = arguments.iterator();
-		for (int i = 0; i < arguments.size() ; i++){
-			Expression anExpression = (Expression)itr.next();
-			args[i] = anExpression.evaluate();
-		}
-	
-		try {
-			return ctor.newInstance(args);	
-		} catch (Exception e) {
-			// If we got this far, then we have a valid parse, so anything is an evaluation exception.
-			throw new EvaluationException(e);
-		}
-	}
-}
-/** A constructor can only return the class of its type
- */
-public Class getTypeClass() throws Exception {
-	if ( type.isArray() ) {
-		// For arrays we get the array that is actually held inside the static
-		// To instantiate the array it is possible that the static knows the array size, e.g. new int[2]
-		// or else it must be given this from the number of arguments we have, e.g. new int[] { 2 , 3 }
-		if ( arguments.size() > 0 ) {
-			type.setArrayArguments(arguments);
-		}
-	}
-	return type.getTypeClass();
-}
-
-protected String getTypeClassName() {
-	return type.getTypeClassName();
-}
-
-private void cacheCtor() throws Exception {
-	
-	if (ctor == null) {
-		Class[] argTypes = new Class[arguments.size()];
-		Iterator itr = arguments.iterator();
-		for (int i=0; i<argTypes.length; i++)
-			argTypes[i] = getEvaluationTypeClass((Expression) itr.next());
-			
-		try {
-			ctor = MethodHelper.findCompatibleConstructor(getEvaluationTypeClass(this), argTypes);
-		} catch (NoSuchMethodException e) {
-			throw new EvaluationException(e);
-		} catch (AmbiguousMethodException e) {
-			throw new EvaluationException(e);
-		} catch (IllegalAccessException e) {
-			throw new EvaluationException(e);
-		}
-	}
-}
-protected boolean isDelimiterOpened(char token){
-	return type.isArray() ? token == DelimiterOpenElipse : token == DelimiterOpenParen;	
-}
-protected boolean isDelimiterClosed(char token){
-	return type.isArray() ? token == DelimiterCloseElipse : token == DelimiterCloseParen;
-}
-/**
- * push method comment.
- */
-public Expression push(char[] token, char tokenDelimiter) {
-
-	// If we are closed and we receive a . with no token then remember this
-	if ( argsClosed && !trailingPeriod && tokenDelimiter == DelimiterPeriod && token.length == 0 ) {
-		trailingPeriod = true;
-		return this;
-	}
-	// If we have been closed with a . and we receive a . then we are a field
-	if ( trailingPeriod && tokenDelimiter == DelimiterPeriod ) {
-		return new Field(this,token,fClassLoader);
-	}
-	// If we have been closed with a . and we receive a ( we are a message
-	if ( trailingPeriod && tokenDelimiter == DelimiterOpenParen ) {
-		return new Message(this,token,fClassLoader);
-	}
-	
-	// Lazy initialize the type if required
-	if ( type == null ) {
-		switch ( tokenDelimiter ) {
-			case DelimiterPeriod: {
-				type = new Static(token,tokenDelimiter,fClassLoader);
-				type.setClassLoader(fClassLoader);
-				return this;
-			}
-			case DelimiterOpenParen: {
-				type = new Static(token,tokenDelimiter,fClassLoader);
-				type.setClassLoader(fClassLoader);
-				argsOpened = true;
-				return this;
-			} 
-			case DelimiterOpenSquareBrace: { 
-//				throw new CannotProcessArrayTypesException();
-				// Array dimenions are created as staements in the arrayDimensions
-				// This is for expressions like new String[] or new String[3], where the Statement represents the 3, i.e.
-				// the code that declares the size of the array
-				type = new Static(token,tokenDelimiter,fClassLoader,true);
-				return this;
-			}
-			// If we get a { and our static is an array then this is the array initialization parameters
-			case DelimiterOpenElipse: { 
-				if ( type != null && type.isArray() ) {
-					argsOpened = true;
-				}
-			}
-			default: {
-				return null;
-			}
-		}
-	}
-	
-	// If we have a static that is an array then it consumes token until it is complete
-	if ( type != null && type.isArray() ) {
-		// The type consumes token as long as it is still in the array declaration section
-		if ( type.isProcessingArrayDimension || tokenDelimiter == DelimiterOpenSquareBrace ) {
-			type.push(token,tokenDelimiter);
-			return this;
-		}
-	}
-		
-	// If the type is incomplete and the token is a . ( for another class ) or a [ for an array then push it onto the type
-	if (!type.isArray() && type.getTypeClass() == null && (tokenDelimiter == DelimiterPeriod || tokenDelimiter == DelimiterOpenSquareBrace)) {
-		type.push(token , tokenDelimiter);
-		return this;
-	}
-	// If the type is incomplete and the token is a ( then push it onto the type and open the parens
-	if (!type.isArray()){
-		if (type.getTypeClass() == null && !argsOpened && isDelimiterOpened(tokenDelimiter)) {
-			argsOpened = true;
-			insideArgsOpenedParen = true;
-			type.push(token , DelimiterSpace );
-			return this;
-		}
-	} else { 
-		if ( !argsOpened && isDelimiterOpened(tokenDelimiter)) {
-			argsOpened = true;
-			insideArgsOpenedParen = true;
-			return this;			
-		}
-	}
-	
-	// If the args are already closed and we get another close expression, then just return ourselves
-	// This occurs in the case of nested array arguments within constructors
-	if ( argsClosed && (tokenDelimiter == DelimiterCloseParen)){
-		fIsComplete = true;
-		return this;
-	}
-	
-	// If the arguments are closed and we receive a { then this is an inner class declaration, e.g.
-	// new javax.swing.table.DefaultTableModel(){}
-	// This can't be processed by us so we need to throw an exception
-	if (argsClosed && tokenDelimiter == DelimiterOpenElipse ) {
-		throw new CannotProcessInnerClassesException();
-	}
-
-	// If the args are opened and a token was supplied then it must be an argument
-	if (argsOpened){
-		// If we already have an incomplete argument then this may be a constructor, a static reference, etc...
-		// and we should forward the request to the argument
-		Expression openArgument = null;
-		if ( arguments.size() > 0 ){
-			openArgument = (Expression)arguments.get(arguments.size()-1);
-			if ( !openArgument.isComplete() ) {
-				openArgument.push(token,tokenDelimiter);
-				// If the argument is complete and we received a ) then the constructor is complete
-				// or if we receive a } and are an array we are complete
-				if ( openArgument.isComplete() && isDelimiterClosed(tokenDelimiter) ){
-					argsClosed = true;
-				}
-				return this;
-			} 
-		}
-			
-		Expression newArgument = null;
-		// If we are not already inside the open arg and we get another open paren this is probably a cast
-		// or some kind of statement, and OperMinus is probably the start of a number
-		// If the args are not already open we must be opened with either a { or a ( depending on whether we are an array or not
-		// however if the args are opened already and we receive a ( then this is the start of a new statement
-//		if ((!insideArgsOpenedParen && isDelimiterOpened(tokenDelimiter)) || tokenDelimiter == DelimiterOpenParen){
-		if (tokenDelimiter == DelimiterOpenElipse || tokenDelimiter == DelimiterOpenParen){
-			insideArgsOpenedParen = true;
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			if ( newArgument instanceof ArrayArguments ) {
-				((ArrayArguments)newArgument).setType(type);
-			}
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-
-		}
-		
-		// Start of a possible string or number or character
-		if ( ( token.length > 0 || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterSingleQuote) || tokenDelimiter == OperMinus ){
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-		}
-		// If the token after the argument is a ) then the message is being closed
-		if ( !insideArgsOpenedParen || argumentsAreComplete() && isDelimiterClosed(tokenDelimiter) ) {
-			argsClosed = true;
-			return this;
-		}
-		if ( insideArgsOpenedParen && isDelimiterClosed(tokenDelimiter) ) {
-			insideArgsClosedParen  = true;
-			return this;
-		}
-
-		// If the token after the argument is a , or a ' ' then the argument is being closed
-		if ( tokenDelimiter == DelimiterComma || tokenDelimiter == DelimiterSpace ) {
-			// If our arguments are closed then we must be complete.  We need to signal the fact we are closed
-			// otherwise we will not be processed correctly if we are part of a stack 
-			if ( argsClosed ) {
-				fIsComplete = true;
-			}			
-			return this;
-		}
-		
-		// If we receive a close bracket then we are closed as long as the last argument is closed
-		if(argsOpened &&  isDelimiterClosed(tokenDelimiter)){
-			// No parms - we are a closed constructor
-			if(arguments.size() == 0){
-				argsClosed = true;
-				return this;
-			} 
-		}
-		
-		// If our last argument is closed and receive a ) and we have no new argument then we are closed
-		if (tokenDelimiter == DelimiterCloseParen && newArgument == null){
-			Expression lastArgument = (Expression)arguments.get(arguments.size()-1);
-			if ( lastArgument.isComplete() ) {
-				argsClosed = true;
-				return this;
-			}
-		}			
-				
-		// Otherwise the new argument is stil processing.  Return it
-		return newArgument;
-	}
-
-	return this;
-}
-protected boolean argumentsAreComplete(){
-	if ( arguments.size() == 0) return true;
-	return ((Expression)arguments.get(arguments.size()-1)).isComplete();
-}
-public String toString(){
-
-	java.io.StringWriter writer = new java.io.StringWriter();
-	writer.write("Constructor \""); //$NON-NLS-1$
-	if ( type != null ) {
-		writer.write(type.typeWriter.toString());
-	} else {
-		writer.write("UNTYPED"); //$NON-NLS-1$
-	}
-	for (int i = 0; i < arguments.size() ; i++){
-		writer.write(" Arg("); //$NON-NLS-1$
-		writer.write("" + (i+1)); //$NON-NLS-1$
-		writer.write(") = "); //$NON-NLS-1$
-		writer.write(arguments.get(i).toString());
-	}
-	
-	return writer.toString();
-
-}
-
-/**
- * This is never primitive
- */
-public boolean isPrimitive() {
-	return false;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/EvaluationException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/EvaluationException.java
deleted file mode 100644
index 67215b935..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/EvaluationException.java
+++ /dev/null
@@ -1,46 +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.proxy.initParser;
-/*
-
-
- */
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * This is an InitializationStringEvaluationException, but
- * in addition, the exception that it wrappers is what should be
- * returned. This means it was a valid exception, parsing had
- * gone fine, but it was an evaluation that occured. This is
- * distinguished from the straight InitializationStringEvaluationException,
- * which means some error during parsing and evaluation.
- * 
- * Note: InvocationTargetExceptions will be unwrappered to the true exception.
- */
-public class EvaluationException extends InitializationStringEvaluationException {
-
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 * 
-	 * @since 1.1.0
-	 */
-	private static final long serialVersionUID = -6997239021885310986L;
-
-	/**
-	 * Constructor for ReturnableException.
-	 * @param exc
-	 */
-	public EvaluationException(Throwable exc) {
-		super(exc instanceof InvocationTargetException ? ((InvocationTargetException) exc).getTargetException() : exc);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Expression.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Expression.java
deleted file mode 100644
index 22bf67c25..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Expression.java
+++ /dev/null
@@ -1,130 +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.proxy.initParser;
-/*
-
-
- */
-
-
-import java.util.*;
-/**
- * Insert the type's description here.
- * Creation date: (11/01/00 8:46:44 PM)
- * @author: Administrator
- */
-public abstract class Expression implements IParserConstants {
-	protected Expression currentExpression;
-	protected List fExpressionStack;
-	protected ClassLoader fClassLoader;
-	public int parenthesisLevel = 0;
-/** Compare the two char arrays
- */
-public static boolean compare(char[] from , char[] to){
-
-	return Arrays.equals(from, to);
-}
-/**
- * Expression constructor comment.
- * Note: If any exceptions that are due to evaluation, and not due to some
- * invalid state, then the exception should be wrappered in an EvaluationException,
- * and the EvaluationException thrown instead. This way we can distinquish between
- * valid exceptions that result evaluations (such as null pointer exceptions) from
- * parser errors due to string is too complicated.
- */
-public abstract Object evaluate() throws Exception;
-
-public abstract boolean isComplete();
-/**
- * Return a class type that the expression syntactically would produce.
- * For example, if a field is of type XYZ, return XYZ, even though
- * the value of the field may be SubXYZ where SubXYZ is a subclass of XYZ.
- */
-public abstract Class getTypeClass() throws Exception;
-/**
- * In evaluation phase, get the type class from the expression.
- * If typeclass not found, then a ClassCastException is thrown.
- * @param exp To getTypeClass from
- * @return type class.
- * @throws Exception ClassNotFoundException if type not found.
- */
-public Class getEvaluationTypeClass(Expression exp) throws Exception {
-	Class cls = exp.getTypeClass();
-	if (cls == null)
-		throw new EvaluationException(new ClassNotFoundException(exp.getTypeClassName()));
-	return cls;
-}
-
-/**
- * @return Type name that should be returned from this expression.
- */
-protected abstract String getTypeClassName();
-
-public boolean isNumber(char[] token){
-
-	if ( token.length == 0) return false;
-	// See whether the token is a number
-	int parsePosition = 0;
-	// Take into account it may start with a - sign, e.g. -1
-	if ( token[0] == '-' ) parsePosition = 1;
-	for (int i = parsePosition; i < token.length ; i++){
-		// If the next token is a digit return true
-		// Other things like decimals or primitive types, e.g. 2.2 or 2.2f are 
-		// handled by NumberLiteral
-		return Character.isDigit(token[i]);
-	}
-	return true;
-}
-public boolean isPop(){
-	return false;
-}
-protected void popExpressionStack(){
-
-	if ( fExpressionStack != null && fExpressionStack.size() > 0 ) {
-		currentExpression = (Expression) fExpressionStack.remove(fExpressionStack.size()-1);
-	}	
-}
-protected void pushExpressionStack(Expression anExpression){
-
-	if ( fExpressionStack == null ) fExpressionStack = new ArrayList(2);
-	// The current expression should go onto the stack
-	fExpressionStack.add(currentExpression);
-	// The current expression is replaced with the argument
-	currentExpression = anExpression;
-	
-}	
-
-void setClassLoader(ClassLoader aClassLoader){
-}
-
-/**
- * Push an expression onto us
- * Return the new expression onto which subsequent token should be pushed
- */
-public abstract Expression push(char[] token , char tokenDelimiter);
-
-/**
- * Answer if this expression results in a primitive.
- */
-public abstract boolean isPrimitive() throws Exception;
-
-public String toString(int depth, boolean aBreak){
-	StringBuffer buffer = new StringBuffer();
-	if ( aBreak ) {
-		buffer.append(System.getProperty("System.lineSeparator")); //$NON-NLS-1$
-	}
-	for(int i=0;i<depth;i++){
-		buffer.append(" "); //$NON-NLS-1$
-	}
-	buffer.append(toString());
-	return buffer.toString();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java
deleted file mode 100644
index 4625ca986..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java
+++ /dev/null
@@ -1,146 +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.proxy.initParser;
-/*
-
-
- */
-
-
-/**
- * Insert the type's description here.
- * Creation date: (11/05/00 10:39:28 PM)
- * @author: Administrator
- */
-public class Field extends Expression {
-	public boolean isComplete;
-	protected java.lang.reflect.Field fField;
-	public Expression receiver;
-	public String fieldName;
-	protected Class fResultType;
-	
-public Field(Expression aReceiver , char[] token , ClassLoader aClassLoader){
-
-	receiver = aReceiver;
-	if ( token.length > 0 ){
-		fieldName = new String(token);
-	}
-
-}
-public boolean isComplete(){
-	return isComplete;
-}
-
-/**
- * Send the message to the receiver
- */
-public Object evaluate() throws Exception {
-	Object receiverValue = receiver.evaluate();	// So if it fails, we get an evaluation exception going on up.
-	try {
-		cacheField();		
-		return fField.get(receiverValue);
-	} catch (Exception e) {
-		throw new EvaluationException(e);	// Any exception at this point is an evaluation exception.
-	}
-}
-
-/**
- * Get the field from reflection.
- */
-protected void cacheField() throws Exception {
-	if (fField == null) {
-		Class aReceiverClass = getEvaluationTypeClass(receiver);
-		fField = aReceiverClass.getField(fieldName);
-		fResultType = fField.getType();		
-	}
-}
-
-/**
- * The result type is the type of the field.
- */
-public Class getTypeClass() throws Exception {
-	if ( fResultType == null ) {
-		cacheField();
-	}
-	return fResultType;
-}
-
-protected String getTypeClassName() {
-	return "";	// If we got this far, we don't know what it is. //$NON-NLS-1$
-}
-/**
- * push method comment.
- */
-public Expression push(char[] token, char tokenDelimiter) {
-
-	// If the delimiter is a ( then this is the start of a message
-	if ( tokenDelimiter == DelimiterOpenParen ) {
-		return new Message(this , token , fClassLoader);
-	}
-
-	// If the delimiter is a . then this is a field
-	if (token.length > 0  && ( tokenDelimiter == DelimiterPeriod || tokenDelimiter == DelimiterSpace
-	|| tokenDelimiter == DelimiterComma)) {
-		isComplete = true;
-		return new Field(this , token , fClassLoader);
-		
-	}
-	
-	if(fieldName != null && tokenDelimiter == DelimiterComma){
-		isComplete = true;
-		return this;
-	}
-	
-	// If we have no delimiter or a close paren then we have just received the field name
-	if (!isComplete && fieldName == null) {
-		fieldName = new String(token);
-		return this;
-	}
-	
-	if(tokenDelimiter == BitOR || tokenDelimiter == BitAND){
-		isComplete = true;
-		PrimitiveOperation result = new PrimitiveOperation(this,tokenDelimiter);
-		return result;
-	}
-	
-	// Ignore spaces as this maybe padding between the field and the next valid token
-	if(token.length == 0 && tokenDelimiter == ' ') return this;
-
-	throw new RuntimeException(java.text.MessageFormat.format(ProxyInitParserMessages.getString(ProxyInitParserMessages.UNEXPECTED_TOKEN), new Object[] {new StringBuffer(token.length+1).append(token).append(tokenDelimiter).toString()}));
-	
-}
-public String toString(){
-
-	java.io.StringWriter writer = new java.io.StringWriter();
-	writer.write("Field Name=\""); //$NON-NLS-1$
-	if ( fieldName != null ) {
-		writer.write(fieldName);
-	} else {
-		writer.write("UNNAMED"); //$NON-NLS-1$
-	}
-	writer.write("\" Receiver="); //$NON-NLS-1$
-	if ( receiver != null ){
-		writer.write(receiver.toString());
-	} else {
-		writer.write("NONE"); //$NON-NLS-1$
-	}
-	return writer.toString();
-
-}
-
-/**
- * Test the field type to determine if primitive or not.
- */
-public boolean isPrimitive() throws Exception {
-	cacheField();
-	return getTypeClass().isPrimitive();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/IParserConstants.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/IParserConstants.java
deleted file mode 100644
index dcc0f3b57..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/IParserConstants.java
+++ /dev/null
@@ -1,51 +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.proxy.initParser;
-/*
-
-
- */
-
-
-/**
- * Constants for the parser.
- * Creation date: (11/05/00 9:37:45 PM)
- * @author: Administrator
- */
-public interface IParserConstants {
-	// Define the delimiters
-	public static final char DelimiterSpace = ' ';
-	public static final char DelimiterPeriod = '.';
-	public static final char DelimiterOpenParen = '(';
-	public static final char DelimiterCloseParen = ')';
-	public static final char DelimiterComma = ',';
-	public static final char DelimiterQuote = '"';
-	public static final char DelimiterEscape = '\\';
-	public static final char DelimiterSingleQuote = '\'';
-	public static final char DelimiterOpenElipse = '{';
-	public static final char DelimiterCloseElipse = '}';	
-	public static final char DelimiterOpenSquareBrace = '[';
-	public static final char DelimiterCloseSquareBrace = ']';
-	// Define the math functions
-	public static final char OperPlus = '+';
-	public static final char OperMinus = '-';
-	public static final char OperMultiply = '*';
-	public static final char OperDivide = '/';
-	// Define the primitive functions
-	public static final char BitOR = '|';
-	public static final char BitAND = '&';
-	
-	// Define constants
-	public static final char[] ConstantNew = new char[] { 'n' , 'e' , 'w' };
-	public static final char[] ConstantTrue = new char[] { 't' , 'r' , 'u' , 'e' };
-	public static final char[] ConstantFalse = new char[] { 'f' , 'a' , 'l' , 's' , 'e' };
-	public static final char[] ConstantNull = new char[] { 'n' , 'u' , 'l' , 'l' };
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringEvaluationException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringEvaluationException.java
deleted file mode 100644
index 7a284c29d..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringEvaluationException.java
+++ /dev/null
@@ -1,34 +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.proxy.initParser;
-/*
-
-
- */
-
-
-
-public class InitializationStringEvaluationException extends Exception {
-	
-	
-/**
-	 * Comment for <code>serialVersionUID</code>
-	 * 
-	 * @since 1.1.0
-	 */
-	private static final long serialVersionUID = -8633390926210276727L;
-public InitializationStringEvaluationException(Throwable exc){
-	super(exc);
-}
-public Throwable getOriginalException(){
-	return getCause();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringParser.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringParser.java
deleted file mode 100644
index c6adc9e82..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringParser.java
+++ /dev/null
@@ -1,300 +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.proxy.initParser;
-/*
-
-
- */
-
-
-import java.util.ArrayList;
-/**
- * Insert the type's description here.
- * Creation date: (11/01/00 8:53:45 PM)
- * @author: Administrator
- */
-public class InitializationStringParser implements IParserConstants {
-	protected ClassLoader fClassLoader;
-	protected boolean isComplete = false;
-	protected String fInitString;
-	protected int fSourceLength;
-	protected char[] fSource;
-	protected int fSourcePosition = -1;
-	private char[] fCurrentToken;
-	private char fCurrentTokenDelimiter = 0;
-	protected ArrayList fExpressionStack = new ArrayList(4);
-	protected Expression fExpression;
-/**
- * InitializationStringParser constructor comment.
- */
-public InitializationStringParser(String initString){
-
-	fInitString = initString;
-	fSource = initString.toCharArray();
-	fSourceLength = fSource.length;
-
-}
-/** Look for a known token
- */
-protected void createNextToken(){
-
-	fCurrentTokenDelimiter = 0;
-	if ( fSourcePosition >= fSourceLength - 1 ) {
-		isComplete = true;
-		return;
-	}
-
-	fSourcePosition++;
-	// If we are not in a token then look for " " or else for a period
-	char[] fCurrentTokenSource = new char[fSourceLength];
-	int i = 0;
-	scanner : for ( ; fSourcePosition < fSourceLength ; fSourcePosition++ , i++ ){
-		// Advance the source position so when finding the next token we skip over the '.' or ' '
-		// Record the delimiter that was found
-		switch ( fSource[fSourcePosition] ) {
-			case DelimiterPeriod: {
-				fCurrentTokenDelimiter = DelimiterPeriod;
-				break scanner;
-			}
-			case DelimiterOpenParen: {
-				fCurrentTokenDelimiter = DelimiterOpenParen;
-				break scanner;
-			}
-			case DelimiterCloseParen: {
-				fCurrentTokenDelimiter = DelimiterCloseParen;
-				break scanner;
-			}
-			case DelimiterComma: {
-				fCurrentTokenDelimiter = DelimiterComma;
-				break scanner;
-			}
-			case DelimiterSpace: {
-				fCurrentTokenDelimiter = DelimiterSpace;
-				break scanner;
-			}
-			case DelimiterQuote: {
-				fCurrentTokenDelimiter = DelimiterQuote;
-				break scanner;
-			}
-			case DelimiterSingleQuote: {
-				fCurrentTokenDelimiter = DelimiterSingleQuote;
-				break scanner;
-			}			
-			case DelimiterEscape: {
-				fCurrentTokenDelimiter = DelimiterEscape;
-				break scanner;
-			}
-			case DelimiterOpenElipse:{
-				fCurrentTokenDelimiter = DelimiterOpenElipse;
-				break scanner;
-			}
-			case DelimiterOpenSquareBrace:{
-				fCurrentTokenDelimiter = DelimiterOpenSquareBrace;
-				break scanner;
-			}
-			case DelimiterCloseSquareBrace:{
-				fCurrentTokenDelimiter = DelimiterCloseSquareBrace;
-				break scanner;
-			}			
-			case DelimiterCloseElipse:{
-				fCurrentTokenDelimiter = DelimiterCloseElipse;
-				break scanner;
-			}				
-			// Do the math functions
-			case OperPlus: {
-				fCurrentTokenDelimiter = OperPlus;
-				break scanner;
-			}
-			case OperMinus: {
-				fCurrentTokenDelimiter = OperMinus;
-				break scanner;
-			}
-			case OperMultiply: {
-				fCurrentTokenDelimiter = OperMultiply;
-				break scanner;
-			}
-			case OperDivide: {
-				fCurrentTokenDelimiter = OperDivide;
-				break scanner;
-			}
-			// Do the primitive BitWise operations
-			case BitOR: {
-				fCurrentTokenDelimiter = BitOR;
-				break scanner;
-			}
-			case BitAND: {
-				fCurrentTokenDelimiter = BitAND;
-				break scanner;
-			}			
-			default: {
-				fCurrentTokenSource[i] = fSource[fSourcePosition];
-			}
-		}
-	}
-
-	// Push the token onto the stack for later decoding
-	if ( i >= 1 ) {
-		fCurrentToken = new char[i];
-		System.arraycopy( fCurrentTokenSource , 0 , fCurrentToken , 0 , i );
-	} else {
-		fCurrentToken = new char[0];
-	}
-
-}
-/** Answer the result of evaluating the expression
- */
-public Object evaluate() throws InitializationStringEvaluationException {
-
-	try {
-		return fExpression.evaluate();
-	} catch (java.lang.reflect.InvocationTargetException e) {
-		throw new EvaluationException(e);
-	} catch (EvaluationException e) {
-		throw e;	// Don't loose these
-	} catch (Exception e) {
-		throw new InitializationStringEvaluationException(e);
-	}
-
-}
-public static Object evaluate(String initString) throws InitializationStringEvaluationException {
-
-	return evaluate(initString,null);
-
-}
-public static Object evaluate(String initString,ClassLoader aClassLoader) throws InitializationStringEvaluationException {
-
-	InitializationStringParser parser = null;;
-	try {
-		parser = new InitializationStringParser(initString);
-		parser.setClassLoader(aClassLoader);
-		parser.parse();
-	} catch ( Throwable exc ) {
-		throw new InitializationStringEvaluationException(exc);
-	}		
-	return parser.evaluate();
-}
-
-/**
- * Return a parser already parsed. Use the default classloader (i.e. classloader that loaded InitializationStringParser).
- * 
- * @param initString
- * @return The parser, already parsed.
- * @throws InitializationStringEvaluationException
- */
-
-public static InitializationStringParser createParser(String initString) throws InitializationStringEvaluationException {
-	return createParser(initString, null);
-}
- 
-/**
- * Return a parser already parsed. Use the given classloader.
- * 
- * @param initString
- * @param classLoader
- * @return The parser, already parsed.
- * @throws InitializationStringEvaluationException
- */
-public static InitializationStringParser createParser(String initString, ClassLoader classLoader) throws InitializationStringEvaluationException {
-
-	try {
-		InitializationStringParser parser = new InitializationStringParser(initString);
-		parser.setClassLoader(classLoader);
-		parser.parse();
-		return parser;
-	} catch ( Throwable exc ) {
-		throw new InitializationStringEvaluationException(exc);
-	}
-
-}
-
-/** Analyze the string
- */
-public void parse(){
-	
-	createFirstExpression();
-	int i =1;
-	while ( true ){
-		createNextToken();
-		if ( isComplete ) {
-			// If the current expression is incomplete it must be completed 
-			// by the end, which is basically the equiavlent of a;
-			return;
-		} else  {
-			i++;
-			Expression result = fExpression.push( fCurrentToken , fCurrentTokenDelimiter );
-			// If the result if a push then push the stack
-			if ( result.isComplete() ) {
-				popExpressionStack();
-			} else if ( result != fExpression ) {
-				pushExpressionStack(result);
-			}
-		}
-	}
-}
-
-/**
- * Answer if the string results in a primitive.
- */
-public boolean isPrimitive() throws InitializationStringEvaluationException {
-	try {
-		return fExpression.isPrimitive();
-	} catch (Exception e) {
-		throw new InitializationStringEvaluationException(e);
-	}
-}
-
-public Class getExpectedType() throws InitializationStringEvaluationException {
-	try {
-		return fExpression.getTypeClass();
-	} catch (Exception e) {
-		throw new InitializationStringEvaluationException(e);
-	}
-}
-
-/* Pop the top expression off the stack
- */
-protected void popExpressionStack(){
-
-	if ( fExpressionStack.size() > 0 ) {
-		fExpression = (Expression) fExpressionStack.remove(fExpressionStack.size()-1);
-	}	
-}
-/* Push the expression onto the stack
- */
-protected void pushExpressionStack(Expression anExpression){
-
-	// The current expression should go onto the stack
-	fExpressionStack.add(fExpression);
-	// The current expression is replaced with the argument
-	fExpression = anExpression;
-	
-}
-protected void createFirstExpression(){
-	if ( fExpression == null ) {
-		fExpression = new Statement(fClassLoader);
-	};
-}
-public void setClassLoader(ClassLoader aClassLoader){
-	fClassLoader = aClassLoader;	
-}
-public String toString(){
-	StringBuffer writer = new StringBuffer();
-	writer.append("Parser. token=\""); //$NON-NLS-1$
-	if ( fCurrentToken != null ) {
-		writer.append(fCurrentToken);
-	} 
-	writer.append("\", delim=\""); //$NON-NLS-1$
-	writer.append(fCurrentTokenDelimiter);
-	writer.append("\", initString=\""); //$NON-NLS-1$
-	writer.append(fInitString);
-	return writer.toString();	
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Message.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Message.java
deleted file mode 100644
index 35ccad96b..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Message.java
+++ /dev/null
@@ -1,224 +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.proxy.initParser;
-/*
-
-
- */
-
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-
-public class Message extends Expression {
-	protected boolean trailingPeriod = false;
-	protected Method fMethod;
-	public Expression receiver;
-	public String message;
-	public boolean argsClosed = false;
-	public boolean insideArgsOpenedParen = false;
-	public boolean insideArgsClosedParen = false;
-	protected boolean isComplete = false;
-	public ArrayList arguments = new ArrayList(2);
-	
-public Message(Expression aReceiver , char[] token , ClassLoader aClassLoader){
-	receiver = aReceiver;
-	message = new String(token);
-	fClassLoader = aClassLoader;
-}
-public boolean isComplete(){
-	return isComplete;
-}
-
-/**
- * Send the message to the receiver
- */
-public Object evaluate() throws Exception {
-	cacheMethod();
-	
-	// Get the array of arguments
-	Object[] args = new Object[arguments.size()];
-	Iterator itr = arguments.iterator();
-	for (int i = 0; i < arguments.size() ; i++){
-		Expression anExpression = (Expression)itr.next();
-		args[i] = anExpression.evaluate();
-	}
-	
-	Object receiverValue = receiver.evaluate();	// So if evaluation exception thrown, we don't wrapper again.
-	
-	try {
-		return fMethod.invoke(receiverValue, args);
-	} catch (Exception e) {
-		throw new EvaluationException(e);
-	}
-}
-
-/**
- * Cache the message
- */
-protected void cacheMethod() throws Exception {
-	if (fMethod == null) {
-		Class[] argTypes = new Class[arguments.size()];
-		Iterator itr = arguments.iterator();
-		for (int i=0; i<argTypes.length; i++)
-			argTypes[i] = getEvaluationTypeClass((Expression) itr.next());
-			
-		try {
-			fMethod = MethodHelper.findCompatibleMethod(getEvaluationTypeClass(receiver), message, argTypes);
-		} catch (NoSuchMethodException e) {
-			throw new EvaluationException(e);
-		} catch (AmbiguousMethodException e) {
-			throw new EvaluationException(e);
-		}
-	}
-}
-
-
-/**
- * getTypeClass method comment.
- */
-public Class getTypeClass() throws Exception {
-	cacheMethod();
-	return fMethod.getReturnType();
-}
-
-protected String getTypeClassName() {
-	return "";	// If we got this far, we don't know what it is. //$NON-NLS-1$
-}
-/**
- * push method comment.
- */
-public Expression push(char[] token, char tokenDelimiter) {
-	
-	// If we are closed and we receive a . with no token then remember this
-	if ( argsClosed && !trailingPeriod && tokenDelimiter == DelimiterPeriod && token.length == 0 ) {
-		trailingPeriod = true;
-		return this;
-	}
-	// If we have been closed with a . and we receive a . then we are a field
-	if ( trailingPeriod && tokenDelimiter == DelimiterPeriod ) {
-		return new Field(this,token,fClassLoader);
-	}
-	// If we have been closed with a . and we receive a ( we are a message
-	if ( trailingPeriod && tokenDelimiter == DelimiterOpenParen ) {
-		return new Message(this,token,fClassLoader);
-	}
-	
-	// If we have been closed and we receive a , or a ) we are complete - this is a structural token intended for someone else,
-	// probably a message argument lower down the stack
-	if (argsClosed && (tokenDelimiter == DelimiterComma || tokenDelimiter == DelimiterCloseParen)){
-		isComplete = true;
-		return this;
-	}
-	
-
-	// If the args are opened and a token was supplied then it must be an argument
-	//if ( argsOpened && ( tokenDelimiter == DelimiterCloseParen || tokenDelimiter == DelimiterComma || 
-	//tokenDelimiter == DelimiterSpace || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterPeriod)) {
-	if (!argsClosed){	
-		if ( arguments.size() > 0 ){
-			Expression openArgument = (Expression)arguments.get(arguments.size()-1);
-			if ( !openArgument.isComplete() ) {
-				openArgument.push(token,tokenDelimiter);
-				// If the argument is complete and we received a ) then the message is complete
-				if ( openArgument.isComplete() && tokenDelimiter == DelimiterCloseParen){
-					argsClosed = true;
-				}
-				return this;
-			}
-		}	
-		
-		// We must have a new argument - process accordingly	
-		Expression newArgument = null;
-		if (!insideArgsOpenedParen && tokenDelimiter == DelimiterOpenParen){
-			insideArgsOpenedParen = true;
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-
-		}
-		if ( newArgument == null && (token.length > 0 || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterSingleQuote || tokenDelimiter == DelimiterOpenParen )) {
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-		}
-		// If the token after the argument is a ) then the message is being closed
-		if ( !insideArgsOpenedParen  && tokenDelimiter == DelimiterCloseParen ) {
-			argsClosed = true;
-			return this;
-		}
-		if ( insideArgsOpenedParen  && tokenDelimiter == DelimiterCloseParen ) {
-			insideArgsClosedParen  = true;
-			return this;
-		}
-
-		// If the token after the argument is a , or a ' ' then the argument is being closed
-		if ( tokenDelimiter == DelimiterComma || tokenDelimiter == DelimiterSpace ) {
-			return this;
-		}
-		
-		// Otherwise the new argument is stil processing.  Return it
-//		return newArgument;
-	}
-	
-	// If we don't have a message yet, then consume this one
-	if ( message.length() == 0 ) {
-		message = new String(token);
-		return this;
-	}	
-
-	return this;	
-}
-public String toString(){
-
-	java.io.StringWriter writer = new java.io.StringWriter();
-	writer.write("Msg Name=\""); //$NON-NLS-1$
-	if ( message != null ) {
-		writer.write(message);
-	} else {
-		writer.write("UNNAMED"); //$NON-NLS-1$
-	}
-	writer.write("\" Rcv=("); //$NON-NLS-1$
-	if ( receiver != null ){
-		writer.write(receiver.toString());
-	} else {
-		writer.write("NONE"); //$NON-NLS-1$
-	}
-	writer.write(')');
-	if ( arguments != null ) {
-		writer.write("Args(");		 //$NON-NLS-1$
-		Iterator iter = arguments.iterator();
-		int i=1;
-		while(iter.hasNext()){
-			writer.write(new Integer(i).toString());
-			writer.write('(');
-			writer.write(iter.next().toString());
-			writer.write("),");			 //$NON-NLS-1$
-		}
-		writer.write(')');				
-	}
-	
-	return writer.toString();
-
-}
-
-/**
- * Is the message result a primitive.
- */
-public boolean isPrimitive() throws Exception {
-	cacheMethod();
-	return fMethod.getReturnType().isPrimitive();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/MessageArgument.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/MessageArgument.java
deleted file mode 100644
index 66febdb43..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/MessageArgument.java
+++ /dev/null
@@ -1,123 +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.proxy.initParser;
-/*
-
-
- */
-
-
-import java.io.StringWriter;
-import java.util.*;
-
-public class MessageArgument extends Expression {
-
-	protected boolean isComplete = false;
-	Expression fExpression;
-	ArrayList fExpressionStack = new ArrayList();
-
-public MessageArgument(Expression anExpression){
-	fExpression = anExpression;
-}
-	
-public Object evaluate() throws Exception {
-	
-	return fExpression.evaluate();
-	
-}	
-
-public Class getTypeClass() throws Exception {
-	
-	return fExpression.getTypeClass();
-	
-}
-
-protected String getTypeClassName() {
-	return fExpression.getTypeClassName();
-}
-public boolean isComplete(){
-	return isComplete || fExpression.isComplete();
-}
-	
-public Expression push(char[] token , char delimiter){
-
-	// Even if our expression is complete and we receive anything other than a , then the expression must process it as this may be a field or message
-	// that is being sent to the expression to make up a complex argument	
-	Expression result = fExpression.push(token,delimiter);
-	// If the result if a push then push the stack
-	if ( result != fExpression ) {
-		pushExpressionStack(result);
-	} else if (result.isComplete()){
-		// If our expression is complete, we are completed with a ) pop the stack so the previous expression can process us
-		if (delimiter == DelimiterCloseParen ) {
-			isComplete = true;
-			popExpressionStack();
-		} else if (delimiter == DelimiterComma || delimiter == DelimiterQuote ) {
-			// If we receive a comma we pop the stack so the previous expression can process us but we don't flag us as complete
-			popExpressionStack();
-			// unless our expression is some array argument AND it is complete AND we have a close elipse }
-		} else if ( delimiter == DelimiterCloseElipse ) {
-			popExpressionStack();
-			if ( fExpression instanceof ArrayArguments ) {
-				isComplete = true;
-			}
-		}
-	}
-	return this;
-}	
-	
-/* Pop the top expression off the stack
- */
-protected void popExpressionStack(){
-
-	if ( fExpressionStack.size() > 0 ) {
-		Expression lastExpression = (Expression)fExpressionStack.get(fExpressionStack.size() - 1);
-		if ( !lastExpression.isComplete() ) {
-			fExpression = (Expression) fExpressionStack.remove(fExpressionStack.size() - 1);
-		} else { 
-			isComplete = true;
-		} 
-	} else {
-		isComplete = true;
-	}
-}
-
-/* Push the expression onto the stack
- */
-protected void pushExpressionStack(Expression anExpression){
-
-	// The current expression should go onto the stack
-	fExpressionStack.add(fExpression);
-	// The current expression is replaced with the argument
-	fExpression = anExpression;
-	
-}
-
-public boolean isPrimitive(){
-	return false;
-}
-public String toString(){
-	StringWriter writer = new StringWriter();
-	writer.write("Arg("); //$NON-NLS-1$
-	if ( fExpression != null ) {
-		writer.write(fExpression.toString());
-	}
-	writer.write(")"); //$NON-NLS-1$
-	return writer.toString();
-}
-public void contributeArgumentNumber(List argumentNumberList){
-
-	if ( fExpression instanceof ArrayArguments ) {
-		((ArrayArguments)fExpression).contributeArgumentNumber(argumentNumberList);
-	}	
-	
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NullLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NullLiteral.java
deleted file mode 100644
index ad3d0efcb..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NullLiteral.java
+++ /dev/null
@@ -1,59 +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.proxy.initParser;
-
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-
-/*
-
-
- */
-
-
-public class NullLiteral extends Expression {
-public NullLiteral(){
-}
-/**
- * evaluate method comment.
- */
-public Object evaluate() {
-	return null;
-}
-/**
- * evaluate method comment.
- */
-public Class getTypeClass(){
-	return MethodHelper.NULL_TYPE;
-}
-
-protected String getTypeClassName() {
-	return MethodHelper.NULL_TYPE.getName();
-}
-/**
- * true or false cannot consume any kind of expression so we must return null
- */
-public Expression push(char[] token , char delimiter){
-	return null;
-}
-
-public boolean isComplete(){
-	return true;
-}
-
-/**
- * Null is not primitive
- */
-public boolean isPrimitive() {
-	return false;
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NumberLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NumberLiteral.java
deleted file mode 100644
index 27fd999f1..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NumberLiteral.java
+++ /dev/null
@@ -1,171 +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.proxy.initParser;
-/*
-
-
- */
-
-
-public class NumberLiteral extends Expression {
-	protected String numberString = ""; //$NON-NLS-1$
-	protected boolean isComplete = false;
-	protected Class numberClass = Integer.TYPE;
-	protected int exponentFlag = NO_EXPONENT;
-	
-	protected static final int
-		NO_EXPONENT = 0,
-		HAS_EXPONENT = 1,
-		HAS_EXPONENT_MINUS = 2;
-/**
- * evaluate method comment.
- */
-public NumberLiteral(){
-}
-/**
- * evaluate method comment.
- */
-public Object evaluate() throws Exception {
-	try {
-		// Return a number of the correct instance
-		if (numberClass == Float.TYPE){
-			return new Float(Float.parseFloat(numberString));
-		} else if (numberClass == Long.TYPE ) {
-			return Long.decode(numberString);
-		} else if (numberClass == Double.TYPE ){
-			return new Double(Double.parseDouble(numberString));
-		} else
-			return Integer.decode(numberString);
-	} catch (Exception e) {
-		throw new EvaluationException(e);
-	}
-	
-}
-public boolean isComplete(){
-	return isComplete;
-}
-
-/**
- * Return the type of number that we are.
- */
-public Class getTypeClass(){
-	return numberClass;
-}
-
-protected String getTypeClassName() {
-	return numberClass != null ? numberClass.getName() : ""; //$NON-NLS-1$
-}
-/**
- * If the delimiter is an operation such as a +,-,/,* then we can consume it
- * If the delimiter is period and we don't already have one then it is the decimal portion of us
- */
-public Expression push(char[] token , char delimiter){
-		
-	// Close brackets complete use		
-	if(delimiter == DelimiterCloseParen || delimiter == DelimiterComma || delimiter == DelimiterCloseElipse){
-		isComplete = true;
-	}
-	
-	if (delimiter == OperMinus && numberString.length() == 0)
-		numberString+=OperMinus;	// No digits yet, but we have a minus sign, so add to accumulating number.
-		
-	numberString += processNumberToken(token);	
-	
-	// If we have part of a number and are asked to do some arithmetic throw an 
-	// error that this has not been coded yet, except minus could be part of an exponent.
-	if(numberString.length() > 0 && token.length > 1) {
-		switch(delimiter){
-			case OperMinus:
-				if (exponentFlag == HAS_EXPONENT) {
-					exponentFlag = HAS_EXPONENT_MINUS;
-					numberString += OperMinus;
-					break;
-				}
-			case OperPlus:			
-			case OperMultiply:
-			case OperDivide:
-			{
-				throw new RuntimeException("Can't do arithmetic yet"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	if (delimiter == DelimiterPeriod){
-		numberClass = Double.TYPE;	// A decimal makes it double.
-		numberString += DelimiterPeriod;
-	}	
-
-	if(delimiter == BitOR || delimiter == BitAND){
-			Expression result = new PrimitiveOperation(this,delimiter);
-			isComplete = true;
-			return result;
-	}
-
-	return this;
-	
-}
-protected String processNumberToken(char[] token){
-	
-	for (int i=0; i<token.length; i++)
-		if (token[i] == 'E' || token[i] == 'e') {
-			numberClass = Double.TYPE;	// Definitely a floating because of this.
-			exponentFlag = HAS_EXPONENT;
-			break;
-		}
-			
-	// The token could be a number, e.g. 10 or 5 or could be qualified with a primitive
-	// suffix, e.g. 10l or 5f
-	char[] numberToken = token;
-	if ( token.length > 0 ) {
-		switch(token[token.length - 1]){
-			case 'F': 			
-			case 'f':
-				numberClass = Float.TYPE;
-				numberToken = new char[token.length - 1];
-				System.arraycopy(token,0,numberToken,0,numberToken.length);
-				isComplete = true;
-				break;
-			case 'L':			
-			case 'l':
-				numberClass = Long.TYPE;
-				numberToken = new char[token.length - 1];
-				System.arraycopy(token,0,numberToken,0,numberToken.length);				
-				isComplete = true;
-				break;
-			case 'D':			
-			case 'd':
-				numberClass = Double.TYPE;
-				numberToken = new char[token.length - 1];
-				System.arraycopy(token,0,numberToken,0,numberToken.length);				
-				isComplete = true;
-				break;
-		}
-	}
-			
-	return new String(numberToken);
-}
-public String toString(){
-
-	java.io.StringWriter writer = new java.io.StringWriter();
-	writer.write("Number \""); //$NON-NLS-1$
-	writer.write(numberString);
-	writer.write("\""); //$NON-NLS-1$
-	return writer.toString();
-
-}
-
-/**
- * Number literals are primitive
- */
-public boolean isPrimitive() {
-	return true;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java
deleted file mode 100644
index 7f5147902..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * This is for primitive expressions that are optimized out the compiler such as bit or, bit and, etc..
-   */
-package org.eclipse.jem.internal.proxy.initParser;
-
-import java.text.MessageFormat;
-
-/*
-
-
- */
-
-public class PrimitiveOperation extends Expression {
-	
-	protected int operation;				// This can be BitOR or BitAND
-	protected Expression receiver;	// The left hand side of the expression
-	protected boolean isComplete = false;
-	
-	public PrimitiveOperation(Expression aReceiver, int anOperation){
-		receiver = aReceiver;
-		operation = anOperation;
-	}
-
-	public Object evaluate() throws Exception {
-		Object leftHandSide = receiver.evaluate();
-		Object rightHandSide = currentExpression.evaluate();
-		if (leftHandSide instanceof Integer && rightHandSide instanceof Integer) {
-			if(operation == BitOR) {
-				return new Integer(((Integer)leftHandSide).intValue() | ((Integer)rightHandSide).intValue());				
-			} else if(operation == BitAND) {
-				return new Integer(((Integer)leftHandSide).intValue() & ((Integer)rightHandSide).intValue());				
-			}
-		}
-		throw new RuntimeException(MessageFormat.format(ProxyInitParserMessages.getString("PrimitiveOperation.Evaluate.InvalidOperator_EXC_"), new Object[]{getOperDescription(), leftHandSide, rightHandSide}));		 //$NON-NLS-1$
-	}
-	protected String getOperDescription(){
-		if(operation == BitOR) return "|"; //$NON-NLS-1$
-		if (operation == BitAND) return "&";			 //$NON-NLS-1$
-		return "???"; //$NON-NLS-1$
-	}
-
-	public boolean isComplete() {
-		return isComplete;
-	}
-
-	public Class getTypeClass() throws Exception {
-		return Integer.TYPE;
-	}
-
-	protected String getTypeClassName() {
-		return Integer.TYPE.getName();
-	}
-
-	public Expression push(char[] token, char tokenDelimiter) {
-	
-		// Create a new statement if the argument is null ( we are always created with a receiver )
-		if(currentExpression == null && token.length > 0){
-			currentExpression = new Statement(fClassLoader).push(token,tokenDelimiter);
-			pushExpressionStack(currentExpression);
-			return this;
-		} 
-		
-		// Ignore whitespace
-		if(token.length == 0 && tokenDelimiter == ' ') return this;
-		
-		// If we have an argument we just keep pushing the expression onto this
-		if(currentExpression != null){
-			Expression result = currentExpression.push(token,tokenDelimiter);
-			if(result != currentExpression){
-				pushExpressionStack(result);
-			}
-		}
-		
-		if(currentExpression != null && currentExpression.isComplete()){
-			if(tokenDelimiter == DelimiterComma){
-				isComplete = true;
-				return this;
-			} else if (tokenDelimiter == DelimiterCloseParen){
-				if(receiver.parenthesisLevel > 0){
-					receiver.parenthesisLevel--;
-				} else {
-					isComplete = true;			
-					return this;		
-				}
-			}
-		}				
-	
-		return this;
-	}
-
-	public boolean isPrimitive() throws Exception {
-		return true;
-	}
-	
-	public String toString(){
-		StringBuffer buffer = new StringBuffer();
-		if (receiver != null) buffer.append(receiver.toString());
-		buffer.append(getOperDescription());
-		if (currentExpression != null) buffer.append(currentExpression.toString()); 
-		return buffer.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java
deleted file mode 100644
index 8d9620eb8..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java
+++ /dev/null
@@ -1,46 +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.proxy.initParser;
-/*
-
-
- */
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-/**
- * General Proxy NLS Constants
- * Creation date: (4/13/00 10:46:58 AM)
- * @author: Administrator
- */
-public class ProxyInitParserMessages {
-	// Resource Bundle to use for basic Proxy NLS resources.
-	static private final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle("org.eclipse.jem.internal.proxy.initParser.messages"); //$NON-NLS-1$
-
-	// Keys for messages/strings within the resource bundle.
-	static public final String
-		UNEXPECTED_TOKEN = "UnexpectedToken_EXC_", //$NON-NLS-1$
-		STATEMENT_UNEXPECTED_EXECUTION = "Statement.UnexpectedExecution_EXC_", //$NON-NLS-1$
-		STATEMENT_UNEXPECTED_EVALUATION = "Statement.UnexpectedEvaluation_EXC_"		; //$NON-NLS-1$
-		
-	private ProxyInitParserMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}		
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java
deleted file mode 100644
index 74bad2621..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java
+++ /dev/null
@@ -1,201 +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.proxy.initParser;
-/*
-
-
- */
-
-
-
-public class Statement extends Expression {
-	public boolean isStringObject = false;
-	public boolean isCast = false;
-	protected boolean messageOrFieldStarted;
-	
-/**
- * Statement constructor comment.
- */
-public Statement(ClassLoader aClassLoader) {
-	super();
-	fClassLoader = aClassLoader;
-}
-
-public boolean isComplete(){
-	return currentExpression != null && currentExpression.isComplete();
-}
-
-/** Defer this to the expression
- */
-public Object evaluate() throws Exception {
-	if ( currentExpression != null ) {
-		return currentExpression.evaluate();
-	} else {
-		throw new RuntimeException(ProxyInitParserMessages.getString(ProxyInitParserMessages.STATEMENT_UNEXPECTED_EXECUTION));	// This is not an evaluation error, it shouldn't of occured, so it is a parser error.
-	}
-}
-/**
- */
-public Class getTypeClass() throws Exception {
-	return currentExpression.getTypeClass();
-	//throw new RuntimeException(ProxyBaseVMNLS.RESBUNDLE.getString(ProxyBaseVMNLS.STATEMENT_UNEXPECTED_EVALUATION));
-}
-
-protected String getTypeClassName() {
-	return currentExpression.getTypeClassName();
-}
-/** There are several types of token that can begin a statement.
- *  new , ' '						-	Create a constructor
- *	1-10, true, false, etc...		-	Create a literal
- *  Foo,  '.'						-	Create a Type
- */
-public Expression push(char[] token , char delimiter){
-	
-	// If messageOrFieldStart is true then our expression is complete and either a message or field is being created
-	// See which it is and create the correct expression
-	if (messageOrFieldStarted){
-		messageOrFieldStarted = false;
-		if ( delimiter == DelimiterOpenParen){
-			Message message = new Message(currentExpression,token,fClassLoader);
-			currentExpression = message;
-			return message;
-		} else { 
-			Field field = new Field(currentExpression,token,fClassLoader);
-			currentExpression = field;
-			return field;
-		}
-	}	
-	
-	// Look for "new " for a constructor"
-	if ( delimiter == DelimiterSpace && compare( token , ConstantNew ) ) {
-		// If we thought we were a possible cast and we now aren't then we must be a block expression
-		if ( isCast ) {
-			currentExpression = new Block(new Constructor(fClassLoader));
-		} else {
-			currentExpression = new Constructor(fClassLoader);
-		}
-		isCast = false;	// Can't be a cast now		
-		return currentExpression;
-	}
-	
-	// Look for "null" 
-	if ( compare( token , ConstantNull ) ) {
-		currentExpression = new NullLiteral();
-		isCast = false;	// Can't be a cast now		
-		// Null cannot process anything so we return the statement
-		return this;
-	}
-
-	// Look for a number
-	if ( isNumber( token ) || delimiter == OperMinus ) {
-		currentExpression = new NumberLiteral();
-		currentExpression = currentExpression.push(token,delimiter);
-		isCast = false;	// Can't be a cast now		
-		return currentExpression;
-	}
-
-	if ( compare( token , ConstantTrue ) ) {
-		currentExpression  = new BooleanLiteral(true);
-		// true cannot process anything so we return the statement
-		isCast = false;	// Can't be a cast now		
-		return currentExpression;
-//		return this;
-	}
-
-	if ( compare( token , ConstantFalse ) ) {
-		// false cannot process anything so we return the statement
-		currentExpression = new BooleanLiteral(false);
-		isCast = false;	// Can't be a cast now		
-		return this;
-	}
-	
-	if ( delimiter == DelimiterQuote ) {
-		currentExpression = new StringLiteral();
-		isCast = false;	// Can't be a cast now		
-		return currentExpression;		
-	}
-	
-	if ( delimiter == DelimiterSingleQuote ) {
-		currentExpression = new CharLiteral();
-		isCast = false;	// Can't be a cast now		
-		return currentExpression;		
-	}	
-	
-	if (delimiter == DelimiterPeriod && token.length == 0 && currentExpression != null){
-		if (currentExpression instanceof StringLiteral){
-			//String s = "\"" + (String)(currentExpression.evaluate()) + "\"" ;
-			//return new Constructor(s);
-			isStringObject = true;
-			return this;
-		}
-	}
-	
-	if (isStringObject && (token.length > 0) && (delimiter == DelimiterOpenParen)){
-		return new Message(currentExpression, token,fClassLoader);
-	}
-	
-	//handle type casting
-	if ((token.length == 0) && (delimiter == DelimiterOpenParen)){
-		// If we are a already a cast then we must be a block.
-		if ( isCast ) {
-			currentExpression = new Block(fClassLoader);
-		} else {
-			isCast = true;	// Possibly a cast
-		}
-		return this;
-	}	
-	if (isCast && (delimiter == DelimiterCloseParen || token.length != 0)){
-		Static aStatic = new Static(fClassLoader);
-		Cast aCast = new Cast(aStatic,fClassLoader);
-		currentExpression = aCast.push(token,delimiter);
-		return currentExpression;
-	}
-	
-	if ( token.length != 0 ) {
-		currentExpression = new Static(fClassLoader).push(token,delimiter);
-		return currentExpression;
-	}
-	
-	// If we get a { then we are part of an array argument
-	if (delimiter == DelimiterOpenElipse){
-		currentExpression = new ArrayArguments();
-		return currentExpression;
-	}
-	
-	// If our expression is closed and we receive a . we are either a message or a field.  We won't know this until
-	// the next token we receive, which will be either be delimited by a ( in which case it is a message, else it is a field
-	if (currentExpression != null && currentExpression.isComplete() && delimiter == DelimiterPeriod){
-		messageOrFieldStarted = true;
-	}
-		
-	return this;
-}
-
-public String toString(){
-	StringBuffer buffer = new StringBuffer();
-	buffer.append("Statement{"); //$NON-NLS-1$
-	if ( currentExpression != null ) {
-		buffer.append(currentExpression.toString());
-	}
-	buffer.append('}');
-	return buffer.toString();
-}
-/**
- * Is this statement a primitive.
- */
-public boolean isPrimitive() throws Exception {
-	if ( currentExpression != null ) {
-		return currentExpression.isPrimitive();
-	} else {
-		throw new RuntimeException(ProxyInitParserMessages.getString(ProxyInitParserMessages.STATEMENT_UNEXPECTED_EXECUTION));
-	}
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Static.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Static.java
deleted file mode 100644
index 565b788a4..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Static.java
+++ /dev/null
@@ -1,305 +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.proxy.initParser;
-/*
-
-
- */
-
-
-import java.io.*;
-import java.lang.reflect.Array;
-import java.util.*;
-
-public class Static extends Expression {
-	protected static final HashMap sPrimitiveTypes;
-	
-	static {
-		sPrimitiveTypes = new HashMap(10);
-		sPrimitiveTypes.put("byte", Byte.TYPE); //$NON-NLS-1$
-		sPrimitiveTypes.put("char", Character.TYPE); //$NON-NLS-1$
-		sPrimitiveTypes.put("short", Short.TYPE); //$NON-NLS-1$
-		sPrimitiveTypes.put("int", Integer.TYPE); //$NON-NLS-1$
-		sPrimitiveTypes.put("long", Long.TYPE); //$NON-NLS-1$
-		sPrimitiveTypes.put("float", Float.TYPE);		 //$NON-NLS-1$
-		sPrimitiveTypes.put("double", Double.TYPE); //$NON-NLS-1$
-	}
-
-	protected ArrayList arrayDimensions;
-	protected List fArrayArguments;
-	protected StringWriter typeWriter = new StringWriter();
-	protected boolean completedWithPeriod = false;
-	protected char[] completionToken;
-	public Class type;
-	protected boolean isComplete;
-
-	public boolean isProcessingArrayDimension;
-/**
- * Create an unknown expression
- */
-public Static(ClassLoader aClassLoader){
-	fClassLoader = aClassLoader;
-}
-public Static(char[] aToken,char delimiter,ClassLoader aClassLoader){
-	
-	fClassLoader = aClassLoader;
-	try { 
-		typeWriter.write(aToken);
-	} catch ( IOException exc ) {};
-	checkForValidType();
-	if ( type == null && delimiter == DelimiterPeriod ){
-		typeWriter.write(DelimiterPeriod);
-	}
-		
-}
-public Static(char[] aToken,char delimiter,ClassLoader aClassLoader,boolean isArray){
-	this(aToken,delimiter,aClassLoader);
-	isProcessingArrayDimension = true;
-	arrayDimensions = new ArrayList(1);
-	arrayDimensions.add(new Statement(aClassLoader));
-}
-
-public boolean isComplete(){
-	return isComplete;
-}
-public boolean isArray(){
-	return arrayDimensions != null;
-}
-/**
- * See whether or not we have a valid type
- * This uses the class loader given to us if one specified.  The reason for this
- * is that Eclipse uses a special plugin class loader and when we are running
- * in a VM inside eclipse ( e.g. for IDEVM proxy stuff ) we must have
- * reference to the plugin that is using us otherwise we can't load its classes
- */
-protected void checkForValidType(){
-
-	type = (Class) sPrimitiveTypes.get(typeWriter.toString());
-	if (type == null)
-		try {
-			if ( fClassLoader == null ) {
-				type = Class.forName(typeWriter.toString());
-			} else {
-				type = fClassLoader.loadClass(typeWriter.toString());
-			}
-		} catch ( ClassNotFoundException exc ) {
-			try {
-				type = Class.forName("java.lang." + typeWriter.toString()); //$NON-NLS-1$
-				StringWriter writer = new StringWriter();
-				writer.write(type.getName());
-				typeWriter = writer;
-			} catch ( ClassNotFoundException exc1 ) {}
-		} catch ( NoClassDefFoundError exc ) {
-			// A mismatch in some way. Found a class, probably different case. One possibility
-			// is found a class, but this was really a package. So class and package with same name
-			// but different case caused this to occur. [46376].
-		}
-	
-}
-/**
- * If we have any static methods return the result of evaluating them against the type
- */
-public Object evaluate() {
-
-	// If we are an array but haven't created it do so
-	if ( isArray() ) {
-		if ( array == null ) {
-			evaluateArray();
-		}
-		return array;
-	} else {
-		if ( type != null ) { 
-			return type;
-		} else { 
-			// If we have no type then we are some kind incomplete expression that cannot be evaluted
-			throw new RuntimeException();
-		}
-	}
-}
-/**
- * The type of us is either simply the class, or if we are an array then we must create the java.lang.reflect.Array
- * using the reflective APIs
- */
-protected Object array;
-public Class getTypeClass() {
-
-	if ( isArray() ) {
-		if ( array == null ) {
-			// Do not evaluate the array and return its class.  Instead just work out the class by our type
-			// and number of dimensions
-			Object result = Array.newInstance(type,getNumberOfDimensions());
-			return result.getClass();
-		} else { 
-			return array.getClass();
-		}
-	} else { 
-		return type;
-	}
-}
-
-protected String getTypeClassName() {
-	return typeWriter.toString();
-}
-public Class getPrimitiveTypeClass(){
-	return type;
-}
-protected int[] getNumberOfDimensions(){
-	List dimensions = new ArrayList(1);
-	dimensions.add(new Integer(fArrayArguments.size()));
-	((MessageArgument)fArrayArguments.get(0)).contributeArgumentNumber(dimensions);
-	// The total number of arguments is a set of Integer objects in the dimensions list
-	// convert this to an int[]
-	int[] intDimensions = new int[dimensions.size()];
-	for (int i = 0; i < dimensions.size(); i++) {
-		intDimensions[i] = ((Integer)dimensions.get(i)).intValue();
-	}
-	return intDimensions;
-}
-/**
- * Evaluate the array
- */
-protected void evaluateArray(){
-	if ( fArrayArguments != null ) { 
-		// If the array isn't declared with a size but this is supplied with argument these will be in the fArrayArguments
-		// new int[] { 2 ,3 } will have the constructor arguments supplied as two message arguments with 
-		if ( array == null ) {
-			// The size of the array arguments is our array size, however for a multi arg array we need
-			// to find the size of any nested arrays within arguments themselves, e.g. 
-			// new int[][] { {2,3} , {3,4} } then we have two array arguments, each of which is a MessageArgument
-			// whose statement is an ArrayArguments that has two arguments, etc...
-			// To find the number of arguments we create a list that we add our number of arguments to, and then
-			// pass this all the way up the arguments chain using contributeArgumentNumber(List) so that each element
-			// can add to the list the number of arguments ( if any ) that they have.  
-			array = Array.newInstance(type,getNumberOfDimensions());
-			// Set the elements in the array to be the result of evaluating the constructor arguments
-			for (int i = 0; i < fArrayArguments.size(); i++) {
-				Expression expression = (Expression)fArrayArguments.get(i);
-				try {	
-					Object element = expression.evaluate();
-					Array.set(array,i,element);
-				} catch ( Exception exc ) {
-					// Any evaluation exceptions should be thrown back
-					throw new RuntimeException();
-				}
-			}
-		}
-	} else if ( arrayDimensions != null ) {
-		// To get the class of a reflective array we must actually first create it and then ask it for its class
-		// The array Dimensions are present if the array was explicitly declared with a size, e.g. new int[2][3]
-		// will have to arrayDimensions that represent the expressions 2 and 3 ( as NumberLiteral instances )
-		if ( array == null ) {
-			// Evaluate all of the arrayDimensions.  These should be integers
-			int[] dimensionSizes = new int[arrayDimensions.size()];
-			for (int i = 0; i < dimensionSizes.length; i++) {
-				try { 
-					Integer dimensionSize = (Integer) ((Expression)arrayDimensions.get(i)).evaluate();
-					dimensionSizes[i] = dimensionSize.intValue();
-				} catch ( Exception exc ) {
-					throw new RuntimeException();
-				}
-			}
-			// For a multi arg array we need to create using the static method on array that takes an int[] that represents
-			// the number of dimensions, e.g. for new String[2][3] we do Array.newInstance(String.class,new int[] { 2 , 3 };
-			array = Array.newInstance(type,dimensionSizes);
-		}
-	}
-}
-/**
- * If the token is a period then it could either be part of the type or else a static method call
- */
-public Expression push(char[] token , char delimiter ) {
-
-	// If we don't yet have a valid type then see if we now do
-	if (type == null){
-		try { 
-			typeWriter.write(token);
-		} catch ( IOException exc ) {};
-		checkForValidType();
-		// If we got a valid type and a period then remember it
-		if ( delimiter == DelimiterPeriod ) {
-			if (type != null) {
-				completedWithPeriod = true;
-				return this;
-			}
-		}		
-	}
-	
-	if ( arrayDimensions != null && isProcessingArrayDimension ) {
-		Expression lastArrayDimension = (Expression)arrayDimensions.get(arrayDimensions.size()-1);
-		lastArrayDimension.push(token,delimiter);
-		if ( delimiter == DelimiterCloseSquareBrace && isProcessingArrayDimension ) {
-			isProcessingArrayDimension = false;
-		}
-		return this;
-	}
-	
-	if ( delimiter == DelimiterOpenSquareBrace && !isProcessingArrayDimension ) {
-		if ( arrayDimensions == null ) arrayDimensions = new ArrayList(1);
-		Statement statement = new Statement(fClassLoader);
-		arrayDimensions.add(statement);
-		isProcessingArrayDimension = true;
-		return this;		
-	}
-	
-	// If we have a type and the delimiter is a ( then it must be a message beginning
-	if ( type != null ) {
-		if (delimiter == DelimiterOpenParen) {
-			isComplete = true;
-			return new Message( this , token , fClassLoader );
-		} else if (completedWithPeriod){
-			isComplete = true;
-			Field field = new Field(this,token,fClassLoader);
-			// If our token is a ), ' ' or , then the field is completed,
-			// otherwise leave it open so it will process the remaining tokens
-//			if (delimiter == DelimiterCloseParen || delimiter == DelimiterSpace || delimiter == DelimiterComma) {
-			if (delimiter == DelimiterCloseParen || delimiter == DelimiterComma) {
-				field.isComplete = true;
-			}
-			return field;
-		}
-	}
-			
-	// We are still looking for a type so append a .
-	if ( type == null ) {
-		typeWriter.write('.');
-	}
-	return this;
-}
-public String toString(){
-
-	StringWriter writer = new StringWriter();
-	writer.write("Static "); //$NON-NLS-1$
-	if ( type == null ) { 
-		writer.write("(Incomplete) {"); //$NON-NLS-1$
-	} else {
-		writer.write("(Complete) {"); //$NON-NLS-1$
-	}
-	writer.write(typeWriter.toString());
-	writer.write("}"); //$NON-NLS-1$
-	if ( arrayDimensions != null ) {
-		writer.write(" array dimensions="); //$NON-NLS-1$
-		writer.write(new Integer(arrayDimensions.size()).toString());
-	}
-	if ( fArrayArguments != null ) {	
-		writer.write(" array dimensions="); //$NON-NLS-1$
-		writer.write(new Integer(fArrayArguments.size()).toString());
-	}
-	return writer.toString();
-
-}
-
-public boolean isPrimitive() {
-	return getTypeClass().isPrimitive();
-}
-public void setArrayArguments(List arguments) {
-	fArrayArguments = arguments;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/StringLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/StringLiteral.java
deleted file mode 100644
index 14c73df0b..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/StringLiteral.java
+++ /dev/null
@@ -1,142 +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.proxy.initParser;
-/*
-
-
- */
-
-
-
-public class StringLiteral extends Expression {
-	protected boolean isComplete;
-	public String value;
-	public StringBuffer valueBuffer = new StringBuffer();
-	protected boolean isEscaped = false;
-
-/**
- * constructor
- */
-public StringLiteral(){
-}
-	
-/**
- * evaluate method comment.
- */
-public Object evaluate() {
-	return valueBuffer.toString();
-}
-
-public boolean isComplete(){
-	return isComplete;
-}
-/**
- * We must evaluate ourself and return the type of the result
- */
- 
-public Class getTypeClass() {
-	return String.class;
-}
-
-protected String getTypeClassName() {
-	return String.class.getName();
-}
-
-/**
- *This string might be broken into a few tokens
- *so we need a StringBuffer.
- * 
- */
-public Expression push(char[] token , char delimiter){
-	int appendTokenStart = 0;
-	int appendTokenLength = token.length;
-	if (isEscaped) {
-		isEscaped = false;
-		if (token.length != 0) {
-			char c = token[0];
-			switch (c) {
-				case 'b':
-					valueBuffer.append('\b');
-					appendTokenStart = 1;
-					appendTokenLength--;
-					break;
-				case 't':
-					valueBuffer.append('\t');
-					appendTokenStart = 1;
-					appendTokenLength--;
-					break;
-				case 'n':
-					valueBuffer.append('\n');
-					appendTokenStart = 1;
-					appendTokenLength--;
-					break;
-				case 'r':
-					valueBuffer.append('\r');
-					appendTokenStart = 1;
-					appendTokenLength--;
-					break;
-				case 'u':
-					// Unicode, next four gather for text;
-					if (appendTokenLength>=5) {
-						valueBuffer.append((char) Integer.parseInt(new String(token, 1, 4), 16));
-						appendTokenStart=5;
-						appendTokenLength-=5;
-					}
-					break;
-			}
-			// If we didn't append anything, then not a true escape, so put the escape on.
-			if (appendTokenStart==0)
-				valueBuffer.append(DelimiterEscape);
-		} else {
-			if (delimiter == DelimiterQuote || delimiter == DelimiterEscape || delimiter == DelimiterSingleQuote)
-				valueBuffer.append(delimiter);	// It was a true escape.
-			else {
-				valueBuffer.append(DelimiterEscape);	// If wasn't a true escape
-				valueBuffer.append(delimiter);
-			}
-			return this;
-		}
-	}
-	
-	if (appendTokenLength > 0)
-		valueBuffer.append(token, appendTokenStart, appendTokenLength);
-	
-	if (delimiter == DelimiterQuote){		
-		isComplete =true;
-		return this;
-	}
-	
-	// If the delimiter is an escape character remember it so we can escape
-	// the next token, otherwise treat it as a literal
-	if (delimiter == DelimiterEscape ){
-		isEscaped = true;
-	} else {
-		valueBuffer.append(delimiter);
-	}
-	return this;
-}
-
-/**
- * Strings are not primitives.
- */
-public boolean isPrimitive() {
-	return false;
-}
-public String toString(){
-	StringBuffer buffer = new StringBuffer();
-	buffer.append("String(\""); //$NON-NLS-1$
-	if ( valueBuffer != null ) {
-		buffer.append(valueBuffer.toString());
-	}
-	buffer.append("\""); //$NON-NLS-1$
-	return buffer.toString();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties
deleted file mode 100644
index caa692355..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties,v $
-# $Revision: 1.6 $  $Date: 2005/08/24 20:39:07 $
-#
-
-
-#
-# Properties for the Proxy Base VM Support
-#
-UnexpectedToken_EXC_                = IWAV0127E Unexpected Token "{0}".
-Statement.UnexpectedExecution_EXC_  = IWAV0128E Statement was executed unexpectedly.
-Statement.UnexpectedEvaluation_EXC_ = IWAV0129E Statements should not be evaluated.
-CharTooComplicated_EXC_             = IWAV0130E Input text not a char that can be evaluated. Too complicated. \"{0}"
-PrimitiveOperation.Evaluate.InvalidOperator_EXC_=Invalid operator {0} between {1} and {2}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/AbstractEnum.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/AbstractEnum.java
deleted file mode 100644
index 451e751a8..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/AbstractEnum.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Base abstract implementation of the enum.
- * @since 1.1.0
- */
-public abstract class AbstractEnum implements Enum {
-
-	/**
-	 * The name of the enumerator.
-	 */
-	private final String name;
-
-	/**
-	 * The <code>int</code> value of the enumerator.
-	 */
-	private final int value;
-
-	/**
-	 * Creates an initialized instance.
-	 * 
-	 * @param value
-	 *            the <code>int</code> value of the enumerator.
-	 * @param name
-	 *            the name of the enumerator.
-	 */
-	protected AbstractEnum(int value, String name) {
-		this.name = name;
-		this.value = value;
-	}
-
-	/**
-	 * Returns the name of the enumerator.
-	 * 
-	 * @return the name.
-	 */
-	public final String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the <code>int</code> value of the enumerator.
-	 * 
-	 * @return the value.
-	 */
-	public final int getValue() {
-		return value;
-	}
-
-	/**
-	 * Returns the name of the enumerator.
-	 * 
-	 * @return the name.
-	 */
-	public final String toString() {
-		return name;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/Enum.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/Enum.java
deleted file mode 100644
index 8ffa63cbc..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/Enum.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * TypeSafe enumerations for the IExpression processing.
- * 
- * @since 1.1.0
- */
-public interface Enum {
-
-	/**
-	 * Returns the name of the enumerator.
-	 * 
-	 * @return the name.
-	 */
-	String getName();
-
-	/**
-	 * Returns the <code>int</code> value of the enumerator.
-	 * 
-	 * @return the value.
-	 */
-	int getValue();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
deleted file mode 100644
index 0c553ff59..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
+++ /dev/null
@@ -1,3364 +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.proxy.initParser.tree;
-
-import java.lang.reflect.*;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jem.internal.proxy.common.*;
-import org.eclipse.jem.internal.proxy.initParser.InitializationStringEvaluationException;
-import org.eclipse.jem.internal.proxy.initParser.InitializationStringParser;
- 
-/**
- * Expression processing. This does the actual expression processing with the live objects.
- * It is meant to be subclassed only to provide additional expression types. All of the
- * current expressions cannot be overridden. This is because the stack is very sensitive to 
- * call order.
- * 
- * @since 1.0.0
- */
-public class ExpressionProcesser {
-
-	/**
-	 * A variable reference for a field access.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static class FieldAccessReference extends VariableReference {
-		
-		private final Field field;
-		private final Object receiver;
-
-		/**
-		 * Use this to construct a FieldAccessReference. This will do checks to make sure
-		 * it is valid so that exceptions won't be thrown later when actually dereferenced.
-		 * 
-		 * @param field
-		 * @param receiver
-		 * @return
-		 * @throws IllegalArgumentException
-		 * 
-		 * @since 1.1.0
-		 */
-		public static FieldAccessReference createFieldAccessReference(Field field, Object receiver) throws IllegalArgumentException {
-			// If static, then receiver is ignored.
-			if (!Modifier.isStatic(field.getModifiers())) {
-				if (!field.getDeclaringClass().isInstance(receiver))
-					throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CreateFieldAccessReference.FieldsTypesNotMatching_EXC_"), new Object[]{field.getType(), (receiver!=null ? receiver.getClass() : null)})); //$NON-NLS-1$
-			}
-			field.setAccessible(true);	// Make it always accessible. Trust it. 
-			return new FieldAccessReference(field, receiver);
-		}
-		
-		protected FieldAccessReference(Field field, Object receiver) {
-			this.field = field;
-			this.receiver = receiver;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.ExpressionProcesser.VariableReference#dereference()
-		 */
-		public Object dereference() {
-			try {
-				return field.get(receiver);
-			} catch (IllegalArgumentException e) {
-				// Shouldn't occur. Already tested for this.
-				e.printStackTrace();
-			} catch (IllegalAccessException e) {
-				// Shouldn't occur. Already tested for this.
-				e.printStackTrace();
-			}
-			return null;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.ExpressionProcesser.VariableReference#set(java.lang.Object, java.lang.Class)
-		 */
-		public Object set(Object value, Class type) throws IllegalArgumentException, IllegalAccessException {
-			field.set(receiver, value);
-			return field.get(receiver);	// Just in case some conversion happened. Technically it is not the value set but the retrieved when in an assignment.
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
-		public String toString() {
-			return "FieldAccess{"+field.toString()+"} on "+(receiver != null ? receiver.toString() : "<static access>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-	}
-	
-	/**
-	 * A variable reference for an Array access. It will reference only the last indexed entry of the array.
-	 * For example if <code>x[3][4]</code> is the access, then what will be given to this reference will be
-	 * the array entry at x[3][4], not the x array itself.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static class ArrayAccessReference extends VariableReference {
-		
-		
-		private final Object array;
-		private final int index;
-
-		/**
-		 * Use this to construct an array access reference. This will do checks to make sure
-		 * it is valid so that exceptions won't be thrown later when actually dereferenced.
-		 * 
-		 * @param array
-		 * @param index
-		 * @return
-		 * @throws IllegalArgumentException
-		 * 
-		 * @since 1.1.0
-		 */
-		public static ArrayAccessReference createArrayAccessReference(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-			int len = Array.getLength(array);
-			if (index < 0 || len <= index)
-				throw new ArrayIndexOutOfBoundsException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CreateArrayAccessReference.OutOfBounds_EXC_"), new Object[]{new Integer(index), new Integer(len)})); //$NON-NLS-1$
-			return new ArrayAccessReference(array, index);
-		}
-		/**
-		 * Construct the reference with the array and the index of the entry being referenced.
-		 * @param array
-		 * @param index
-		 * 
-		 * @since 1.1.0
-		 */
-		protected ArrayAccessReference(Object array, int index) {
-			this.array = array;
-			this.index = index;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.VariableReference#dereference()
-		 */
-		public Object dereference() {
-			return Array.get(array, index);
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.VariableReference#set(java.lang.Object, java.lang.Class)
-		 */
-		public Object set(Object value, Class type) throws IllegalArgumentException {
-			Array.set(array, index, value);
-			return Array.get(array, index);	// In case there was some conversion applied. Technically it is not the value set but the retrieved when in an assignment.
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
-		public String toString() {
-			return "ArrayAccess["+index+"]: "+array.toString(); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	
-	/**
-	 * The expression result stack and the expression result type stack.
-	 * The type stack is used to be expected type of the corresponding
-	 * expression result. This is needed for converting to primitives
-	 * and for finding correct method call from the argument types. In
-	 * this case, it is not the true value, but the value expected, e.g.
-	 * <code>Object getObject()</code> returns something of type Object.
-	 * This needs to be maintained so that if it goes into another method
-	 * we don't accidently return a more specific method instead of the
-	 * one that takes Object as an argument. 
-	 * 
-	 * expressionStack has result of the expression.
-	 * expressionTypeStack has the computed type of the expression i.e.
-	 * the type that the expression returns, not the type of the value.
-	 * These can be different because the expression (e.g. method) may
-	 * return an Object, but the expression value will be some specific
-	 * subclass. So the expressionTypeStack would have a <code>java.lang.Object.class</code>
-	 * on it in that case.
-	 * Note: if the expressionStack has a <code>null</code> on it, then the type stack
-	 * may either have a specific type in it, or it may be <code>MethodHelper.NULL_TYPE</code>. It
-	 * would be this if it was explicitly pushed in and not as the
-	 * result of a computation. If the result of a computation, it would have the
-	 * true value.
-	 * Note: if the expressionStack has a <code>Void.type</code> on it, then that
-	 * means the previous expression had no result. This is an error if trying to
-	 * use the expression in another expression.
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.initParser.MethodHelper#NULL_TYPE
-	 */
-	private List expressionStack = new ArrayList(10);
-	private List expressionTypeStack = new ArrayList(10);
-	
-	/**
-	 * List of the expression proxies. The index into the list is the
-	 * same as the expression proxy id. 
-	 */
-	private ArrayList expressionProxies;	// It is array list because we want to call ensureCapacity and that is not available on List.
-	
-	/**
-	 * An error has occurred. At this point all subcommands will simply make sure they flush the input stream
-	 * correctly, but they do not process it.
-	 * 
-	 * @since 1.0.0
-	 */
-	private boolean errorOccurred = false;
-	private boolean novalueException = false;
-	
-	private Throwable exception = null;	// Was there another kind of exception that was caught.
-	
-	/**
-	 * Process all other exceptions then the NoExpressionValueException. This can be called from usage code so that if there was an error
-	 * in setting up for a call to the processer it can be logged.
-	 * 
-	 * @param e
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void processException(Throwable e) {
-		// Process all other exceptions.
-		novalueException = false;
-		while (e.getCause() != null)
-			e = e.getCause();
-		if (traceOn) {
-			System.out.println();
-			System.out.print("***** >>>\tException: "); //$NON-NLS-1$
-			System.out.println(e);
-		}
-		throwException(e);	// Treat as a throw to let try/catches expressions handle it.
-	}
-	
-	/**
-	 * This is a syntax exception. This means data coming across is corrupted in
-	 * some way so no further processing should occur. 
-	 * @param e
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final void processSyntaxException(Throwable e) {
-		errorOccurred = true;
-		novalueException = false;
-		exception = e;		
-	}
-		
-	/**
-	 * Process a NoExpressionValueException. Don't wrapper these.
-	 * @param e
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final void processSyntaxException(NoExpressionValueException e) {
-		if (traceOn) {
-			// This can happen at any time, so make sure we are on a new line.
-			System.out.println();
-			printTrace("Expression has no value", false); //$NON-NLS-1$
-		}
-		try {
-			errorOccurred = true;
-			novalueException = true;
-			exception = e;
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Return whether there are any errors.
-	 * 
-	 * @return <code>true</code> if no errors.
-	 * 
-	 * @since 1.0.0
-	 */
-	public boolean noErrors() {
-		return !errorOccurred;
-	}
-	
-	/**
-	 * Return whether the error is a NoExpressionValueException or not.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isNoExpressionValue() {
-		return novalueException;
-	}
-	
-	/**
-	 * Return the throwable if a Throwable was caught.
-	 * 
-	 * @return The throwable, or <code>null</code> if not set.
-	 * 
-	 * @since 1.0.0
-	 */
-	public Throwable getErrorThrowable() {
-		return exception;
-	}
-
-	/**
-	 * Push the expression value and its expected type.
-	 * @param o
-	 * @param type
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void pushExpressionValue(Object o, Class type) {
-		expressionStack.add(o);
-		expressionTypeStack.add(type);
-	}
-
-	/**
-	 * Pop just the expression value. It is imperitive that the expression type
-	 * is popped immediately following. Separated the methods so that we
-	 * don't need to create an array to return two values. This will dereference
-	 * any variable references.
-	 * 
-	 * @return The value.
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final Object popExpression() throws NoExpressionValueException {
-		return popExpression(true);
-	}
-	
-	/**
-	 * Pop just the expression value. It is imperitive that the expression type
-	 * is popped immediately following. Separated the methods so that we
-	 * don't need to create an array to return two values.
-	 * 
-	 * @param deReference If the top expression is a Reference, then dereference it.
-	 * @return The value.
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final Object popExpression(boolean deReference) throws NoExpressionValueException {
-		try {
-			// Do not pop above the current subexpression pos, if any.
-			if (topSubexpression != -1)
-				if (expressionStack.size() == subexpressionStackPos[topSubexpression])
-					throw new NoExpressionValueException();
-			
-			Object result = expressionStack.remove(expressionStack.size()-1);
-			if (deReference && result instanceof VariableReference)
-				result = ((VariableReference) result).dereference();
-			return result;
-		} catch (IndexOutOfBoundsException e) {
-			throw new NoExpressionValueException();
-		}
-	}
-
-	/**
-	 * Get the expression at <code>fromTop</code> down from the top. This is
-	 * need for when multi-operators happen and they are stored in reverse of 
-	 * what is needed. They would normally be stored left to right, with the
-	 * rightmost one on top. But they need to be processed left to right, so
-	 * to get the left most one requires digging down in the stack.
-	 * <p>
-	 * When done, <code>popExpressions(int count)</code> must be called to
-	 * clean them out since they were processed.
-	 * <p>
-	 * This will not dereference the expression. It is the job of the caller to do this. 
-	 *  
-	 * @param fromTop <code>1</code> is the top one, <code>2</code> is the next one down.
-	 * @return The entry from the top that was requested.
-	 * @throws NoExpressionValueException
-	 * 
-	 * @see IDEExpression#popExpressions(int)
-	 * @since 1.0.0
-	 */
-	protected final Object getExpression(int fromTop) throws NoExpressionValueException {
-		try {
-			// Do not pull above the current subexpression pos, if any.			
-			if (topSubexpression != -1)
-				if (expressionStack.size()-fromTop < subexpressionStackPos[topSubexpression])
-					throw new NoExpressionValueException();
-			
-			return expressionStack.get(expressionStack.size()-fromTop);
-		} catch (IndexOutOfBoundsException e) {
-			throw new NoExpressionValueException();
-		}
-	}
-	
-	/**
-	 * Remove the top <code>count</code> items. This will not cause dereferencing to occur. It
-	 * removes the corresponding type stack entries.
-	 * 
-	 * @param count
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void popExpressions(int count) throws NoExpressionValueException {
-		try {
-			// Do not pop above the current subexpression pos, if any.
-			int stop = topSubexpression != -1 ? subexpressionStackPos[topSubexpression] : -1;
-			int remove = expressionStack.size()-1;
-			while (count-- > 0) {
-				if (expressionStack.size() <= stop)
-					throw new NoExpressionValueException();	// Try to go above the current subexpression.
-				expressionStack.remove(remove);
-				expressionTypeStack.remove(remove--);
-			}
-		} catch (IndexOutOfBoundsException e) {
-			throw new NoExpressionValueException();
-		}
-	}
-	
-	/**
-	 * Pop just the expression type. It is imperitive that the expression type
-	 * is popped immediately following popExpression. Separated the methods so that we
-	 * don't need to create an array to return two values.
-	 * <p>
-	 * If the allowVoid is false and type is void, then a NoExpressionValueException will be thrown.
-	 * This is for the case where the expression was trying to be used in a different
-	 * expression. This will be set to void only on expressions that return no value (only
-	 * method's do this for now).
-	 * 
-	 * @param allowVoid Allow void types if <code>true</code>
-	 * @return The type.
-	 * @throws NoExpressionValueException
-	 * @since 1.0.0
-	 */
-	protected final Class popExpressionType(boolean allowVoid) throws NoExpressionValueException {
-		try {
-			Class result = (Class) expressionTypeStack.remove(expressionTypeStack.size()-1);
-			if (!allowVoid && result == Void.TYPE)
-				throw new NoExpressionValueException(InitparserTreeMessages.getString("ExpressionProcesser.PopExpressionType.ExpressionVoid_EXC_")); //$NON-NLS-1$
-			return result;
-				
-		} catch (IndexOutOfBoundsException e) {
-			throw new NoExpressionValueException();
-		}
-	}
-
-	/**
-	 * Get the expression type at <code>fromTop</code> down from the top. This is
-	 * need for when multi-operators happen and they are stored in reverse of 
-	 * what is needed. They would normally be stored left to right, with the
-	 * rightmost one on top. But they need to be processed left to right, so
-	 * to get the left most one requires digging down in the stack.
-	 * <p>
-	 * When done, <code>popExpressionTypes(int count)</code> must be called to
-	 * clean them out since they were processed.
-
-	 * @param fromTop <code>1</code> is the top one, <code>2</code> is the next one down.
-	 * @param allowVoid Allow void types if <code>true</code>
-	 * @return The type from the top that was requested.
-	 * @throws ThrowableProxy
-	 * @throws NoExpressionValueException
-	 * 
-	 * @see IDEExpression#popExpressionTypes(int)
-	 * @since 1.0.0
-	 */
-	protected final Class getExpressionType(int fromTop, boolean allowVoid) throws NoExpressionValueException {
-		try {
-			Class result = (Class) expressionTypeStack.get(expressionTypeStack.size()-fromTop);
-			if (!allowVoid && result == Void.TYPE)
-				throw new NoExpressionValueException();
-			return result;
-		} catch (IndexOutOfBoundsException e) {
-			throw new NoExpressionValueException();
-		}
-	}
-	
-	/**
-	 * Flag indicating expression should be ignored and not processed.
-	 * This happens because of few cases, like conditional and, that
-	 * if one returns false, the rest of the expressions in that conditional and
-	 * expression should be ignored and not processed.
-	 * <p>
-	 * It is an Object that acts as an enum for the type of expression that initiated the ignore. 
-	 * If it is <code>null</code> then no one is ignoring. 
-	 * <p>
-	 * All of the pushTo...Proxy methods must test this for this to work correctly.
-	 * Each expression has some way of testing that their particular nesting of 
-	 * expressions is complete and they can turn off the ignore flag.
-	 * <p>
-	 * Only one type of ignore can exist at a time.
-	 */
-	protected Object ignoreExpression = null;	
-	
-	
-	private List saveStates;
-	
-	/**
-	 * Are we tracing or not.
-	 */
-	protected final boolean traceOn;
-	private final long thresholdTime;
-	private long startExpressionStepTime;
-	private long startExpressionTime;
-	private long lastExpressionEndTime;
-	
-	/**
-	 * Trace head of this expression. So that traces from different expressions can be distinquished.
-	 * It is simply an monotonically increasing counter. It is the header string for any trace output.
-	 */
-	protected final String traceHeader;
-	
-	private int indent = 0;	// Indented for certain block expressions.
-	
-	/*
-	 * Trace counter. It is incremented once for each expression and assigned to the traceId of the expression.
-	 */
-	private static int TRACE_COUNTER;
-	
-	/**
-	 * Create the Expression without tracing.
-	 * @param registry
-	 * 
-	 * @since 1.0.0
-	 */
-	public ExpressionProcesser() {
-		this(false, -1);
-	}
-	
-	/**
-	 * Create the expression, and set the tracing mode and threshold time. Use -1
-	 * for default time of 100ms.
-	 * @param traceOn
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProcesser(boolean traceOn, long threshold) {
-		this.traceOn = traceOn;
-		if (traceOn) {
-			traceHeader = "**"+(++TRACE_COUNTER)+':'; //$NON-NLS-1$
-			System.out.print(traceHeader);
-			System.out.println(" Start expression"); //$NON-NLS-1$
-			this.thresholdTime = threshold != -1 ? threshold : 100;
-			lastExpressionEndTime = startExpressionTime = System.currentTimeMillis();
-		} else {
-			traceHeader = null;
-			thresholdTime = 100;
-		}
-	}
-	
-	/**
-	 * Trace msg helper. Should only be called if traceOn is true. This method is only used to start a new trace message.
-	 * The caller is must call printTraceEnd at the end.
-	 *  
-	 * @param msg message to print
-	 * @param ignore are we ignoring the expression, or is it being processed (this just alters the trace output slightly).
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void printTrace(String msg, boolean ignore) {
-		startExpressionStepTime = System.currentTimeMillis();
-		long sinceLastExpression = startExpressionStepTime - lastExpressionEndTime;
-		System.out.print(traceHeader);
-		if (sinceLastExpression > 0) {
-			System.out.print('(');
-			if (sinceLastExpression > thresholdTime)
-				System.out.print("***"); //$NON-NLS-1$
-			System.out.print(sinceLastExpression);
-			System.out.print("ms)"); //$NON-NLS-1$
-		}
-		System.out.print('\t');
-		if (!ignore)
-			System.out.print("\t"); //$NON-NLS-1$
-		else
-			System.out.print("##\t"); //$NON-NLS-1$
-		
-		printIndent();
-		System.out.print(msg);
-	}
-	
-	/**
-	 * print the indent. It will not do a new line before nor after.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void printIndent() {
-		for(int i=indent; i>0; i--) {
-			System.out.print("  "); //$NON-NLS-1$
-		}
-	}
-
-	protected void printTraceEnd() {
-		long stop = System.currentTimeMillis()-startExpressionStepTime;
-		if (stop > 0) {
-			System.out.print(" ("); //$NON-NLS-1$
-			if (stop > thresholdTime)
-				System.out.print("***"); //$NON-NLS-1$
-			System.out.print(stop);
-			System.out.print("ms)"); //$NON-NLS-1$
-		}
-		System.out.println();
-		lastExpressionEndTime = System.currentTimeMillis();
-	}
-	
-	/**
-	 * Do an indent (undent) according to indent flag.
-	 * @param indent <code>true</code> to increment indent, or otherwise decrement.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void indent(boolean indent) {
-		this.indent += (indent ? 1 : -1);
-		if (this.indent < 0)
-			this.indent = 0;
-	}
-	
-	/**
-	 * Print the object and type. It will not end with a newline char, so one will be needed afterwards.
-	 * 
-	 * @param o
-	 * @param t
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void printObjectAndType(Object o, Class t) {
-		System.out.print(' ');
-		System.out.print("Object-"); //$NON-NLS-1$
-		System.out.print(o);
-		System.out.print(" Type-"); //$NON-NLS-1$
-		System.out.print(t);
-		System.out.print(' ');
-	}
-	
-	/**
-	 * Close the exception processing
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void close() {
-		boolean firstClose = expressionStack != null;
-		if (firstClose && traceOn) {
-			printTrace("End expression", false); //$NON-NLS-1$
-			long totalTime = System.currentTimeMillis()-startExpressionTime;
-			System.out.print(" Total expression evaluation time: "); //$NON-NLS-1$
-			System.out.print(totalTime);
-			System.out.print("ms."); //$NON-NLS-1$
-		}
-		try {
-			expressionStack = null;
-			expressionTypeStack = null;
-			expressionProxies = null;
-			exception = null;
-			catchThrowable = null;
-			saveStates = null;
-		} finally {
-			if (firstClose && traceOn)
-				printTraceEnd();
-		}
-	}
-
-	/**
-	 * Pull the value. The value will be placed into the array passed in.
-	 * It will be stored as value[0] = value value[1] = valuetype(Class).
-	 * 
-	 * @param value The value array to store the value and type into.
-	 * @throws NoExpressionValueException
-	 * @since 1.0.0
-	 */
-	public final void pullValue(Object[] value) throws NoExpressionValueException {
-		if (traceOn)
-			printTrace("Pull value:", false); //$NON-NLS-1$
-		try {
-			value[0] = popExpression();
-			value[1] = popExpressionType(false);
-		} finally {
-			if (traceOn) {
-				printObjectAndType(value[0], (Class) value[1]);
-				printTraceEnd();
-			}
-		}
-		close();
-	}
-	
-	/**
-	 * Pull the value of the expression proxy, dereferencing it if necessary. This is for resolution only purposes at the
-	 * end of the expression being processed. Not meant for general access to the value of expression proxy. Use 
-	 * {@link ExpressionProcesser#getExpressionProxyValue(int, Object[])} instead for general access to the value.
-	 * 
-	 * @param proxyid
-	 * @param value
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pullExpressionProxyValue(int proxyid, Object[] value) throws NoExpressionValueException {
-		getExpressionProxyValue(proxyid, value, true, true);
-	}
-	
-	/**
-	 * Get the expression proxy value. If the expression has not yet been evaluated it will
-	 * return false. If it has it will return true.
-	 * @param proxyid
-	 * @param value put value into value[0] and the type into value[1].
-	 * @return <code>true</code> if successful, or <code>false</code> if the expression proxy was never resolved or doesn't exist.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean getExpressionProxyValue(int proxyid, Object[] value) {
-		try {
-			return getExpressionProxyValue(proxyid, value, true, false);
-		} catch (NoExpressionValueException e) {
-			return false;
-		}
-	}
-	
-	/**
-	 * Get the expression proxy value, or the NoExpressionValueException if not resolved. This
-	 * is useful for callers that need to handle the proxy itself for failed calls.
-	 * 
-	 * @param proxyid
-	 * @param value
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void getExpressionProxy(int proxyid, Object[] value) throws NoExpressionValueException {
-		getExpressionProxyValue(proxyid, value, true, false);
-	}
-	
-	/*
-	 * Internal method use to actually get the value, but to distinquish between pull and get of the public interface.
-	 * Get will process the errors as normal execution errors, while pull will throw the errors. finalTrace is when
-	 * this is the final call to return the values to the client. We will trace the results in that case.
-	 * Return true if successful.
-	 */
-	private boolean getExpressionProxyValue(int proxyid, Object[] value, boolean pull, boolean finalTrace) throws NoExpressionValueException {
-		// Note: This will throw the exceptions right away since this is called from outside to fill in the value and
-		// so we are holding such exceptions.
-		boolean doTrace = finalTrace && traceOn;
-		try {
-			if (expressionProxies != null && expressionProxies.size() > proxyid) {
-				InternalExpressionProxy proxy = (InternalExpressionProxy) expressionProxies.get(proxyid);
-				if (proxy != null && proxy.isSet()) {
-					value[0] = proxy.getValue();
-					if (value[0] instanceof VariableReference)
-						value[0] = ((VariableReference) value[0]).dereference(); // Here we want the final current value.
-					value[1] = proxy.getType();
-					if (doTrace)
-						if (value[1] != Void.TYPE) {
-							printTrace("Return Proxy #" + proxyid + " Resolved to", false); //$NON-NLS-1$ //$NON-NLS-2$
-							printObjectAndType(value[0], (Class) value[1]);
-						} else
-							printTrace("Return Proxy #" + proxyid + " Resolved to void.", false); //$NON-NLS-1$ //$NON-NLS-2$
-					return true;
-
-				} else {
-					if (doTrace)
-						printTrace("Return Proxy #" + proxyid + ": Not resolved", false); //$NON-NLS-1$ //$NON-NLS-2$
-					NoExpressionValueException e = new NoExpressionValueException(InitparserTreeMessages.getString("ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyNotSet_EXC_"), proxy); //$NON-NLS-1$
-					if (pull)
-						throw e;
-					else
-						processSyntaxException(e);
-					return false;
-				}
-			} else {
-				if (doTrace)
-					printTrace("Return Proxy #" + proxyid + ": Never created.", false); //$NON-NLS-1$ //$NON-NLS-2$
-				NoExpressionValueException e = new NoExpressionValueException(InitparserTreeMessages.getString("ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyDoesntExist_EXC_")); //$NON-NLS-1$
-				if (pull)
-					throw e;
-				else
-					processSyntaxException(e);
-				return false;
-			}
-		} finally {
-			if (doTrace)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Push the expression (just a value) onto the stack.
-	 * 
-	 * @param o
-	 * @param t
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushExpression(Object o, Class t) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		if (traceOn) {
-			printTrace("Push: ", ignore); //$NON-NLS-1$
-			printObjectAndType(o, t);
-		}
-		try {
-			if (ignore)
-				return;
-			pushExpressionValue(o, t);
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Get the value of the expression proxy (from proxy id), and push the value onto the stack.
-	 *  
-	 * @param proxyid The proxy id of the ExpressionProxy to push as a value.
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushExpressionProxy(int proxyid) {
-		boolean ignore =(ignoreExpression != null || errorOccurred);
-		if (traceOn)
-			printTrace("Push Expression Proxy #"+proxyid, ignore); //$NON-NLS-1$
-		try {
-			if (ignore)
-				return;
-			if (expressionProxies != null && expressionProxies.size() > proxyid) {
-				InternalExpressionProxy proxy = (InternalExpressionProxy) expressionProxies.get(proxyid);
-				if (proxy != null && proxy.isSet()) {
-					if (traceOn)
-						printObjectAndType(proxy.getValue(), proxy.getType());
-					pushExpressionValue(proxy.getValue(), proxy.getType());	// Can push a VariableReference. This is ok. When used it will then deref with the current value.
-				} else
-					processException(new NoExpressionValueException("Proxy id: "+proxyid)); //$NON-NLS-1$
-			} else
-				processException(new NoExpressionValueException("Proxy id: "+proxyid)); //$NON-NLS-1$
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Push a cast onto stack. The type passed in is either a String (with classname to cast to) or the
-	 * type to cast to.
-	 * @param type To cast to. If <code>String</code> then convert to type (using something like <code>Class.forName()</code>) or it is a Class
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushCast(Class type) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		if (traceOn)
-			printTrace("Cast to: "+type, ignore); //$NON-NLS-1$
-		try {
-			if (ignore)
-				return;
-			
-			try {
-				Object exp = popExpression();
-				Class exptype = popExpressionType(false);
-				
-				pushExpressionValue(castBean(type, exp, exptype), type);
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-	
-	/**
-	 * Cast a bean into the return type. If the return type is not primitive, then
-	 * the bean is left alone, however it is checked to be an instance of
-	 * the return type. If the return type is primitive, then the
-	 * correct primitive wrapper is created from the bean (bean must be a number or character or boolean primitve so
-	 * that cast will work).
-	 * <p>
-	 * However if can't be cast for primitive or if not an instance of the
-	 * returntype for objects, a ClassCastException will be raised.
-	 * <p>
-	 * This is a helper method for expression processer to cast a bean. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-	 * 
-	 * @param returnType
-	 * @param bean
-	 * @param beanType The type that bean is supposed to be (e.g. even though it is a Number, it actually represents a primitive).
-	 * @return The cast bean (either to the appropriate primitive wrapper type or bean)
-	 * 
-	 * @throws ClassCastException
-	 * @since 1.0.0
-	 */
-	protected final Object castBean(Class returnType, Object bean, Class beanType) throws ClassCastException {
-		// Cast uses true value and true class of bean, not expected type (i.e. not beanType).
-		if (bean == null)
-			if (!returnType.isPrimitive())
-				return bean;	// bean is null, and return type is not primitive, so this is a valid cast.
-			else 
-				throwClassCast(returnType, bean);
-		else if (returnType.equals(bean.getClass()))
-			return bean;	// They are already the same.
-		else if (!returnType.isPrimitive()) {
-			if (!beanType.isPrimitive() && returnType.isInstance(bean))
-				return bean;
-			else
-				throwClassCast(returnType, bean);	// Either bean type was wrappering primitive or not instanceof returntype.
-		} else {
-			if (!beanType.isPrimitive())
-				throwClassCast(returnType, bean);	// bean type was not wrappering a primitive. Can't cast to primitive.
-			// It is return type of primitive. Now convert to correct primitive.
-			if (returnType == Boolean.TYPE)
-				if (bean instanceof Boolean)
-					return bean;
-				else
-					throwClassCast(returnType, bean);
-			else {
-				if (bean instanceof Number) {
-					if (returnType == Integer.TYPE)
-						if (bean instanceof Integer)
-							return bean;
-						else
-							return new Integer(((Number) bean).intValue());
-					else if (returnType == Byte.TYPE)
-						if (bean instanceof Byte)
-							return bean;
-						else
-							return new Byte(((Number) bean).byteValue());
-					else if (returnType == Character.TYPE)
-						if (bean instanceof Character)
-							return bean;
-						else
-							return new Character((char) ((Number) bean).intValue());
-					else if (returnType == Double.TYPE)
-						if (bean instanceof Double)
-							return bean;
-						else
-							return new Double(((Number) bean).doubleValue());
-					else if (returnType == Float.TYPE)
-						if (bean instanceof Float)
-							return bean;
-						else
-							return new Float(((Number) bean).floatValue());
-					else if (returnType == Long.TYPE)
-						if (bean instanceof Long)
-							return bean;
-						else
-							return new Long(((Number) bean).longValue());
-					else if (returnType == Short.TYPE)
-						if (bean instanceof Short)
-							return bean;
-						else
-							return new Short(((Number) bean).shortValue());	
-					else
-						throwClassCast(returnType, bean);
-				} else if (bean instanceof Character) {
-					if (returnType == Character.TYPE)
-						return bean;
-					else if (returnType == Integer.TYPE)
-						return new Integer(((Character) bean).charValue());
-					else if (returnType == Byte.TYPE)
-						return new Byte((byte) ((Character) bean).charValue());
-					else if (returnType == Double.TYPE)
-						return new Double(((Character) bean).charValue());
-					else if (returnType == Float.TYPE)
-						return new Float(((Character) bean).charValue());
-					else if (returnType == Long.TYPE)
-						return new Long(((Character) bean).charValue());
-					else if (returnType == Short.TYPE)
-						return new Short((short) ((Character) bean).charValue());	
-					else
-						throwClassCast(returnType, bean);
-				} else
-					throwClassCast(returnType, bean);
-			}
-			
-		}
-		return null;	// It should never get here;
-	}
-	
-	private void throwClassCast(Class returnType, Object bean) throws ClassCastException {
-		throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CannotCastXToY_EXC_"), new Object[] {bean != null ? bean.getClass().getName() : null, returnType.getName()})); //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the primitive type that the wrapper bean represents (i.e. Boolean instance returns Boolean.TYPE) 
-	 * <p>
-	 * This is a helper method for expression processer to get the primitive type. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-
-	 * @param bean
-	 * @return the primitive type class of the given bean.
-	 * @throws IllegalArgumentException if bean is <code>null</code> or not of the type that can be converted to a primitive.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final Class getPrimitiveType(Object bean) throws IllegalArgumentException {
-		if (bean instanceof Boolean)
-			return Boolean.TYPE;
-		else if (bean instanceof Integer)
-			return Integer.TYPE;
-		else if (bean instanceof Byte)
-			return Byte.TYPE;
-		else if (bean instanceof Character)
-			return Character.TYPE;
-		else if (bean instanceof Double)
-			return Double.TYPE;
-		else if (bean instanceof Float)
-			return Float.TYPE;
-		else if (bean instanceof Long)
-			return Long.TYPE;
-		else if (bean instanceof Short)
-			return Short.TYPE;
-		else
-			throw new IllegalArgumentException(bean != null ? bean.getClass().getName() : "null"); //$NON-NLS-1$
-	}
-	
-	private static final Object IFELSE_IGNORE = "IF/ELSE IGNORE";	// Flag for if/else in ingore //$NON-NLS-1$
-	private int ifElseNesting = 0;	// Nesting of if/else expressions.
-	private int ifElseIgnoreNestCount = 0;	// When ignoring if/else expressions, ignore until this nest count.
-	private boolean ifElseSkipTruePart;
-
-	
-	/**
-	 * Push an if test expression.
-	 * @param hasElseClause
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushIfElse() {
-		try {
-			boolean ignore = true;
-			try {
-				if (errorOccurred)
-					return;
-				// Slightly different here in that if an ignoring occurred we still need to process at least part of it so that
-				// we can get the expression grouping correct.
-				ifElseNesting++;	// We have the test.
-	
-				if (ignoreExpression != null)
-					return;
-				ignore = false;
-			} finally {
-				if (traceOn)
-					printTrace("If test condition", ignore); //$NON-NLS-1$
-			}
-					
-			try {
-				Object condition = popExpression();
-				Class type = popExpressionType(false);
-				if (type != Boolean.TYPE)
-					throwClassCast(Boolean.TYPE, condition);
-				if (traceOn) {
-					System.out.print(" Test Result="+condition); //$NON-NLS-1$
-					printTraceEnd();
-					indent(true);
-					printTrace("Begin True Expression.", ignore); //$NON-NLS-1$
-					printTraceEnd();
-					indent(true);
-				}				
-				if (((Boolean) condition).booleanValue()) {
-					// Condition was true.
-					// Do nothing. Let true condition be processed.
-				} else {
-					// Condition was false.
-					ifElseSkipTruePart = true;	// Tell the true condition should be ignored.
-					ignoreExpression = IFELSE_IGNORE;
-					ifElseIgnoreNestCount = ifElseNesting;
-				}
-				// We don't put anything back on the stack because the condition test is not ever returned.
-				// The appropriate true or false condition evaluation will be left on the stack.
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-
-	/**
-	 * Push an if/else clause. It can be any clause of the if (true, or false clause).
-	 * @param clauseType
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushIfElse(InternalIfElseOperandType clauseType) {
-		try {
-			boolean ignore = true;
-			if (errorOccurred)
-				return;
-			// Slightly different here in that if an ignoring occurred we still need to process at least part of it so that
-			// we can get the expression grouping correct.
-			switch (clauseType.getValue()) {
-			case InternalIfElseOperandType.TRUE_CLAUSE_VALUE:
-					if (traceOn) {
-						indent(false);
-						printTrace("Begin False Expression.", ignore); //$NON-NLS-1$
-						printTraceEnd();
-						indent(true);
-					}
-					if (ifElseSkipTruePart && ignoreExpression == IFELSE_IGNORE && ifElseIgnoreNestCount == ifElseNesting) {
-						// stop ignoring, we've ignored the true condition of interest.
-						ignoreExpression = null;
-						return; // However, leave because since this condition was ignored.
-					}
-					break;
-				case InternalIfElseOperandType.ELSE_CLAUSE_VALUE:
-					if (traceOn) {
-						indent(false);
-						indent(false);
-						printTrace("End IF/ELSE Expression.", ignore); //$NON-NLS-1$
-						printTraceEnd();
-					}					
-					int currentNesting = ifElseNesting--;
-					if (ignoreExpression == IFELSE_IGNORE && ifElseIgnoreNestCount == currentNesting) {
-						// stop ignoring, we've ignored the false condition of interest.
-						ignoreExpression = null;
-						return; // However, leave because since this condition was ignored.
-					}
-			}
-	
-				if (ignoreExpression != null)
-					return;
-				ignore = false;
-
-					
-			try {
-				switch (clauseType.getValue()) {
-					case InternalIfElseOperandType.TRUE_CLAUSE_VALUE:
-						ifElseSkipTruePart = false;	// Tell the false condition should be ignored.
-						ignoreExpression = IFELSE_IGNORE;
-						ifElseIgnoreNestCount = ifElseNesting;
-						break;
-					case InternalIfElseOperandType.ELSE_CLAUSE_VALUE:
-						// There's nothing to do, if it was ignored due to true, we wouldn't of gotton here.
-						// If it wasn't ignored, then the result of the false expression is on the stack, which is what it should be.
-						break;
-				}
-			} catch (RuntimeException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-
-	/**
-	 * Push the instanceof expression.  The type passed in is either a String (with classname to test against) or the
-	 * type to test against.
-	 * @param type To test against.
-	 * @since 1.0.0
-	 */
-	public final void pushInstanceof(Class type) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		if (traceOn)
-			printTrace("Instanceof type: "+type, ignore); //$NON-NLS-1$
-		try {
-			if (ignore)
-				return;
-			
-			try {
-				Object exp = popExpression();
-				Class exptype = popExpressionType(false);
-				pushExpressionValue(Boolean.valueOf(isInstance(type, exp, exptype)), Boolean.TYPE);
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			} catch (RuntimeException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Test if instance of. It will make sure that primitive to non-primitive is not permitted.
-	 * This is a true instance of, which means null IS NOT AN instance of any type. This is
-	 * different then assignable from, in that case null can be assigned to any class type.
-	 * <p>
-	 * This is a helper method for expression processer to do isInstance. Since it is a helper method it doesn't
-	 * check nor process exceptions.
-
-	 * @param type
-	 * @param bean
-	 * @param beanType
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final boolean isInstance(Class type, Object bean, Class beanType) {
-		if (type.isPrimitive())
-			return beanType.isPrimitive() && type == beanType;	// Can't use isInstance because for a primitive type isInstance returns false.
-		else 
-			return type.isInstance(bean);
-	}
-	
-	/**
-	 * Push new instance from string.
-	 * @param initializationString
-	 * @param resultType expected result type. If it isn't of that type, a classcast will be processed. 
-	 * @param classloader classloader to use for finding classes, or <code>null</code> to use classloader of InitializationStringParser.class.
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushNewInstanceFromString(String initializationString, Class resultType, ClassLoader classloader) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		if (traceOn)
-			printTrace("New instance from string: \""+initializationString+"\" Type="+resultType, ignore); //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-			if (ignore)
-				return;
-			
-			try {
-				InitializationStringParser parser = InitializationStringParser.createParser(initializationString, classloader);
-				Object newValue = parser.evaluate();
-				newValue = castBean(resultType, newValue, parser.getExpectedType());
-				pushExpressionValue(newValue, resultType);
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (InitializationStringEvaluationException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-
-	}
-
-	/**
-	 * Push prefix expression.
-	 * @param operator 
-	 * @since 1.0.0
-	 */
-	public final void pushPrefix(PrefixOperator operator) {
-		try {
-			if (ignoreExpression != null || errorOccurred) {
-				if (traceOn)
-					printTrace("Prefix: \'"+operator+"\'", true); //$NON-NLS-1$ //$NON-NLS-2$
-				return;
-			}
-			
-			if (operator == PrefixOperator.PRE_PLUS)
-				return;	// Do nothing. "+" doesn't affect the result of the current top expression.
-	
-			if (traceOn)
-				printTrace("Prefix: \'"+operator+"\' ", false); //$NON-NLS-1$ //$NON-NLS-2$
-	
-			try {
-				Object exp = popExpression();
-				Class exptype = popExpressionType(false);
-				if (!exptype.isPrimitive())
-					throwInvalidPrefix(operator, exp);
-				
-				int primTypeEnum = getEnumForPrimitive(exptype);
-				switch (operator.getValue()) {
-					case PrefixOperator.PRE_MINUS_VALUE:
-						switch (primTypeEnum) {
-							case BOOLEAN:
-								throwInvalidPrefix(operator, exp);						
-							case BYTE:
-								exp = new Integer(-((Number) exp).byteValue());
-								break;
-							case CHAR:
-								exp = new Integer(-((Character) exp).charValue());
-								break;
-							case DOUBLE:
-								exp = new Double(-((Number) exp).doubleValue());
-								break;
-							case FLOAT:
-								exp = new Float(-((Number) exp).floatValue());
-								break;
-							case INT:
-								exp = new Integer(-((Number) exp).intValue());
-								break;
-							case LONG:
-								exp = new Long(-((Number) exp).longValue());
-								break;
-							case SHORT:
-								exp = new Integer(-((Number) exp).shortValue());
-								break;
-						}
-						exptype = getPrimitiveType(exp);	// It can actually change the type.				
-						break;
-						
-					case PrefixOperator.PRE_COMPLEMENT_VALUE:
-						switch (primTypeEnum) {
-							case BOOLEAN:
-							case DOUBLE:
-							case FLOAT:
-								throwInvalidPrefix(operator, exp);						
-							case BYTE:
-								exp = new Integer(~((Number) exp).byteValue());
-								break;
-							case CHAR:
-								exp = new Integer(~((Character) exp).charValue());
-								break;
-							case INT:
-								exp = new Integer(~((Number) exp).intValue());
-								break;
-							case LONG:
-								exp = new Long(~((Number) exp).longValue());
-								break;
-							case SHORT:
-								exp = new Integer(~((Number) exp).shortValue());
-								break;
-						}
-						exptype = getPrimitiveType(exp);	// It can actually change the type.
-						break;
-					case PrefixOperator.PRE_NOT_VALUE:
-						switch (primTypeEnum) {
-							case BOOLEAN:
-								exp = !((Boolean) exp).booleanValue() ? Boolean.TRUE : Boolean.FALSE;
-								break;
-							case BYTE:
-							case CHAR:
-							case DOUBLE:
-							case FLOAT:
-							case INT:
-							case LONG:
-							case SHORT:
-								throwInvalidPrefix(operator, exp);						
-						}				
-						break;
-					}
-				
-				if (traceOn)
-					printObjectAndType(exp, exptype);
-				pushExpressionValue(exp, exptype);	// Push the result back on the stack.
-	
-			} catch (IllegalArgumentException e) {
-				processSyntaxException(e);
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			} catch (RuntimeException e) {
-				processException(e);
-			} 
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-	
-	/**
-	 * Assign the right expression to the left expression.
-	 * @since 1.1.0
-	 */
-	public final void pushAssignment() {
-		if (ignoreExpression != null || errorOccurred) {
-			if (traceOn) {
-				printTrace("Assignment", true); //$NON-NLS-1$
-				printTraceEnd();
-			}
-			return;
-		}
-		
-		try {
-			// KLUDGE: The only reason leftValue/refType are outside of try/finally is because
-			// of tracing. pushExpression() does its own trace statements, so we need to end
-			// our trace before calling pushExpression. 
-			Object leftValue;
-			Class refType;
-			try {
-				if (traceOn)
-					printTrace("Assignment: ", false);			 //$NON-NLS-1$	
-				// The order on the stack is right then left operand.
-				// First the right operand
-				Object value = popExpression();
-				Class type = popExpressionType(false);
-
-				// Next the left operand, should be a reference.
-				VariableReference left = (VariableReference) popExpression(false); // Don't dereference it.
-				refType = popExpressionType(false);
-
-				if (traceOn)
-					printObjectAndType(left, refType);
-
-				leftValue = left.set(value, type);
-			} finally {
-				if (traceOn)
-					printTraceEnd();
-			}
-			
-			// Now do assignment and return the value to the stack.
-			pushExpression(leftValue, refType);	// The type of the result is the type of the reference.
-
-		} catch (IllegalArgumentException e) {
-			processException(e);
-		} catch (NoExpressionValueException e) {
-			processException(e);
-		} catch (IllegalAccessException e) {
-			processException(e);
-		} catch (RuntimeException e) {
-			processException(e);
-		}
-			
-	}
-	
-	/**
-	 * Assign the expression proxy to the top expression value.
-	 * 
-	 * @param proxy
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushAssignment(InternalExpressionProxy proxy) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		try {
-			if (traceOn) {
-				printTrace("Assign to Proxy #"+proxy.getProxyID(), ignore); //$NON-NLS-1$
-			}
-			if (ignore)
-				return;
-			
-			try {
-				assignToExpressionProxyFromTopStackEntry(proxy);
-				if (traceOn)
-					printObjectAndType(proxy.getValue(), proxy.getType());
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			} catch (RuntimeException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-
-	}
-
-	/**
-	 * Assign the top stack entry to the new expression proxy and allocate it for callback later.
-	 * @param proxy
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void assignToExpressionProxyFromTopStackEntry(InternalExpressionProxy proxy) throws NoExpressionValueException {
-		Object value = getExpression(1);
-		Class type = getExpressionType(1, true);
-		if (value instanceof VariableReference)
-			value = ((VariableReference) value).dereference();	// Here we want the final current value.
-
-		proxy.setProxy(value, type);
-		allocateExpressionProxy(proxy);
-	}
-
-	/**
-	 * Allocate an expression proxy. This is used to make an expression proxy known to the processor. The expression proxy must
-	 * have been setProxy() at this point. This is used to assign from the top of the stack or to add from outside an evaluated proxy
-	 * to be used later by others.
-	 * 
-	 * @param proxy
-	 * 
-	 * @since 1.1.0
-	 */
-	public void allocateExpressionProxy(InternalExpressionProxy proxy) {
-		int minSize = proxy.getProxyID()+1;
-		if (expressionProxies == null)
-			expressionProxies = new ArrayList(minSize+10);	// Allow room to grow ten more.
-		else if (expressionProxies.size() < minSize)
-			expressionProxies.ensureCapacity(minSize+10);	// Allow room to grow ten more.
-		int fill = minSize-expressionProxies.size();	// Number of "null" fill entries needed. Probably shouldn't occur, but to be safe.
-		if (fill > 0) {
-			while (--fill > 0)
-				expressionProxies.add(null);
-			expressionProxies.add(proxy);
-		} else
-			expressionProxies.set(proxy.getProxyID(), proxy);	// Already large enough, replace entry.
-
-	}
-
-	/**
-	 * The primitive enums. 
-	 * NOTE: Their order must not changed. They are in order of permitted widening.
-	 * 
-	 */
-	protected static final int
-		BOOLEAN = 0,
-		BYTE = 1,
-		SHORT = 2,	
-		CHAR = 3,
-		INT = 4,
-		LONG = 5,
-		FLOAT = 6,
-		DOUBLE = 7;
-		
-		
-	
-	/**
-	 * Get the enum constant for the type of primitive passed in.
-	 * <p>
-	 * This is a helper method for expression processer to get the enum for the primitive type. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-
-	 * @param primitiveType
-	 * @return
-	 * @throws IllegalArgumentException if type is not a primitive.
-	 * 
-	 * @see ExpressionProcesser#BOOLEAN
-	 * @since 1.0.0
-	 */
-	protected final int getEnumForPrimitive(Class primitiveType) throws IllegalArgumentException {
-		if (primitiveType == Boolean.TYPE)
-			return BOOLEAN;
-		else if (primitiveType == Integer.TYPE)
-			return INT;
-		else if (primitiveType == Byte.TYPE)
-			return BYTE;
-		else if (primitiveType == Character.TYPE)
-			return CHAR;
-		else if (primitiveType == Double.TYPE)
-			return DOUBLE;
-		else if (primitiveType == Float.TYPE)
-			return FLOAT;
-		else if (primitiveType == Long.TYPE)
-			return LONG;
-		else if (primitiveType == Short.TYPE)
-			return SHORT;
-		else
-			throw new IllegalArgumentException(primitiveType != null ? primitiveType.getName() : "null"); //$NON-NLS-1$
-	}
-	
-	private void throwInvalidPrefix(PrefixOperator operator, Object exp) throws IllegalArgumentException {
-		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfPrefixOperator_EXC_"), new Object[] {exp != null ? exp.toString() : null, operator.toString()})); //$NON-NLS-1$
-	}		
-	
-	private static final Object INFIX_IGNORE = "INFIX IGNORE";	// Flag for infix in ingore //$NON-NLS-1$
-	private int infixNesting = 0;	// Nesting of infix expressions.
-	private int infixIgnoreNestCount = 0;	// When ignoring infix expressions, ignore until this nest count.
-	/**
-	 * Push the infix expression onto the stack.
-	 * @param operator
-	 * @param operandType The operator type. Left, right, other.
-	 * @since 1.0.0
-	 */
-	public final void pushInfix(InfixOperator operator, InternalInfixOperandType operandType) {
-		try {
-			boolean ignore = true;
-			try {
-				if (errorOccurred) {
-					return;
-				}
-				// Slightly different here in that if an ignored occurred we still need to process at least part of it so that
-				// we can get the expression grouping correct.
-				if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-					infixNesting++;
-				else if (operandType == InternalInfixOperandType.INFIX_LAST_OPERAND) {
-					int currentNest = infixNesting--;
-					if (ignoreExpression == INFIX_IGNORE && currentNest == infixIgnoreNestCount) {
-						// We were ignoring, and it was this expression that was being ignore.
-						// We have received the last operand of the nested expression that was being ignored,
-						// so we can stop ignoring. But we still leave since the value of the expression is on the
-						// top of the stack.
-						ignoreExpression = null;
-						return;
-					}
-				}
-	
-				if (ignoreExpression != null)
-					return;
-				ignore = false;
-			} finally {
-				if (traceOn)
-					printTrace("Infix: "+operator, ignore); //$NON-NLS-1$
-			}
-			
-			try {
-				Object right = null;
-				Class rightType = null;
-				if (operandType != InternalInfixOperandType.INFIX_LEFT_OPERAND) {
-					// We are not the left operand, so the stack has the right on the top, followed by the left.
-					right = popExpression();
-					rightType = popExpressionType(false);
-				} 
-				
-				Object value = popExpression();
-				Class valueType = popExpressionType(false);
-	
-				switch (operator.getValue()) {
-					case InfixOperator.IN_AND_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_AND);
-						testValidBitType(rightType, InfixOperator.IN_AND);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) & getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) & getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_CONDITIONAL_AND_VALUE:
-						// This is tricky.
-						// First if this is left type, then just continue.
-						// Else if this other or last, then need to make it the new value.
-						if (operandType != InternalInfixOperandType.INFIX_LEFT_OPERAND) {
-							value = right;
-							valueType = rightType;
-						}
-							
-						//If the value is now false, we need to ignore the rest.
-						if (valueType != Boolean.TYPE)
-							throwInvalidInfix(operator, value);
-						if (!((Boolean) value).booleanValue() && operandType != InternalInfixOperandType.INFIX_LAST_OPERAND)
-							startInfixIgnore();	// Start ignoring because we know the value of the expression at this point. It is false.
-						break;
-					case InfixOperator.IN_CONDITIONAL_OR_VALUE:
-						// This is tricky.
-						// First if this is left type, then just continue.
-						// Else if this other or last, then need to make it the new value.
-						if (operandType != InternalInfixOperandType.INFIX_LEFT_OPERAND) {
-							value = right;
-							valueType = rightType;
-						}
-						
-						//If the value is now true, we need to ignore the rest.
-						if (valueType != Boolean.TYPE)
-							throwInvalidInfix(operator, value);
-						if (((Boolean) value).booleanValue() && operandType != InternalInfixOperandType.INFIX_LAST_OPERAND)
-							startInfixIgnore(); // Start ignoring because we know the value of the expression at this point. It is true.
-						break;
-					case InfixOperator.IN_DIVIDE_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_DIVIDE);
-						testValidArithmeticType(rightType, InfixOperator.IN_DIVIDE);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, the result will be double.
-							value = new Double(getDouble(value) / getDouble(right));
-							valueType = Double.TYPE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, the result will be float.
-							value = new Float(getFloat(value) / getFloat(right));
-							valueType = Float.TYPE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) / getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it will result in an int, even if both sides are short.
-							value = new Integer(getInt(value) / getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_EQUALS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						// We should never get extended operator for this, but we'll ignore the possibility.
-						if (valueType.isPrimitive() && rightType.isPrimitive()) {
-							// Primitives require more testing than just ==. boolean primitives 
-							if (valueType == Boolean.TYPE || rightType == Boolean.TYPE) {
-								// If either side is a boolean, then the other side needs to be boolean for it to even try to be true.
-								if (valueType != Boolean.TYPE || valueType != Boolean.TYPE)
-									value = Boolean.FALSE;
-								else
-									value = (((Boolean) value).booleanValue() == ((Boolean) right).booleanValue()) ? Boolean.TRUE : Boolean.FALSE;
-							} else {
-								// Now do number tests since not boolean primitive, only numbers are left
-								if (valueType == Double.TYPE || rightType == Double.TYPE) {
-									// If either side is double, compare as double.
-									value = (getDouble(value) == getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-									// If either side is float, compare as float.
-									value = (getFloat(value) == getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-									// If either side is long, the compare as long.
-									value = (getLong(value) == getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else {
-									// Else it will compare as int, even if both sides are short.
-									value = (getInt(value) == getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-								}
-							}
-						} else if (valueType.isPrimitive() || rightType.isPrimitive())
-							value = Boolean.FALSE;	// Can't be true if one side prim and the other isn't
-						else {
-							// Just do object ==
-							value = (value == right) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_GREATER_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_GREATER);
-						testValidArithmeticType(rightType, InfixOperator.IN_GREATER);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, compare will be double.
-							value = (getDouble(value) > getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, compare will be float.
-							value = (getFloat(value) > getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, compare will be long.
-							value = (getLong(value) > getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else {
-							// Else compare will be int, even if both sides are short.
-							value = (getInt(value) > getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_GREATER_EQUALS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_GREATER_EQUALS);
-						testValidArithmeticType(rightType, InfixOperator.IN_GREATER_EQUALS);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, compare will be double.
-							value = (getDouble(value) >= getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, compare will be float.
-							value = (getFloat(value) >= getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, compare will be long.
-							value = (getLong(value) >= getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else {
-							// Else compare will be int, even if both sides are short.
-							value = (getInt(value) >= getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_LEFT_SHIFT_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_LEFT_SHIFT);
-						testValidBitType(rightType, InfixOperator.IN_LEFT_SHIFT);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) << getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) << getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_LESS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_LESS);
-						testValidArithmeticType(rightType, InfixOperator.IN_LESS);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, compare will be double.
-							value = (getDouble(value) < getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, compare will be float.
-							value = (getFloat(value) < getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, compare will be long.
-							value = (getLong(value) < getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else {
-							// Else compare will be int, even if both sides are short.
-							value = (getInt(value) < getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_LESS_EQUALS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_LESS_EQUALS);
-						testValidArithmeticType(rightType, InfixOperator.IN_LESS_EQUALS);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, compare will be double.
-							value = (getDouble(value) <= getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, compare will be float.
-							value = (getFloat(value) <= getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, compare will be long.
-							value = (getLong(value) <= getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else {
-							// Else compare will be int, even if both sides are short.
-							value = (getInt(value) <= getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_MINUS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_MINUS);
-						testValidArithmeticType(rightType, InfixOperator.IN_MINUS);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, the result will be double.
-							value = new Double(getDouble(value) - getDouble(right));
-							valueType = Double.TYPE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, the result will be float.
-							value = new Float(getFloat(value) - getFloat(right));
-							valueType = Float.TYPE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) - getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it will result in an int, even if both sides are short.
-							value = new Integer(getInt(value) - getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_NOT_EQUALS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						// We should never get extended operator for this, but we'll ignore the possibility.
-						if (valueType.isPrimitive() && rightType.isPrimitive()) {
-							// Primitives require more testing than just ==. boolean primitives 
-							if (valueType == Boolean.TYPE || rightType == Boolean.TYPE) {
-								// If either side is a boolean, then the other side needs to be boolean for it to even try to be true.
-								if (valueType != Boolean.TYPE || valueType != Boolean.TYPE)
-									value = Boolean.TRUE;
-								else
-									value = (((Boolean) value).booleanValue() != ((Boolean) right).booleanValue()) ? Boolean.TRUE : Boolean.FALSE;
-							} else {
-								// Now do number tests since not boolean primitive, only numbers are left
-								if (valueType == Double.TYPE || rightType == Double.TYPE) {
-									// If either side is double, compare as double.
-									value = (getDouble(value) != getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-									// If either side is float, compare as float.
-									value = (getFloat(value) != getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-									// If either side is long, the compare as long.
-									value = (getLong(value) != getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else {
-									// Else it will compare as int, even if both sides are short.
-									value = (getInt(value) != getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-								}
-							}
-						} else if (valueType.isPrimitive() || rightType.isPrimitive())
-							value = Boolean.TRUE;	// Must be true if one side prim and the other isn't
-						else {
-							// Just do object !=
-							value = (value != right) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_OR_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_OR);
-						testValidBitType(rightType, InfixOperator.IN_OR);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) | getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) | getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_PLUS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND) {
-							if (valueType == String.class) {
-								// Special. left argument is a string, so we want to store a string buffer instead
-								// since we know we will be appending to it. 
-								value = new StringBuffer((String) value);
-							}	
-							break;	// Do nothing with first operand
-						}
-						
-						testValidPlusType(valueType, rightType);
-						if (valueType == String.class || rightType == String.class) {
-							// Special we have a string on one side. Need to do it as strings instead.
-							// We are going to be tricky in that we will store a StringBuffer on the stack (if not last operand)
-							// but call it a string.
-							StringBuffer sb = null;
-							if (valueType == String.class) {
-								sb = (StringBuffer) value;	// We know that if the value (left) is string type, we've already converted it to buffer.
-							} else {
-								// The right is the one that introduces the string, so we change the value over to a string buffer.
-								sb = new StringBuffer(((String) right).length()+16);	// We can't put the value in yet, need to get left into it.
-								appendToBuffer(sb, value, valueType);	// Put the left value in now
-								value = sb;
-								valueType = String.class;	// Make it a string class
-							}
-							appendToBuffer(sb, right, rightType);
-							// Now if we are the last operand, we should get rid of the buffer and put a true string back in.
-							if (operandType == InternalInfixOperandType.INFIX_LAST_OPERAND)
-								value = sb.toString();
-						} else if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, the result will be double.
-							value = new Double(getDouble(value) + getDouble(right));
-							valueType = Double.TYPE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, the result will be float.
-							value = new Float(getFloat(value) + getFloat(right));
-							valueType = Float.TYPE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) + getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it will result in an int, even if both sides are short.
-							value = new Integer(getInt(value) + getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_REMAINDER_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_REMAINDER);
-						testValidArithmeticType(rightType, InfixOperator.IN_REMAINDER);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, the result will be double.
-							value = new Double(getDouble(value) % getDouble(right));
-							valueType = Double.TYPE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, the result will be float.
-							value = new Float(getFloat(value) % getFloat(right));
-							valueType = Float.TYPE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) % getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it will result in an int, even if both sides are short.
-							value = new Integer(getInt(value) % getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_RIGHT_SHIFT_SIGNED_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_RIGHT_SHIFT_SIGNED);
-						testValidBitType(rightType, InfixOperator.IN_RIGHT_SHIFT_SIGNED);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) >> getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) >> getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_RIGHT_SHIFT_UNSIGNED_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_RIGHT_SHIFT_UNSIGNED);
-						testValidBitType(rightType, InfixOperator.IN_RIGHT_SHIFT_UNSIGNED);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) >>> getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) >>> getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_TIMES_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_TIMES);
-						testValidArithmeticType(rightType, InfixOperator.IN_TIMES);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, the result will be double.
-							value = new Double(getDouble(value) * getDouble(right));
-							valueType = Double.TYPE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, the result will be float.
-							value = new Float(getFloat(value) * getFloat(right));
-							valueType = Float.TYPE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) * getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it will result in an int, even if both sides are short.
-							value = new Integer(getInt(value) * getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_XOR_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_XOR);
-						testValidBitType(rightType, InfixOperator.IN_XOR);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) ^ getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) ^ getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					} 
-				
-				if (traceOn)
-					printObjectAndType(value, valueType);
-				pushExpressionValue(value, valueType);	// Push the result back on the stack.
-	
-			} catch (IllegalArgumentException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			} catch (RuntimeException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-
-	/**
-	 * Start ignoring rest of the current infix expression.
-	 * 
-	 * @since 1.1.0
-	 */
-	private void startInfixIgnore() {
-		ignoreExpression = INFIX_IGNORE;
-		infixIgnoreNestCount = infixNesting;	// Ignore until we get back to the current nesting.
-
-	}
-
-	/**
-	 * Get int value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
-	 * Anything else will cause a class cast error.
-	 * <p>
-	 * This is a helper method for expression processer to get the int value of the object. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-	 * @param bean
-	 * @return the int value of the number/character
-	 * @throws ClassCastException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final int getInt(Object bean) throws ClassCastException {
-		return (bean instanceof Number) ? ((Number) bean).intValue() : ((Character) bean).charValue();
-	}
-	
-	/**
-	 * Get float value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
-	 * Anything else will cause a class cast error.
-	 * <p>
-	 * This is a helper method for expression processer to get the float value of the object. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-	 * @param bean 
-	 * @return float value of the Number/character
-	 * @throws ClassCastException
-	 * @since 1.0.0
-	 */
-	protected final float getFloat(Object bean) throws ClassCastException {
-		return (bean instanceof Number) ? ((Number) bean).floatValue() : ((Character) bean).charValue();
-	}
-
-	/**
-	 * Get double value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
-	 * Anything else will cause a class cast error.
-	 * <p>
-	 * This is a helper method for expression processer to get the float value of the object. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-	 * 
-	 * @param bean
-	 * @return double value of the Number/Character.
-	 * @throws ClassCastException
-	 * @since 1.0.0
-	 */
-	protected final double getDouble(Object bean) throws ClassCastException {
-		return (bean instanceof Number) ? ((Number) bean).doubleValue() : ((Character) bean).charValue();
-	}
-	
-	/**
-	 * Get long value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
-	 * Anything else will cause a class cast error.
-	 * <p>
-	 * This is a helper method for expression processer to get the float value of the object. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-	 * 
-	 * @param bean
-	 * @return
-	 * @throws ClassCastException
-	 * @since 1.0.0
-	 */
-	protected final long getLong(Object bean) throws ClassCastException {
-		return (bean instanceof Number) ? ((Number) bean).longValue() : ((Character) bean).charValue();
-	}
-	
-	private void throwInvalidInfix(InfixOperator operator, Object value) throws IllegalArgumentException {
-		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfOperator_EXC_"), new Object[] {value != null ? value.toString() : null, operator.toString()})); //$NON-NLS-1$
-	}
-	
-	private void testValidBitType(Class type, InfixOperator operator) {
-		if (!type.isPrimitive() || type == Boolean.TYPE || type == Double.TYPE|| type == Float.TYPE)
-			throwInvalidInfix(operator, type);
-	}
-	
-	private void testValidArithmeticType(Class type, InfixOperator operator) {
-		if (!type.isPrimitive() || type == Boolean.TYPE)
-			throwInvalidInfix(operator, type);
-	}
-
-	private void testValidPlusType(Class left, Class right) {
-		// Plus is special in that string objects are also valid.
-		if (left == String.class || right == String.class)
-			return;	// As long as one side is string. Anything is valid.
-		// If neither is string, then standard arithmetic test.
-		testValidArithmeticType(left, InfixOperator.IN_PLUS);
-		testValidArithmeticType(right, InfixOperator.IN_PLUS);
-	}
-	
-	private void appendToBuffer(StringBuffer sb, Object value, Class valueType) {
-		if (value == null)
-			sb.append((Object)null);
-		else if (valueType == String.class)
-			sb.append((String) value);
-		else if (valueType.isPrimitive()) {
-			switch (getEnumForPrimitive(valueType)) {
-				case BOOLEAN:
-					sb.append(((Boolean) value).booleanValue());
-					break;
-				case BYTE:
-					sb.append(((Number) value).byteValue());
-					break;
-				case CHAR:
-					sb.append(((Character) value).charValue());
-					break;
-				case DOUBLE:
-					sb.append(((Number) value).doubleValue());
-					break;
-				case FLOAT:
-					sb.append(((Number) value).floatValue());
-					break;
-				case INT:
-					sb.append(((Number) value).intValue());
-					break;
-				case LONG:
-					sb.append(((Number) value).longValue());
-					break;
-				case SHORT:
-					sb.append(((Number) value).shortValue());
-					break;		
-			}
-		} else {
-			// Just an object.
-			sb.append(value);
-		}
-	}
-	
-	/**
-	 * Push the array access expression.
-	 * 
-	 * @param indexCount Number of dimensions being accessed
-	 * @since 1.0.0
-	 */
-	public final void pushArrayAccess(int indexCount) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		
-		if (traceOn) {
-			printTrace("Array Access["+indexCount+']', ignore); //$NON-NLS-1$
-		}
-		try {
-			if (ignore)
-				return;
-			
-			try {
-				// We need to pop off the args. The topmost will be the rightmost index, and the bottom most will be the array itself.
-				int[] arguments = new int[indexCount];
-				// Fill the arg array in reverse order.
-				for(int i=indexCount-1; i >= 0; i--) {
-					Object index = popExpression();
-					Class indexType = popExpressionType(false);
-					if (indexType.isPrimitive() && (indexType == Integer.TYPE || indexType == Short.TYPE || indexType == Character.TYPE || indexType == Byte.TYPE)) {
-						arguments[i] = getInt(index);
-					} else
-						throwClassCast(Integer.TYPE, index);
-				}
-				
-				Object array = popExpression();
-				Class arrayType = popExpressionType(false);
-				if (arrayType.isArray()) {
-					// First figure out how many dimensions are available. Stop when we hit indexcount because we won't be going further.
-					int dimcount = 0;
-					Class[] componentTypes = new Class[indexCount];	// 
-					Class componentType = arrayType;
-					while (dimcount < indexCount && componentType.isArray()) {
-						componentTypes[dimcount++] = componentType = componentType.getComponentType();
-					}
-					
-					if (dimcount < indexCount)
-						throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray_EXC_"), new Object[] {new Integer(indexCount), new Integer(dimcount)})); //$NON-NLS-1$
-					
-					// Now start accessing one index at a time, stop just before the last one. The last one will be turned into an ArrayAccessReference.
-					Object value = array;	// Final value, start with full array.
-					int pullCount = indexCount-1;
-					for(int i=0; i<pullCount; i++) {
-						value = Array.get(value, arguments[i]);
-					}
-					ArrayAccessReference arrayValue = ArrayAccessReference.createArrayAccessReference(value, arguments[pullCount]);
-					if (traceOn)
-						printObjectAndType(arrayValue, componentTypes[pullCount]);
-					pushExpressionValue(arrayValue, componentTypes[pullCount]);
-				}  else
-					 throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.NotAnArray_EXC_"), new Object[] {arrayType})); //$NON-NLS-1$
-	
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			} catch (RuntimeException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Push the array creation request.
-	 * 
-	 * @param arrayType The type of the array
-	 * @param dimensionCount The number of dimensions being initialized. Zero if using an initializer.
-	 * @since 1.0.0
-	 */
-	public final void pushArrayCreation(Class arrayType, int dimensionCount) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		if (traceOn)
-			printTrace("Array Creation: "+arrayType.getName()+'['+dimensionCount+']', ignore); //$NON-NLS-1$
-		
-		try {
-			if (ignore)
-				return;
-			
-			try {
-				if (dimensionCount == 0) {
-					// The top value is the array itself, from the array initializer.
-					// So we do nothing.
-				} else {
-					// Strip off dimensionCounts from the array type, e.g.
-					// ArrayType is int[][][]
-					// Dimensioncount is 2
-					// Then we need to strip two componenttypes off of the array type
-					// wind up with int[]
-					// This is necessary because Array.new will add those dimensions back
-					// on through the dimension count.
-					Class componentType = arrayType;
-					for(int i=0; i < dimensionCount && componentType != null; i++)
-						componentType = componentType.getComponentType();
-					if (componentType == null)
-						throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested_EXC_"), new Object[] {arrayType, new Integer(dimensionCount)})); //$NON-NLS-1$
-					
-					// We need to pull in the dimension initializers. They are stacked in reverse order.
-					int[] dimInit = new int[dimensionCount];
-					for(int i=dimensionCount-1; i >= 0; i--) {
-						Object index = popExpression();
-						Class dimType = popExpressionType(false);
-						if (dimType.isPrimitive() && (dimType == Integer.TYPE || dimType == Short.TYPE || dimType == Character.TYPE || dimType == Byte.TYPE)) {
-							dimInit[i] = getInt(index);
-						} else
-							throwClassCast(Integer.TYPE, index);
-					}
-					
-					// Finally create the array.
-					Object array = Array.newInstance(componentType, dimInit);
-					pushExpressionValue(array, arrayType);
-				}
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-
-	/**
-	 * Push the array initializer request.
-	 * 
-	 * @param arrayType The original type of the array to create.
-	 * @param stripCount the count of how many dimensions to strip to get the type needed for this initializer.
-	 * @param expressionCount
-	 * @since 1.0.0
-	 */
-	public final void pushArrayInitializer(Class arrayType, int stripCount, int expressionCount) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		
-		if (traceOn)
-			printTrace("Initialize Array: "+arrayType.getName()+'{'+expressionCount+'}', ignore); //$NON-NLS-1$
-		
-		try {
-			if (ignore)
-				return;
-	
-			try {
-				if (!arrayType.isArray()) {
-					// It is not an array type.
-					throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CannotCastXToY_EXC_"), new Object[] {arrayType, "array"})); //$NON-NLS-1$ //$NON-NLS-2$
-				} 
-				// Strip off the number of dimensions specified.
-				while(stripCount-->0) {
-					arrayType = arrayType.getComponentType();
-				}
-				Object[] dimValues = null;
-				if (expressionCount > 0) {
-					// We need to pull in the initializers. They are stacked in reverse order.
-					dimValues = new Object[expressionCount];
-					for (int i = expressionCount - 1; i >= 0; i--) {
-						Object dimValue = dimValues[i] = popExpression();
-						Class dimType = popExpressionType(false);
-						if (arrayType.isPrimitive()) {
-							if (dimValue == null || !dimType.isPrimitive())
-								throwClassCast(arrayType, dimType);
-							// A little trickier. Can assign short to an int, but can't assign long to an int. Widening is permitted.
-							if (arrayType != dimType) {
-								int compEnum = getEnumForPrimitive(arrayType);
-								int dimEnum = getEnumForPrimitive(dimType);
-								if (compEnum == BOOLEAN || dimEnum == BOOLEAN)
-									throwClassCast(arrayType, dimType);
-								int dimValueAsInt = getInt(dimValue);
-								switch (compEnum) {
-									case BYTE :
-										// Can accept byte, short, char, or int as long as value is <= byte max. Can't accept long, double, float at all.
-										// Note: This isn't actually true. The max/min test is only valid if the value is a literal, not an expression,
-										// however, at this point in time we no longer know this. So we will simply allow it.
-										if (dimEnum > INT || dimValueAsInt > Byte.MAX_VALUE || dimValueAsInt < Byte.MIN_VALUE)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Byte((byte)dimValueAsInt);
-										break;
-									case SHORT :								
-										// Can accept byte, short, char, or int as long as value is <= byte max. Can't accept long, double, float at all.
-										// Note: This isn't actually true. The max/min test is only valid if the value is a literal, not an expression,
-										// however, at this point in time we no longer know this. So we will simply allow it.
-										if (dimEnum > INT || dimValueAsInt > Short.MAX_VALUE || dimValueAsInt < Short.MIN_VALUE)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Short((short)dimValueAsInt);
-										break;
-									case CHAR :
-										// Can accept byte, short, char, or int as long as value is <= byte max. Can't accept long, double, float at all.
-										// Note: This isn't actually true. The max/min test is only valid if the value is a literal, not an expression,
-										// however, at this point in time we no longer know this. So we will simply allow it.
-										if (dimEnum > INT || dimValueAsInt > Character.MAX_VALUE || dimValueAsInt < Character.MIN_VALUE)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Character((char)dimValueAsInt);
-										break;
-									case INT :
-										// Can accept byte, short, char, or int. Can't accept long, double, float at all.
-										if (dimEnum > INT)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Integer(dimValueAsInt);
-										break;
-									case LONG :
-										// Can accept byte, short, char, int, or long. Can't accept double, float at all.
-										if (dimEnum > LONG)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Long(getLong(dimValue));
-										break;
-									case FLOAT :
-										// Can accept byte, short, char, int, long, or float. Can't accept double at all.
-										if (dimEnum > FLOAT)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Float(getFloat(dimValue));
-										break;
-									case DOUBLE :
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Double(getDouble(dimValue));
-										break;
-	
-								}
-							}
-							// Compatible, so ok.
-						} else if (dimType != MethodHelper.NULL_TYPE && !arrayType.isAssignableFrom(dimType)) {
-							// If it is NULL_TYPE, then this is a pushed null. This is always assignable to a non-primitive.
-							// So we don't enter here in that case. However, a null that was returned from some expression
-							// won't have a NULL_TYPE, it will instead have the expected return type. That must be used
-							// in the assignment instead. That is because in java it uses the expected type to determine
-							// compatibility, not the actual type.
-							throwClassCast(arrayType, dimType);
-						}
-					}
-					
-				}
-				
-				// Now we finally create the array.
-				Object array = Array.newInstance(arrayType, new int[] {expressionCount});
-				for (int i = 0; i < expressionCount; i++) {
-					Array.set(array, i, dimValues[i]);
-				}
-				
-				pushExpressionValue(array, array.getClass());	// Adjust to true array type, not the incoming type (which is one dimension too small).
-	
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-
-	/**
-	 * Push the class instance creation request.
-	 * 
-	 * @param type The type to create an instance of
-	 * @param argumentCount The number of arguments (which are stored on the stack).	 * @throws NoExpressionValueException
-	 * @since 1.0.0
-	 */
-	public final void pushClassInstanceCreation(Class type, int argumentCount) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		
-		if (traceOn)
-			printTrace("Create Class: "+type+" (", ignore); //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-			if (ignore)
-				return;
-						
-			try {
-				// We need to pull in the arguments. They are stacked in reverse order.
-				Object value = null;	// The new instance.
-				Object[]  args = new Object[argumentCount];
-				Class[] argTypes = new Class[argumentCount];
-				for (int i = argumentCount - 1; i >= 0; i--) {
-					args[i] = popExpression();
-					argTypes[i] = popExpressionType(false);
-				}
-				
-				// Now we need to find the appropriate constructor.
-				Constructor ctor;
-				ctor = MethodHelper.findCompatibleConstructor(type, argTypes);
-				if (traceOn) {
-					if (argumentCount == 0) {
-						// No args, just do default ctor.
-						System.out.print("Default ctor)"); //$NON-NLS-1$
-					} else {						
-						System.out.print(ctor);
-						System.out.print(')');
-					}
-				}
-				value = ctor.newInstance(args);
-				
-				pushExpressionValue(value, type);
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			} catch (InstantiationException e) {
-				processException(e);
-			} catch (IllegalAccessException e) {
-				processException(e);
-			} catch (InvocationTargetException e) {
-				processException(e);
-			} catch (NoSuchMethodException e) {
-				processException(e);
-			} catch (AmbiguousMethodException e) {
-				processException(e);
-			} catch (LinkageError e) {
-				processException(e);
-			} catch (Error e) {
-				if (e.getClass() == Error.class) {
-					// If exactly Error.class, then process it. This is hopefully just a "unresolved compilation error".
-					processException(new UnresolvedCompilationError(e));
-				} else
-					throw e;	// All subclasses we throw on out.
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-
-	/**
-	 * Push the field access expression.
-	 * @param field String for fieldname, or a java.lang.reflect.Field.
-	 * @param fieldIsString <code>true</code> if field is a string name, and not a java.lang.reflect.Field.
-	 * @param hasReceiver
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushFieldAccess(Object field, boolean fieldIsString, boolean hasReceiver) {
-		try {
-			if (ignoreExpression != null || errorOccurred) {
-				if (traceOn)
-					printTrace("Field Access", true); //$NON-NLS-1$
-				return;
-			}
-		
-			if (traceOn)
-				printTrace("Field Access: ", false); //$NON-NLS-1$
-			try {
-				// Get the receiver off of the stack.
-				Object receiver = null;
-				Class receiverType = null;
-				if (hasReceiver) {
-					receiver = popExpression();
-					receiverType = popExpressionType(false);
-				}
-				
-				// Find the field.
-				Field reflectField = fieldIsString ? receiverType.getField((String) field) : (Field) field;
-				// Access the field.
-				Object value = FieldAccessReference.createFieldAccessReference(reflectField, receiver);
-				Class valueType = reflectField.getType();
-				if (traceOn) {
-					System.out.print("Field: "); //$NON-NLS-1$
-					if (fieldIsString)
-						System.out.print("(looked up) "); //$NON-NLS-1$
-					System.out.print(reflectField);
-					System.out.print(">"); //$NON-NLS-1$
-					printObjectAndType(value, valueType);
-				}
-					
-				pushExpressionValue(value, valueType);
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			} catch (NoSuchFieldException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-
-	/**
-	 * Push the method invocation expression.
-	 * @param method
-	 * @param methodIsString <code>true</code> if method is a string (so string name) or else it is a java.lang.reflect.Method.
-	 * @param hasReceiver
-	 * @param argCount
-	 * @since 1.0.0
-	 */
-	public final void pushMethodInvocation(Object method, boolean methodIsString, boolean hasReceiver, int argCount) {
-		try {
-			if (ignoreExpression != null || errorOccurred) {
-				if (traceOn)
-					printTrace("Invoke", true); //$NON-NLS-1$
-				return;
-			}
-			
-			if (traceOn)
-				printTrace("Invoke: ", false); //$NON-NLS-1$
-			
-			Method reflectMethod = null;
-			try {
-				// We need to pull in the arguments. They are stacked in reverse order.
-				Object[]  args = new Object[argCount];
-				Class[] argTypes = new Class[argCount];
-				for (int i = argCount - 1; i >= 0; i--) {
-					args[i] = popExpression();
-					argTypes[i] = popExpressionType(false);
-				}
-				
-				// Now get receiver
-				Object receiver = null;
-				Class receiverType = null;
-				if (hasReceiver) {
-					receiver = popExpression();
-					receiverType = popExpressionType(false);
-				}
-				
-				// Now we need to find the appropriate method. If it is a string then there must be a receiver, otherwise no way to know.
-				if (methodIsString) {
-					reflectMethod = MethodHelper.findCompatibleMethod(receiverType, (String) method, argTypes);
-				} else
-					reflectMethod = (Method) method;
-				
-				if (traceOn && reflectMethod != null) {
-					System.out.print("Method: "); //$NON-NLS-1$
-					if (methodIsString)
-						System.out.print("(looked up) "); //$NON-NLS-1$
-					System.out.print(reflectMethod);					
-				}
-				
-				if (!Modifier.isStatic(reflectMethod.getModifiers()) && receiver == null)
-					throw new NullPointerException("No receiver for non-static method: "+reflectMethod.toString()); //$NON-NLS-1$
-					
-				Object value = reflectMethod.invoke(receiver, args);
-				
-				if (traceOn) {
-					System.out.print(" returns: "); //$NON-NLS-1$
-					printObjectAndType(value, reflectMethod.getReturnType());
-				}
-				pushExpressionValue(value, reflectMethod.getReturnType());
-			} catch (RuntimeException e) {
-				processException(fixUpMethodException(e, reflectMethod));
-			} catch (NoExpressionValueException e) {
-				processException(fixUpMethodException(e, reflectMethod));
-			} catch (IllegalAccessException e) {
-				processException(fixUpMethodException(e, reflectMethod));
-			} catch (InvocationTargetException e) {
-				processException(fixUpMethodException(e.getCause(), reflectMethod));
-			} catch (NoSuchMethodException e) {
-				processException(e);
-			} catch (AmbiguousMethodException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-	
-	/*
-	 * Many of the exceptions don't add in what method had the error, so we
-	 * will do that here.
-	 */
-	private Throwable fixUpMethodException(Throwable e, Method method) {
-		if (method == null)
-			return e;
-		try {
-			String msg = e.getMessage();
-			Constructor eWithStringCtor = e.getClass().getConstructor(new Class[] {String.class});
-			String newMsg;
-			if (msg == null) {
-				newMsg = method.toString();
-			} else {
-				newMsg = method.toString()+": \""+msg+'\"'; //$NON-NLS-1$
-			}
-			Exception fixedupE = (Exception) eWithStringCtor.newInstance(new Object[] {newMsg});
-			fixedupE.setStackTrace(e.getStackTrace());
-			return fixedupE;
-		} catch (Exception e1) {
-			return e;
-		}
-  
-	}
-
-	private static final Object CONDITIONAL_IGNORE = "CONDITIONAL IGNORE";	// Flag for conditional in ingore //$NON-NLS-1$
-	private int conditionalNesting = 0;	// Nesting of conditional expressions.
-	private int conditionalIgnoreNestCount = 0;	// When ignoring conditional expressions, ignore until this nest count.
-	private boolean skipTruePart;
-
-	/**
-	 * Push a conditional expression. It can be any clause of the conditional (test, true, or false clause).
-	 * @param expressionType
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushConditional(InternalConditionalOperandType expressionType) {
-		try {
-			boolean ignore = true;
-			try {
-				if (errorOccurred)
-					return;
-				// Slightly different here in that if an ignoring occurred we still need to process at least part of it so that
-				// we can get the expression grouping correct.
-				switch (expressionType.getValue()) {
-					case InternalConditionalOperandType.CONDITIONAL_TEST_VALUE:
-						conditionalNesting++;
-						break;
-					case InternalConditionalOperandType.CONDITIONAL_TRUE_VALUE:
-						if (skipTruePart && ignoreExpression == CONDITIONAL_IGNORE && conditionalIgnoreNestCount == conditionalNesting) {
-							// stop ignoring, we've ignored the true condition of interest.
-							ignoreExpression = null;
-							return; // However, leave because since this condition was ignored.
-						}
-						break;
-					case InternalConditionalOperandType.CONDITIONAL_FALSE_VALUE:
-						int currentNesting = conditionalNesting--;
-						if (ignoreExpression == CONDITIONAL_IGNORE && conditionalIgnoreNestCount == currentNesting) {
-							// stop ignoring, we've ignored the false condition of interest.
-							ignoreExpression = null;
-							return; // However, leave because since this condition was ignored.
-						}
-				}
-	
-				if (ignoreExpression != null)
-					return;
-				ignore = false;
-			} finally {
-				if (traceOn)
-					printTrace("Conditional "+expressionType, ignore); //$NON-NLS-1$
-			}
-					
-			try {
-				switch (expressionType.getValue()) {
-					case InternalConditionalOperandType.CONDITIONAL_TEST_VALUE:
-						Object condition = popExpression();
-						Class type = popExpressionType(false);
-						if (type != Boolean.TYPE)
-							throwClassCast(Boolean.TYPE, condition);
-						if (((Boolean) condition).booleanValue()) {
-							// Condition was true.
-							// Do nothing. Let true condition be processed.
-						} else {
-							// Condition was false.
-							skipTruePart = true;	// Tell the true condition should be ignored.
-							ignoreExpression = CONDITIONAL_IGNORE;
-							conditionalIgnoreNestCount = conditionalNesting;
-						}
-						// We don't put anything back on the stack because the condition test is not ever returned.
-						// The appropriate true or false condition evaluation will be left on the stack.
-						break;
-					case InternalConditionalOperandType.CONDITIONAL_TRUE_VALUE:
-						skipTruePart = false;	// Tell the false condition should be ignored.
-						ignoreExpression = CONDITIONAL_IGNORE;
-						conditionalIgnoreNestCount = conditionalNesting;
-						break;
-					case InternalConditionalOperandType.CONDITIONAL_FALSE_VALUE:
-						// There's nothing to do, if it was ignored due to true, we wouldn't of gotton here.
-						// If it wasn't ignored, then the result of the false expression is on the stack, which is what it should be.
-						break;
-				}
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	private static final Object BLOCK_IGNORE = "BLOCK IGNORE"; //$NON-NLS-1$
-	private int[] blocks;	// Stack of block numbers currently evaluating.
-	private int topBlock = -1;	// Top block index.
-	private int breakBlock = -1;	// Block number we are breaking to.
-	
-	/**
-	 * Push a begin block.
-	 * @param blockNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushBlockBegin(int blockNumber) {
-		if (traceOn) {
-			printTrace("Begin Block #"+blockNumber, errorOccurred); //$NON-NLS-1$
-			indent(true);
-		}
-		try {
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (blocks == null)
-				blocks = new int[10];
-			if (++topBlock >= blocks.length) {
-				int[] newList = new int[blocks.length*2];
-				System.arraycopy(blocks, 0, newList, 0, blocks.length);
-				blocks = newList;
-			}
-			blocks[topBlock] = blockNumber;
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Push a block end. The current block must be the given number, or it is an error.
-	 * 
-	 * @param blockNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushBlockEnd(int blockNumber) {
-		try {
-			if (traceOn) {
-				indent(false);
-				printTrace("End Block #"+blockNumber, errorOccurred); //$NON-NLS-1$
-			}
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (blocks == null || topBlock < 0 || blocks[topBlock] != blockNumber) {
-				processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushBlockEnd.ReceivedEndBlocksOutOfOrder_EXC_"))); //$NON-NLS-1$
-			} else {
-				topBlock--;
-				if (ignoreExpression == BLOCK_IGNORE && blockNumber == breakBlock) {
-					ignoreExpression = null;
-				}
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}			
-	}
-	
-	/**
-	 * Skip all following until we hit the requested block number.
-	 * @param blockNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushBlockBreak(int blockNumber) {
-		try {
-			if (traceOn)
-				printTrace("Break Block #"+blockNumber, errorOccurred); //$NON-NLS-1$
-			if (errorOccurred)
-				return;
-			if (ignoreExpression == null) {
-				ignoreExpression = BLOCK_IGNORE;	// Start ignoring expressions until we hit the block number end block.
-				breakBlock = blockNumber;
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	private static final Object TRY_THROW_IGNORE = "TRY THROW IGNORE"; //$NON-NLS-1$
-	private static final Object TRY_FINAL_IGNORE = "TRY FINAL IGNORE"; //$NON-NLS-1$
-	private int[] trys;	// Stack of try numbers currently evaluating.
-	// Stack of trys in catch clause (i.e. starting executing a catch/final clause for the try). Corresponds with try from same index in trys. Contains the throwable for the catch.
-	// This is used to know we are executing a catch (entry not null) and for the rethrow short-hand to rethrow the same exception within the catch.
-	private Throwable[] trysInCatch;	
-	private int topTry = -1;	// Top try index.
-	private int breakTry = -1;	// Try number we are breaking to.
-	private Throwable catchThrowable;	// The throwable to check catches against.
-	
-	/**
-	 * Push a try statement.
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushTryBegin(int tryNumber) {
-		try {
-			if (traceOn) {
-				printTrace("Begin Try #"+tryNumber, errorOccurred); //$NON-NLS-1$
-				indent(true);
-			}
-	
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (trys == null) {
-				trys = new int[10];
-				trysInCatch = new Throwable[10];
-			}
-			if (++topTry >= trys.length) {
-				int[] newList = new int[trys.length*2];
-				System.arraycopy(trys, 0, newList, 0, trys.length);
-				trys = newList;
-				Throwable[] newCatches = new Throwable[trys.length];
-				System.arraycopy(trysInCatch, 0, newCatches, 0, trysInCatch.length);
-				trysInCatch = newCatches;
-			}
-			trys[topTry] = tryNumber;
-			trysInCatch[topTry] = null;
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-
-	/**
-	 * Throw the top stack entry. It must be an exception.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushThrowException() {
-		try {
-			boolean ignore = (ignoreExpression != null || errorOccurred);
-			if (traceOn)
-				printTrace("Throw exception: ", ignore); //$NON-NLS-1$
-			
-			if (ignore)
-				return;
-	
-			try {
-				Object t = popExpression();
-				popExpressionType(false);
-				if (traceOn) {
-					System.out.print(t);
-				}
-				throwException((Throwable) t);
-			} catch (NoExpressionValueException e) {
-				processException(e);
-			} catch (ClassCastException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}			
-	}
-	
-	/**
-	 * Throw this exception (means throw through the expression being processed, not throw for this thread).
-	 * @param exception
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final void throwException(Throwable exception) {
-		if (topTry == -1) {
-			// There are no tries, so treat this as a syntax error.
-			if (exception instanceof NoExpressionValueException)
-				processSyntaxException((NoExpressionValueException) exception);
-			else
-				processSyntaxException(exception);
-		} else if (trysInCatch[topTry] == null) {
-			// We are not in a catch clause of the top try. So do a throw ignore for toptry.
-			ignoreExpression = TRY_THROW_IGNORE;
-			breakTry = trys[topTry];
-			catchThrowable = exception;
-		} else {
-			// We are in a catch of the top try. So do a throw to finally instead.
-			ignoreExpression = TRY_FINAL_IGNORE;
-			trysInCatch[topTry] = FINAL_CATCH;
-			breakTry = trys[topTry];
-			catchThrowable = exception;
-		}
-	}
-	
-	/**
-	 * Push a catch clause
-	 * @param tryNumber
-	 * @param exceptionType
-	 * @param expressionProxy
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushTryCatchClause(int tryNumber, Class exceptionType, InternalExpressionProxy expressionProxy) {
-		try {
-			if (traceOn) {
-				indent(false);
-				if (expressionProxy == null)
-					printTrace("Catch Try #"+tryNumber+" ("+exceptionType+')', errorOccurred); //$NON-NLS-1$ //$NON-NLS-2$
-				else
-					printTrace("Catch Try #"+tryNumber+" ("+exceptionType+") Return exception in proxy #"+expressionProxy.getProxyID(), errorOccurred); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				indent(true);
-			}
-			
-			if (errorOccurred)
-				return;
-			
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryCatchClause.CatchReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
-			} else {
-				if (ignoreExpression == null) {
-					// Normal flow, no throw in progress, so just ignore now until the finally or end try reached.
-					ignoreExpression = TRY_FINAL_IGNORE;
-					breakTry = tryNumber;
-				} else if (ignoreExpression == TRY_THROW_IGNORE && tryNumber == breakTry) {
-					// We are here due to a throw occuring in this try block, see if for us, and if it is, stop ignoring.
-					// Else just continue ignoring.
-					if (exceptionType.isInstance(catchThrowable)) {
-						// For us, so just turn everything back on, except mark that we are in the catch phase.
-						ignoreExpression = null;
-						trysInCatch[topTry] = catchThrowable; // This is so that we know if we throw again that we should not catch anything.
-						breakTry = -1;
-						if (expressionProxy != null) {
-							expressionProxy.setProxy(catchThrowable, catchThrowable.getClass());
-							allocateExpressionProxy(expressionProxy);
-						}
-						if (traceOn) {
-							System.out.print(" Caught: "); //$NON-NLS-1$
-							System.out.print(catchThrowable);
-						}
-						catchThrowable = null;
-					}
-				}
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}			
-	}
-	
-	// This is used only so that finally clause can indicate it was executing so that end expression knows this.
-	private static final Throwable FINAL_CATCH = new RuntimeException();
-
-	/**
-	 * Push the try finally clause.
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushTryFinallyClause(int tryNumber) {
-		try {
-			if (traceOn) {
-				indent(false);
-				printTrace("Finally Try #"+tryNumber, errorOccurred); //$NON-NLS-1$
-				indent(true);
-			}
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryFinallyClause.FinallyReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
-			} else {
-				if (tryNumber == breakTry && (ignoreExpression == TRY_THROW_IGNORE || ignoreExpression == TRY_FINAL_IGNORE)) {
-					// We are here due to a throw occuring in this try block or a catch was reached (in which case all intervening catch's were ignored).
-					// Now do a normal execution. If we are here due to a throw that wasn't cleared (either no catch or another throw occured within the catch)
-					// then we leave it uncleared so that try/end may rethrow it.
-					ignoreExpression = null;
-					trysInCatch[topTry] = FINAL_CATCH; // We are in the finally clause of a exception being thrown within this try.
-					breakTry = -1;
-					if (traceOn)
-						System.out.print(" Executing finally."); //$NON-NLS-1$
-				}
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}			
-	}
-	
-	/**
-	 * Rethrow the caught exception. This is a shortcut for:
-	 * } catch (Exception e) {
-	 *   ... do stuff ...
-	 *   throw e;
-	 * }
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushTryRethrow(int tryNumber) {
-		if (traceOn)
-			printTrace("Rethrow Try #"+tryNumber, errorOccurred  || ignoreExpression != null); //$NON-NLS-1$
-		
-		try {
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because we need to make sure this is not called out of order.
-			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryRethrow.RethrowReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
-			} else if (ignoreExpression == null) {
-				if (trysInCatch[topTry] == null || trysInCatch[topTry] == FINAL_CATCH)
-					processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryRethrow.RetryReceivedOutOfExecutingCatchClause_EXC_"))); //$NON-NLS-1$
-				else {
-					throwException(trysInCatch[topTry]);
-				}
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}		
-	}
-	
-	public final void pushTryEnd(int tryNumber) {
-		if (traceOn) {
-			indent(false);
-			printTrace("End Try #"+tryNumber, errorOccurred); //$NON-NLS-1$
-		}
-		try {
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryEnd.TryEndReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
-			} else {
-				boolean inCatch = trysInCatch[topTry] != null;
-				trysInCatch[topTry] = null;
-				topTry--;
-				if (inCatch || (tryNumber == breakTry && (ignoreExpression == TRY_THROW_IGNORE || ignoreExpression == TRY_FINAL_IGNORE))) {
-					// We are here due to a throw or normal flow through a catch. Either way if there is a throwable still pending, we rethrow.
-					ignoreExpression = null;
-					breakTry = -1;
-					if (catchThrowable != null)
-						throwException(catchThrowable);
-				} 
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}			
-	}
-	
-	/**
-	 * Class used to save the state at time of mark. It will
-	 * be used to restore state if error.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected class SaveState {
-		public int markID;
-		
-		// Block state
-		public int topBlock;
-		public int breakBlock;
-
-		// Subexpression state
-		public int topSubexpression;
-
-		// Try state
-		public int topTry;
-		public int breakTry;
-		public Throwable catchThrowable;
-		
-		// Error state
-		public boolean errorOccurred;
-		public boolean novalueException;
-		public Throwable exception;
-		public Object ignoreExpression;
-		
-		// Expression stack state
-		public int expressionStackPos;
-		
-		// If/else state
-		public int ifElseNesting;
-		public int ifElseIgnoreNestCount;
-		public boolean ifElseSkipTruePart;
-		
-		// Other
-		public int indent;
-		public int expressionProxyPos;
-		
-		/**
-		 * Construct and save the state.
-		 * 
-		 * @param markNumber
-		 * 
-		 * @since 1.1.0
-		 */
-		public SaveState(int markID) {
-			this.markID = markID;
-			
-			ExpressionProcesser ep = ExpressionProcesser.this;
-			this.topBlock = ep.topBlock;
-			this.breakBlock = ep.breakBlock;
-			
-			this.topSubexpression = ep.topSubexpression;
-			
-			this.topTry = ep.topTry;
-			this.breakTry = ep.breakTry;
-			this.catchThrowable = ep.catchThrowable;
-			
-			this.errorOccurred = ep.errorOccurred;
-			this.novalueException = ep.novalueException;
-			this.exception = ep.exception;
-			this.ignoreExpression = ep.ignoreExpression;
-			
-			this.expressionStackPos = expressionStack.size()-1;
-			
-			this.ifElseNesting = ep.ifElseNesting;
-			this.ifElseIgnoreNestCount = ep.ifElseIgnoreNestCount;
-			this.ifElseSkipTruePart = ep.ifElseSkipTruePart;
-			
-			this.indent = ep.indent;
-			this.expressionProxyPos = expressionProxies != null ? expressionProxies.size()-1 : -1;
-		}
-		
-		/**
-		 * Restore the state.
-		 * 
-		 * 
-		 * @since 1.1.0
-		 */
-		public void restoreState() {
-			ExpressionProcesser ep = ExpressionProcesser.this;
-			ep.topBlock = this.topBlock;
-			ep.breakBlock = this.breakBlock;
-
-			ep.topSubexpression = this.topSubexpression;
-			
-			ep.topTry = this.topTry;
-			ep.breakTry = this.breakTry;
-			ep.catchThrowable = this.catchThrowable;
-			if (trysInCatch != null) {
-				for (int i = topTry + 1; i < ep.trysInCatch.length; i++) {
-					ep.trysInCatch[i] = null;
-				}
-			}
-
-			ep.errorOccurred = this.errorOccurred;
-			ep.novalueException = ep.novalueException;
-			ep.exception = this.exception;
-			ep.ignoreExpression = this.ignoreExpression;
-			
-			// Pop stack down to saved state.
-			for (int i = expressionStack.size()-1; i > this.expressionStackPos; i--) {
-				expressionStack.remove(i);
-				expressionTypeStack.remove(i);
-			}
-			
-			ep.ifElseNesting = this.ifElseNesting;
-			ep.ifElseIgnoreNestCount = this.ifElseIgnoreNestCount;
-			ep.ifElseSkipTruePart = this.ifElseSkipTruePart;
-			
-			ep.indent = this.indent;
-			
-			if (expressionProxies != null) {
-				for (int i = expressionProxies.size() - 1; i > this.expressionProxyPos; i--) {
-					expressionProxies.remove(i);
-				}
-			}
-			
-			// These settings can't cross mark boundaries, so reset them to not set. This is in case we were in this state somewhere
-			// in the mark when the restore occurred.
-			ep.conditionalIgnoreNestCount = 0;
-			ep.conditionalNesting = 0;
-			ep.skipTruePart = false;
-			
-			ep.infixIgnoreNestCount = 0;
-			ep.infixNesting = 0;
-		}
-	}
-	
-	/**
-	 * Create the save state with the given id.
-	 * @param markID
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected SaveState createSaveState(int markID) {
-		return new SaveState(markID);
-	}
-	
-	/**
-	 * Push the start of a mark.
-	 * @param markNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushMark(int markNumber) {
-		if (traceOn)
-			printTrace("Mark#"+markNumber, false); //$NON-NLS-1$
-		
-		if (saveStates == null)
-			saveStates = new ArrayList();
-		saveStates.add(createSaveState(markNumber));
-		
-		if (traceOn)
-			printTraceEnd();
-	}
-	
-	/**
-	 * Push the end mark. If there is no error, it will simply
-	 * remove it and all save states in the map after it. If there
-	 * is an error it will do this plus it will restore the state.
-	 * <p>
-	 * It is assumed that the calls are coming in correct order from
-	 * the server so we won't check validity.
-	 * 
-	 * @param markID
-	 * @param restore
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushEndmark(int markID, boolean restore) {
-		if (traceOn)
-			printTrace("End Mark#"+markID+" Restored="+restore, false); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		try {
-			if (saveStates != null) {
-				// Start from the end (since that is where it most likely will be) and start
-				// search, removing the end one until we reach the markID.
-				for (int i = saveStates.size() - 1; i >= 0; i--) {
-					SaveState state = (SaveState) saveStates.remove(i);
-					if (state.markID == markID) {
-						// We found it.
-						if (restore)
-							state.restoreState();
-						return;
-					}
-				}
-				// But to be safe, if we got here, this is bad. We tried restore a mark we didn't have.
-				processSyntaxException(new IllegalStateException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.PushEndmark.EndMarkOnNonExistingID_EXC_"), new Object[]{new Integer(markID)}))); //$NON-NLS-1$
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	private int[] subexpressions;	// Stack of subexpression numbers currently evaluating.
-	private int[] subexpressionStackPos;	// Stack of the expression stack positions (next entry index) for currently evaluating expressions. The evaluation stack cannot be popped beyond the current top. And at end it will be cleaned up to the position.
-	private int topSubexpression = -1;	// Top subexpression index.
-
-	
-	/**
-	 * Push a begin subexpression.
-	 * @param subexpressionNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushSubexpressionBegin(int subexpressionNumber) {
-		if (traceOn) {
-			printTrace("Begin Subexpression #"+subexpressionNumber, errorOccurred); //$NON-NLS-1$
-			indent(true);
-		}
-		try {
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (subexpressions == null) {
-				subexpressions = new int[10];
-				subexpressionStackPos = new int[10];
-			}
-			if (++topSubexpression >= subexpressions.length) {
-				int[] newList = new int[subexpressions.length*2];
-				System.arraycopy(subexpressions, 0, newList, 0, subexpressions.length);
-				subexpressions = newList;
-				newList = new int[subexpressionStackPos.length*2];
-				System.arraycopy(subexpressionStackPos, 0, newList, 0, subexpressionStackPos.length);
-				subexpressionStackPos = newList;				
-			}
-			subexpressions[topSubexpression] = subexpressionNumber;
-			subexpressionStackPos[topSubexpression] = expressionStack.size();
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Push a subexpression end. The current subexpression must be the given number, or it is an error.
-	 * 
-	 * @param subexpressionNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushSubexpressionEnd(int subexpressionNumber) {
-		try {
-			if (traceOn) {
-				indent(false);
-				printTrace("End Subexpression #"+subexpressionNumber, errorOccurred); //$NON-NLS-1$
-			}
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (subexpressions == null || topSubexpression < 0 || subexpressions[topSubexpression] != subexpressionNumber) {
-				processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushSubexpressionEnd.ReceivedEndSubexpressionsOutOfOrder_EXC_"))); //$NON-NLS-1$
-			} else {
-				try {
-					popExpressions(expressionStack.size()-subexpressionStackPos[topSubexpression]);
-					topSubexpression--;
-				} catch (NoExpressionValueException e) {
-					processException(e);
-				}
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}			
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java
deleted file mode 100644
index 8e47baf05..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java
+++ /dev/null
@@ -1,213 +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.proxy.initParser.tree;
-
-/**
- * Enum for the forExpression parameters.
- * <p>
- * This is not meant to be subclassed by customers.
- * @since 1.1.0
- */
-public class ForExpression extends AbstractEnum {
-
-	/**
-	 * forExpression: Creating a root expression
-	 */
-	public static final int ROOTEXPRESSION_VALUE = 0;
-
-	public static final ForExpression ROOTEXPRESSION = new ForExpression(ROOTEXPRESSION_VALUE, "Root"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the array expression for an array access (i.e. the array to access)
-	 */
-	public static final int ARRAYACCESS_ARRAY_VALUE = 1;
-
-	public static final ForExpression ARRAYACCESS_ARRAY = new ForExpression(ARRAYACCESS_ARRAY_VALUE, "Array Access: Array Operand"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating an index expression for an array access (i.e. one of the expressions within the <code>[]</code>).
-	 */
-	public static final int ARRAYACCESS_INDEX_VALUE = 2;
-
-	public static final ForExpression ARRAYACCESS_INDEX = new ForExpression(ARRAYACCESS_INDEX_VALUE, "Array Access: Index"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating an dimension expression for an array creation (i.e. one of the expressions within the <code>[]</code>).
-	 */
-	public static final int ARRAYCREATION_DIMENSION_VALUE = 3;
-
-	public static final ForExpression ARRAYCREATION_DIMENSION = new ForExpression(ARRAYCREATION_DIMENSION_VALUE, "Array Access: Dimension"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating an expression for an array initializer (i.e. one of the expressions with the <code>{}</code>). Special case is that
-	 * array initializers are valid as an expression within an array initializer and it doesn't use a for expression.
-	 */
-	public static final int ARRAYINITIALIZER_EXPRESSION_VALUE = 4;
-
-	public static final ForExpression ARRAYINITIALIZER_EXPRESSION = new ForExpression(ARRAYINITIALIZER_EXPRESSION_VALUE, "Array Initializer"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the expression for the cast (i.e. the expresion after the <code>(type)</code>).
-	 */
-	public static final int CAST_EXPRESSION_VALUE = 5;
-
-	public static final ForExpression CAST_EXPRESSION = new ForExpression(CAST_EXPRESSION_VALUE, "Cast"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the argument expression for the new instance.
-	 */
-	public static final int CLASSINSTANCECREATION_ARGUMENT_VALUE = 6;
-
-	public static final ForExpression CLASSINSTANCECREATION_ARGUMENT = new ForExpression(CLASSINSTANCECREATION_ARGUMENT_VALUE,
-			"Class Instance Creation: Argument"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the condition for a conditional expression.
-	 */
-	public static final int CONDITIONAL_CONDITION_VALUE = 7;
-
-	public static final ForExpression CONDITIONAL_CONDITION = new ForExpression(CONDITIONAL_CONDITION_VALUE, "Conditional: Condition"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the true (then) expression for a conditional expression.
-	 */
-	public static final int CONDITIONAL_TRUE_VALUE = 8;
-
-	public static final ForExpression CONDITIONAL_TRUE = new ForExpression(CONDITIONAL_TRUE_VALUE, "Conditional: True"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the false (else) condition for a conditional expression.
-	 */
-	public static final int CONDITIONAL_FALSE_VALUE = 9;
-
-	public static final ForExpression CONDITIONAL_FALSE = new ForExpression(CONDITIONAL_FALSE_VALUE, "Conditional: False"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the receiver for a field access (i.e. the expression before the ".")
-	 */
-	public static final int FIELD_RECEIVER_VALUE = 10;
-
-	public static final ForExpression FIELD_RECEIVER = new ForExpression(FIELD_RECEIVER_VALUE, "Field Access: Receiver"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the left operand of an infix expression.
-	 */
-	public static final int INFIX_LEFT_VALUE = 11;
-
-	public static final ForExpression INFIX_LEFT = new ForExpression(INFIX_LEFT_VALUE, "Infix: Left"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the right operand of an infix expression.
-	 */
-	public static final int INFIX_RIGHT_VALUE = 12;
-
-	public static final ForExpression INFIX_RIGHT = new ForExpression(INFIX_RIGHT_VALUE, "Infix: Right"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating an extended operand of an infix expression.
-	 */
-	public static final int INFIX_EXTENDED_VALUE = 13;
-
-	public static final ForExpression INFIX_EXTENDED = new ForExpression(INFIX_EXTENDED_VALUE, "Infix: Extended"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the value expression of an instanceof.
-	 */
-	public static final int INSTANCEOF_VALUE_VALUE = 14;
-
-	public static final ForExpression INSTANCEOF_VALUE = new ForExpression(INSTANCEOF_VALUE_VALUE, "Instanceof"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating a receiver expression for a method invocation.
-	 */
-	public static final int METHOD_RECEIVER_VALUE = 15;
-
-	public static final ForExpression METHOD_RECEIVER = new ForExpression(METHOD_RECEIVER_VALUE, "Method Invoke: Receiver"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating an argument for a method invocation.
-	 */
-	public static final int METHOD_ARGUMENT_VALUE = 16;
-
-	public static final ForExpression METHOD_ARGUMENT = new ForExpression(METHOD_ARGUMENT_VALUE, "Method Invoke: Argument"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the operand expression for a prefix operator.
-	 */
-	public static final int PREFIX_OPERAND_VALUE = 17;
-
-	public static final ForExpression PREFIX_OPERAND = new ForExpression(PREFIX_OPERAND_VALUE, "Prefix: Operand"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the right operand of an assignment operator.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final int ASSIGNMENT_RIGHT_VALUE = 18;
-
-	public static final ForExpression ASSIGNMENT_RIGHT = new ForExpression(ASSIGNMENT_RIGHT_VALUE, "Assignment: Right"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the left operand of an assignment operator.
-	 * <p>
-	 * Note: The left expression can only be a FieldAccess or ArrayAccess.
-	 */
-	public static final int ASSIGNMENT_LEFT_VALUE = 19;
-
-	public static final ForExpression ASSIGNMENT_LEFT = new ForExpression(ASSIGNMENT_LEFT_VALUE, "Assignment: Left"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the throw operand of the throw expression.
-	 */
-	public static final int THROW_OPERAND_VALUE = 20;
-
-	public static final ForExpression THROW_OPERAND = new ForExpression(THROW_OPERAND_VALUE, "Throw operand"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the if conditional operand of the if expression.
-	 */
-	public static final int IF_CONDITION_VALUE = 21;
-
-	public static final ForExpression IF_CONDITION = new ForExpression(IF_CONDITION_VALUE, "If condition"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the if true clause of the if expression.
-	 */
-	public static final int IF_TRUE_VALUE = 22;
-
-	public static final ForExpression IF_TRUE = new ForExpression(IF_TRUE_VALUE, "If true clause"); //$NON-NLS-1$
-
-	/**
-	 * forExpression: Creating the if else clause of the if expression.
-	 */
-	public static final int IF_ELSE_VALUE = 23;
-
-	public static final ForExpression IF_ELSE = new ForExpression(IF_ELSE_VALUE, "If else clause"); //$NON-NLS-1$
-
-	
-	/**
-	 * This is not private, but protected only so that proxy core can add an internal ForExpression enum.
-	 * <p>
-	 * This is not meant to be subclassed by customers.
-	 * @param value
-	 * @param name
-	 * 
-	 * @since 1.1.0
-	 */
-	protected ForExpression(int value, String name) {
-		super(value, name);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/IExpressionConstants.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/IExpressionConstants.java
deleted file mode 100644
index de6724b5a..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/IExpressionConstants.java
+++ /dev/null
@@ -1,26 +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.proxy.initParser.tree;
- 
-/**
- * These are constants needed by IExpression that will be common between
- * the vm and the IDE. They are also available to users of the IExpression
- * interface.
- * 
- * @since 1.0.0
- */
-public interface IExpressionConstants {
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java
deleted file mode 100644
index 176486052..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java
+++ /dev/null
@@ -1,212 +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.proxy.initParser.tree;
-
-/**
- * Enum for Infix operator
- * 
- * @since 1.1.0
- */
-public class InfixOperator extends AbstractEnum {
-
-	/**
-	 * Infix times "*"
-	 */
-	public static final int IN_TIMES_VALUE = 0;
-
-	public static final InfixOperator IN_TIMES = new InfixOperator(IN_TIMES_VALUE, "Infix *"); //$NON-NLS-1$
-
-	/**
-	 * Infix divide "/"
-	 */
-	public static final int IN_DIVIDE_VALUE = 1;
-
-	public static final InfixOperator IN_DIVIDE = new InfixOperator(IN_DIVIDE_VALUE, "Infix /"); //$NON-NLS-1$
-
-	/**
-	 * Infix remainder "%"
-	 */
-	public static final int IN_REMAINDER_VALUE = 2;
-
-	public static final InfixOperator IN_REMAINDER = new InfixOperator(IN_REMAINDER_VALUE, "Infix %"); //$NON-NLS-1$
-
-	/**
-	 * Infix plus "+"
-	 */
-	public static final int IN_PLUS_VALUE = 3;
-
-	public static final InfixOperator IN_PLUS = new InfixOperator(IN_PLUS_VALUE, "Infix +"); //$NON-NLS-1$
-
-	/**
-	 * Infix minus "-"
-	 */
-	public static final int IN_MINUS_VALUE = 4;
-
-	public static final InfixOperator IN_MINUS = new InfixOperator(IN_MINUS_VALUE, "Infix -"); //$NON-NLS-1$
-
-	/**
-	 * Infix left shift " < <"
-	 */
-	public static final int IN_LEFT_SHIFT_VALUE = 5;
-
-	public static final InfixOperator IN_LEFT_SHIFT = new InfixOperator(IN_LEFT_SHIFT_VALUE, "Infix <<"); //$NON-NLS-1$
-
-	/**
-	 * Infix right shift signed ">>"
-	 */
-	public static final int IN_RIGHT_SHIFT_SIGNED_VALUE = 6;
-
-	public static final InfixOperator IN_RIGHT_SHIFT_SIGNED = new InfixOperator(IN_RIGHT_SHIFT_SIGNED_VALUE, "Infix >>"); //$NON-NLS-1$
-
-	/**
-	 * Infix right shift unsigned ">>>"
-	 */
-	public static final int IN_RIGHT_SHIFT_UNSIGNED_VALUE = 7;
-
-	public static final InfixOperator IN_RIGHT_SHIFT_UNSIGNED = new InfixOperator(IN_RIGHT_SHIFT_UNSIGNED_VALUE, "Infix >>>"); //$NON-NLS-1$
-
-	/**
-	 * Infix less " <"
-	 */
-	public static final int IN_LESS_VALUE = 8;
-
-	public static final InfixOperator IN_LESS = new InfixOperator(IN_LESS_VALUE, "Infix <"); //$NON-NLS-1$
-
-	/**
-	 * Infix greater ">"
-	 */
-	public static final int IN_GREATER_VALUE = 9;
-
-	public static final InfixOperator IN_GREATER = new InfixOperator(IN_GREATER_VALUE, "Infix >"); //$NON-NLS-1$
-
-	/**
-	 * Infix less than or equals " <="
-	 */
-	public static final int IN_LESS_EQUALS_VALUE = 10;
-
-	public static final InfixOperator IN_LESS_EQUALS = new InfixOperator(IN_LESS_EQUALS_VALUE, "Infix <="); //$NON-NLS-1$
-
-	/**
-	 * Infix Greater than or equlas ">="
-	 */
-	public static final int IN_GREATER_EQUALS_VALUE = 11;
-
-	public static final InfixOperator IN_GREATER_EQUALS = new InfixOperator(IN_GREATER_EQUALS_VALUE, "Infix >="); //$NON-NLS-1$
-
-	/**
-	 * Infix equals "=="
-	 */
-	public static final int IN_EQUALS_VALUE = 12;
-
-	public static final InfixOperator IN_EQUALS = new InfixOperator(IN_EQUALS_VALUE, "Infix =="); //$NON-NLS-1$
-
-	/**
-	 * Infix not equals "!="
-	 */
-	public static final int IN_NOT_EQUALS_VALUE = 13;
-
-	public static final InfixOperator IN_NOT_EQUALS = new InfixOperator(IN_NOT_EQUALS_VALUE, "Infix !="); //$NON-NLS-1$
-
-	/**
-	 * Infix exclusive or "^"
-	 */
-	public static final int IN_XOR_VALUE = 14;
-
-	public static final InfixOperator IN_XOR = new InfixOperator(IN_XOR_VALUE, "Infix ^"); //$NON-NLS-1$
-
-	/**
-	 * Infix bitwise and "&"
-	 */
-	public static final int IN_AND_VALUE = 15;
-
-	public static final InfixOperator IN_AND = new InfixOperator(IN_AND_VALUE, "Infix &"); //$NON-NLS-1$
-
-	/**
-	 * Infix bitwise or "|"
-	 */
-	public static final int IN_OR_VALUE = 16;
-
-	public static final InfixOperator IN_OR = new InfixOperator(IN_OR_VALUE, "Infix |"); //$NON-NLS-1$
-
-	/**
-	 * Infix Conditional logical and "&&"
-	 */
-	public static final int IN_CONDITIONAL_AND_VALUE = 17;
-
-	public static final InfixOperator IN_CONDITIONAL_AND = new InfixOperator(IN_CONDITIONAL_AND_VALUE, "Infix &&"); //$NON-NLS-1$
-
-	/**
-	 * Infix Conditional logical or "||"
-	 */
-	public static final int IN_CONDITIONAL_OR_VALUE = 18;
-
-	public static final InfixOperator IN_CONDITIONAL_OR = new InfixOperator(IN_CONDITIONAL_OR_VALUE, "Ifnix ||"); //$NON-NLS-1$
-
-	/**
-	 * Return the infix operator for the given enum value.
-	 * @param value
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static InfixOperator get(int value) {
-		switch (value) {
-			case IN_TIMES_VALUE:
-				return IN_TIMES;
-			case IN_DIVIDE_VALUE:
-				return IN_DIVIDE;
-			case IN_REMAINDER_VALUE:
-				return IN_REMAINDER;
-			case IN_PLUS_VALUE:
-				return IN_PLUS;
-			case IN_MINUS_VALUE:
-				return IN_MINUS;
-			case IN_LEFT_SHIFT_VALUE:
-				return IN_LEFT_SHIFT;
-			case IN_RIGHT_SHIFT_SIGNED_VALUE:
-				return IN_RIGHT_SHIFT_SIGNED;
-			case IN_RIGHT_SHIFT_UNSIGNED_VALUE:
-				return IN_RIGHT_SHIFT_UNSIGNED;
-			case IN_LESS_VALUE:
-				return IN_LESS;
-			case IN_GREATER_VALUE:
-				return IN_GREATER;
-			case IN_LESS_EQUALS_VALUE:
-				return IN_LESS_EQUALS;
-			case IN_GREATER_EQUALS_VALUE:
-				return IN_GREATER_EQUALS;
-			case IN_EQUALS_VALUE:
-				return IN_EQUALS;
-			case IN_NOT_EQUALS_VALUE:
-				return IN_NOT_EQUALS;
-			case IN_XOR_VALUE:
-				return IN_XOR;
-			case IN_AND_VALUE:
-				return IN_AND;
-			case IN_OR_VALUE:
-				return IN_OR;
-			case IN_CONDITIONAL_AND_VALUE:
-				return IN_CONDITIONAL_AND;
-			case IN_CONDITIONAL_OR_VALUE:
-				return IN_CONDITIONAL_OR;
-		}
-		return null;
-	}
-
-	private InfixOperator(int value, String name) {
-		super(value, name);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java
deleted file mode 100644
index bebdd83db..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java
+++ /dev/null
@@ -1,43 +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.proxy.initParser.tree;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author sri
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class InitparserTreeMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.initParser.tree.messages";//$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private InitparserTreeMessages() {
-	}
-
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java
deleted file mode 100644
index 6d6b4eb34..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Internal class for the Conditional operand type. Not meant to be used by customers.
- * 
- * @since 1.1.0
- */
-public class InternalConditionalOperandType extends AbstractEnum {
-
-	/**
-	 * Used in Conditional processing. False operand on expression stack
-	 */
-	public final static int CONDITIONAL_FALSE_VALUE = 0;
-
-	public final static InternalConditionalOperandType CONDITIONAL_FALSE = new InternalConditionalOperandType(CONDITIONAL_FALSE_VALUE,
-			"Conditional False Operand Flag"); //$NON-NLS-1$
-
-	/**
-	 * Used in Conditional processing. True operand on expression stack
-	 */
-	public final static int CONDITIONAL_TRUE_VALUE = 1;
-
-	public final static InternalConditionalOperandType CONDITIONAL_TRUE = new InternalConditionalOperandType(CONDITIONAL_TRUE_VALUE,
-			"Conditional True Operand Flag"); //$NON-NLS-1$
-
-	/**
-	 * Used in Conditional processing. Test operand on expression stack
-	 */
-	public final static int CONDITIONAL_TEST_VALUE = 2;
-
-	public final static InternalConditionalOperandType CONDITIONAL_TEST = new InternalConditionalOperandType(CONDITIONAL_TEST_VALUE,
-			"Conditional Test Operand Flag"); //$NON-NLS-1$
-
-	/**
-	 * Return the enum for the given value.
-	 * @param value
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static InternalConditionalOperandType get(int value) {
-		switch (value) {
-			case CONDITIONAL_FALSE_VALUE:
-				return CONDITIONAL_FALSE;
-			case CONDITIONAL_TRUE_VALUE:
-				return CONDITIONAL_TRUE;
-			case CONDITIONAL_TEST_VALUE:
-				return CONDITIONAL_TEST;
-		}
-		return null;
-	}
-
-	private InternalConditionalOperandType(int value, String name) {
-		super(value, name);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionProxy.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionProxy.java
deleted file mode 100644
index 05dd32a07..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionProxy.java
+++ /dev/null
@@ -1,77 +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.proxy.initParser.tree;
- 
-
-/**
- * This interface is used for expression proxies in the evaluation side (in {@link org.eclipse.jem.internal.proxy.initParser.tree.ExpressionProcesser}).
- * <p>
- * It is meant to be implemented only by users of the ExpressionProcessor.
- * 
- * @since 1.1.0
- */
-public interface InternalExpressionProxy {
-	
-	/**
-	 * Get the id of the proxy.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public int getProxyID();
-	
-	/**
-	 * Called by ExpressionProcesser to give the expression proxy its value and type, i.e. it has been evaluated.
-	 * <p>
-	 * The type may not be the actual type of the value, it may be a superclass of it. It is the type that the proxy
-	 * represents from the return of the expression. For instance it may of returned null but it is supposed to be
-	 * java.lang.String. Or it is supposed to be a primitive int, since we can't store that, we need to store
-	 * an Integer value with the type indicating it is Interger.TYPE.
-	 * 
-	 * @param value
-	 * @param type
-	 * 
-	 * @since 1.1.0
-	 */
-	public void setProxy(Object value, Class type);
-	
-	/**
-	 * Get the value of the proxy. 
-	 * <p>
-	 * Note: The value may be a {@link VariableReference}, in which
-	 * case further dereferencing may be with the returned value.
-	 * @return the value of the proxy, it may be an ExpressionProcesser.VariableReference.
-	 * 
-	 * @since 1.1.0
-	 */
-	public Object getValue();
-	
-	/**
-	 * Get the type of the proxy.
-	 * @return
-	 * 
-	 * @see InternalExpressionProxy#setProxy(Object, Class) for what type means.
-	 * @since 1.1.0
-	 */
-	public Class getType();
-
-	/**
-	 * Return whether the proxy has had a value/class set into it yet.
-	 * @return <code>true</code> if it has been set.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isSet();
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java
deleted file mode 100644
index d1a35eda7..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java
+++ /dev/null
@@ -1,303 +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.proxy.initParser.tree;
-
-/**
- * These constants are for communicating between the IDE and the proxy side for expression evaluation. It is not meant to be used by customers.
- * 
- * @since 1.0.0
- */
-public class InternalExpressionTypes extends AbstractEnum {
-
-	/**
-	 * ARRAY ACCESS Expression
-	 */
-	public final static int ARRAY_ACCESS_EXPRESSION_VALUE = 1;
-
-	public final static InternalExpressionTypes ARRAY_ACCESS_EXPRESSION = new InternalExpressionTypes(ARRAY_ACCESS_EXPRESSION_VALUE,
-			"Array Access Expression"); //$NON-NLS-1$
-
-	/**
-	 * ARRAY CREATION Expression
-	 */
-	public final static int ARRAY_CREATION_EXPRESSION_VALUE = 2;
-
-	public final static InternalExpressionTypes ARRAY_CREATION_EXPRESSION = new InternalExpressionTypes(ARRAY_CREATION_EXPRESSION_VALUE,
-			"Array Creation Expression"); //$NON-NLS-1$
-
-	/**
-	 * ARRAY INITIALIZER expression
-	 */
-	public final static int ARRAY_INITIALIZER_EXPRESSION_VALUE = 3;
-
-	public final static InternalExpressionTypes ARRAY_INITIALIZER_EXPRESSION = new InternalExpressionTypes(ARRAY_INITIALIZER_EXPRESSION_VALUE,
-			"Array Initializer Expression"); //$NON-NLS-1$
-
-	/**
-	 * CAST Expression.
-	 */
-	public final static int CAST_EXPRESSION_VALUE = 4;
-
-	public final static InternalExpressionTypes CAST_EXPRESSION = new InternalExpressionTypes(CAST_EXPRESSION_VALUE, "Cast Expression"); //$NON-NLS-1$
-
-	/**
-	 * CONDITIONAL expression
-	 */
-	public final static int CONDITIONAL_EXPRESSION_VALUE = 5;
-
-	public final static InternalExpressionTypes CONDITIONAL_EXPRESSION = new InternalExpressionTypes(CONDITIONAL_EXPRESSION_VALUE,
-			"Conditional Expression"); //$NON-NLS-1$
-
-	/**
-	 * CLASS INSTANCE CREATION expression
-	 */
-	public final static int CLASS_INSTANCE_CREATION_EXPRESSION_VALUE = 6;
-
-	public final static InternalExpressionTypes CLASS_INSTANCE_CREATION_EXPRESSION = new InternalExpressionTypes(
-			CLASS_INSTANCE_CREATION_EXPRESSION_VALUE, "Class Instance Creation Expression"); //$NON-NLS-1$
-
-	/**
-	 * FIELD ACCESS expression.
-	 */
-	public final static int FIELD_ACCESS_EXPRESSION_VALUE = 7;
-
-	public final static InternalExpressionTypes FIELD_ACCESS_EXPRESSION = new InternalExpressionTypes(FIELD_ACCESS_EXPRESSION_VALUE,
-			"Field Access Expression"); //$NON-NLS-1$
-
-	/**
-	 * INSTANCEOF Expression.
-	 */
-	public final static int INSTANCEOF_EXPRESSION_VALUE = 8;
-
-	public final static InternalExpressionTypes INSTANCEOF_EXPRESSION = new InternalExpressionTypes(INSTANCEOF_EXPRESSION_VALUE,
-			"Instanceof Expression"); //$NON-NLS-1$
-
-	/**
-	 * Infix expression
-	 */
-	public final static int INFIX_EXPRESSION_VALUE = 9;
-
-	public final static InternalExpressionTypes INFIX_EXPRESSION = new InternalExpressionTypes(INFIX_EXPRESSION_VALUE, "Infix Expression"); //$NON-NLS-1$
-
-	/**
-	 * Method expression.
-	 */
-	public final static int METHOD_EXPRESSION_VALUE = 10;
-
-	public final static InternalExpressionTypes METHOD_EXPRESSION = new InternalExpressionTypes(METHOD_EXPRESSION_VALUE, "Method Invoke Expression"); //$NON-NLS-1$
-
-	/**
-	 * Prefix expression
-	 */
-	public final static int PREFIX_EXPRESSION_VALUE = 11;
-
-	public final static InternalExpressionTypes PREFIX_EXPRESSION = new InternalExpressionTypes(PREFIX_EXPRESSION_VALUE, "Prefix Expression"); //$NON-NLS-1$
-
-	/**
-	 * Push to proxy expression.
-	 */
-	public final static int PUSH_TO_PROXY_EXPRESSION_VALUE = 12;
-
-	public final static InternalExpressionTypes PUSH_TO_PROXY_EXPRESSION = new InternalExpressionTypes(PUSH_TO_PROXY_EXPRESSION_VALUE,
-			"Push to Proxy Expression"); //$NON-NLS-1$
-
-	/**
-	 * Push BeanType expression proxy expression.
-	 */
-	public final static int PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE = 13;
-	
-	public final static InternalExpressionTypes PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE,
-			"Push BeanType ExpressionProxy Expression"); //$NON-NLS-1$
-
-	
-	/**
-	 * Type receiver expression.
-	 */
-	public final static int TYPERECEIVER_EXPRESSION_VALUE = 14;
-
-	public final static InternalExpressionTypes TYPERECEIVER_EXPRESSION = new InternalExpressionTypes(TYPERECEIVER_EXPRESSION_VALUE,
-			"Type Receiver Expression"); //$NON-NLS-1$
-
-	/**
-	 * Assignment to an ExpressionProxy expression.
-	 */
-	public final static int ASSIGNMENT_PROXY_EXPRESSION_VALUE = 15;
-
-	public final static InternalExpressionTypes ASSIGNMENT_PROXY_EXPRESSION = new InternalExpressionTypes(ASSIGNMENT_PROXY_EXPRESSION_VALUE,
-			"Assignment to Proxy Expression"); //$NON-NLS-1$
-
-	/**
-	 * Push expression proxy value expression.
-	 */
-	public final static int PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE = 16;
-
-	public final static InternalExpressionTypes PUSH_TO_EXPRESSION_PROXY_EXPRESSION = new InternalExpressionTypes(
-			PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE, "Push to Expression Proxy Expression"); //$NON-NLS-1$
-
-	/**
-	 * Assignment expression.
-	 */
-	public final static int ASSIGNMENT_EXPRESSION_VALUE = 17;
-
-	public final static InternalExpressionTypes ASSIGNMENT_EXPRESSION = new InternalExpressionTypes(ASSIGNMENT_EXPRESSION_VALUE,
-			"Assignment Expression"); //$NON-NLS-1$
-
-	/**
-	 * Block End expression.
-	 */
-	public final static int BLOCK_BEGIN_EXPRESSION_VALUE = 18;
-	
-	public final static InternalExpressionTypes BLOCK_BEGIN_EXPRESSION = new InternalExpressionTypes(BLOCK_BEGIN_EXPRESSION_VALUE,
-			"Begin block Expression"); //$NON-NLS-1$
-
-	/**
-	 * Block End expression.
-	 */
-	public final static int BLOCK_BREAK_EXPRESSION_VALUE = 19;
-	
-	public final static InternalExpressionTypes BLOCK_BREAK_EXPRESSION = new InternalExpressionTypes(BLOCK_BREAK_EXPRESSION_VALUE,
-			"Break block Expression"); //$NON-NLS-1$
-
-	/**
-	 * Block End expression.
-	 */
-	public final static int BLOCK_END_EXPRESSION_VALUE = 20;
-	
-	public final static InternalExpressionTypes BLOCK_END_EXPRESSION = new InternalExpressionTypes(BLOCK_END_EXPRESSION_VALUE,
-			"End block Expression"); //$NON-NLS-1$
-
-	/**
-	 * Try Begin expression.
-	 */
-	public final static int TRY_BEGIN_EXPRESSION_VALUE = 21;
-	
-	public final static InternalExpressionTypes TRY_BEGIN_EXPRESSION = new InternalExpressionTypes(TRY_BEGIN_EXPRESSION_VALUE,
-			"Begin try Expression"); //$NON-NLS-1$
-
-	/**
-	 * Try Catch expression.
-	 */
-	public final static int TRY_CATCH_EXPRESSION_VALUE = 22;
-	
-	public final static InternalExpressionTypes TRY_CATCH_EXPRESSION = new InternalExpressionTypes(TRY_CATCH_EXPRESSION_VALUE,
-			"Try catch Expression"); //$NON-NLS-1$
-	
-	/**
-	 * Try Finally expression.
-	 */
-	public final static int TRY_FINALLY_EXPRESSION_VALUE = 23;
-	
-	public final static InternalExpressionTypes TRY_FINALLY_EXPRESSION = new InternalExpressionTypes(TRY_FINALLY_EXPRESSION_VALUE,
-			"Try finally Expression"); //$NON-NLS-1$
-
-	/**
-	 * Try End expression.
-	 */
-	public final static int TRY_END_EXPRESSION_VALUE = 24;
-	
-	public final static InternalExpressionTypes TRY_END_EXPRESSION = new InternalExpressionTypes(TRY_END_EXPRESSION_VALUE,
-			"End try Expression"); //$NON-NLS-1$
-	
-	/**
-	 * Throw expression.
-	 */
-	public final static int THROW_EXPRESSION_VALUE = 25;
-	
-	public final static InternalExpressionTypes THROW_EXPRESSION = new InternalExpressionTypes(THROW_EXPRESSION_VALUE,
-			"Throw Expression"); //$NON-NLS-1$
-
-	/**
-	 * Rethrow expression.
-	 */
-	public final static int RETHROW_EXPRESSION_VALUE = 26;
-	
-	public final static InternalExpressionTypes RETHROW_EXPRESSION = new InternalExpressionTypes(RETHROW_EXPRESSION_VALUE,
-			"Rethrow Expression"); //$NON-NLS-1$
-
-	/**
-	 * Push Method Lookup expression proxy expression.
-	 */
-	public final static int PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE = 27;
-	
-	public final static InternalExpressionTypes PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE,
-			"Push Method ExpressionProxy Expression"); //$NON-NLS-1$
-
-	/**
-	 * Push Field Lookup expression proxy expression.
-	 */
-	public final static int PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE = 28;
-	
-	public final static InternalExpressionTypes PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE,
-			"Push Field ExpressionProxy Expression"); //$NON-NLS-1$
-
-	/**
-	 * Push If/else (the clauses) expression proxy expression.
-	 */
-	public final static int IF_ELSE_EXPRESSION_VALUE = 29;
-	
-	public final static InternalExpressionTypes IF_ELSE_EXPRESSION = new InternalExpressionTypes(IF_ELSE_EXPRESSION_VALUE,
-			"Push If/else Expression"); //$NON-NLS-1$
-
-	/**
-	 * Push If/else condition test expression proxy expression.
-	 */
-	public final static int IF_TEST_EXPRESSION_VALUE = 30;
-	
-	public final static InternalExpressionTypes IF_TEST_EXPRESSION = new InternalExpressionTypes(IF_TEST_EXPRESSION_VALUE,
-			"Push If Test Expression"); //$NON-NLS-1$
-
-
-	/**
-	 * Push new instance from init string proxy expression.
-	 */
-	public final static int NEW_INSTANCE_VALUE = 31;
-	
-	public final static InternalExpressionTypes NEW_INSTANCE = new InternalExpressionTypes(NEW_INSTANCE_VALUE,
-			"Push New Instance Expression"); //$NON-NLS-1$
-
-
-	/**
-	 * Push mark proxy expression.
-	 */
-	public final static int MARK_VALUE = 32;
-	
-	public final static InternalExpressionTypes MARK = new InternalExpressionTypes(MARK_VALUE,
-			"Push Mark Expression"); //$NON-NLS-1$
-
-	/**
-	 * Push end mark proxy expression.
-	 */
-	public final static int ENDMARK_VALUE = 33;
-	
-	public final static InternalExpressionTypes ENDMARK = new InternalExpressionTypes(ENDMARK_VALUE,
-			"Push End Mark Expression"); //$NON-NLS-1$
-
-	/**
-	 * Subexpression End expression.
-	 */
-	public final static int SUBEXPRESSION_BEGIN_EXPRESSION_VALUE = 34;
-	
-	public final static InternalExpressionTypes SUBEXPRESSION_BEGIN_EXPRESSION = new InternalExpressionTypes(SUBEXPRESSION_BEGIN_EXPRESSION_VALUE,
-			"Begin Subexpression Expression"); //$NON-NLS-1$
-
-	/**
-	 * Subexpression End expression.
-	 */
-	public final static int SUBEXPRESSION_END_EXPRESSION_VALUE = 35;
-	
-	public final static InternalExpressionTypes SUBEXPRESSION_END_EXPRESSION = new InternalExpressionTypes(SUBEXPRESSION_END_EXPRESSION_VALUE,
-			"End Subexpression Expression"); //$NON-NLS-1$
-	
-	
-	private InternalExpressionTypes(int value, String name) {
-		super(value, name);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java
deleted file mode 100644
index ca998c9fa..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java
+++ /dev/null
@@ -1,60 +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.proxy.initParser.tree;
-
-/**
- * Internal class for the If/else operand type. Not meant to be used by customers.
- * 
- * @since 1.1.0
- */
-public class InternalIfElseOperandType extends AbstractEnum {
-
-	/**
-	 * Used in If/else processing. False clause on expression stack
-	 */
-	public final static int ELSE_CLAUSE_VALUE = 0;
-
-	public final static InternalIfElseOperandType ELSE_CLAUSE = new InternalIfElseOperandType(ELSE_CLAUSE_VALUE,
-			"Else Clause Flag"); //$NON-NLS-1$
-
-	/**
-	 * Used in If/else processing. If operand on expression stack
-	 */
-	public final static int TRUE_CLAUSE_VALUE = 1;
-
-	public final static InternalIfElseOperandType TRUE_CLAUSE = new InternalIfElseOperandType(TRUE_CLAUSE_VALUE,
-			"If True Clause Flag"); //$NON-NLS-1$
-
-	/**
-	 * Return the enum for the given value.
-	 * @param value
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static InternalIfElseOperandType get(int value) {
-		switch (value) {
-			case ELSE_CLAUSE_VALUE:
-				return ELSE_CLAUSE;
-			case TRUE_CLAUSE_VALUE:
-				return TRUE_CLAUSE;
-		}
-		return null;
-	}
-
-	private InternalIfElseOperandType(int value, String name) {
-		super(value, name);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java
deleted file mode 100644
index 34604b15a..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
- 
-
-/**
- * Internal class for the Prefix operand type. Not meant to be used by customers.
- * @since 1.1.0
- */
-public class InternalInfixOperandType extends AbstractEnum {
-
-	/**
-	 * Used in Infix processing. Left operand on expression stack
-	 */
-	public final static int INFIX_LEFT_OPERAND_VALUE = 0;
-	public final static InternalInfixOperandType INFIX_LEFT_OPERAND = new InternalInfixOperandType(INFIX_LEFT_OPERAND_VALUE, "Infix Left Operand Flag"); //$NON-NLS-1$
-	/**
-	 * Used in Infix processing. Other operand (but not last) on expression stack
-	 */
-	public final static int INFIX_OTHER_OPERAND_VALUE = 1;
-	public final static InternalInfixOperandType INFIX_OTHER_OPERAND = new InternalInfixOperandType(INFIX_OTHER_OPERAND_VALUE,
-	"Infix Other Operand Flag"); //$NON-NLS-1$
-	/**
-	 * Used in Infix processing. Rightmost (last) operand on expression stack
-	 */
-	public final static int INFIX_LAST_OPERAND_VALUE = 2;
-	public final static InternalInfixOperandType INFIX_LAST_OPERAND = new InternalInfixOperandType(INFIX_LAST_OPERAND_VALUE, "Infix Last Operand Flag"); //$NON-NLS-1$
-
-	/**
-	 * Return the enum for the given value.
-	 * @param value
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static InternalInfixOperandType get(int value) {
-		switch (value) {
-			case INFIX_LAST_OPERAND_VALUE:
-				return INFIX_LAST_OPERAND;
-			case INFIX_LEFT_OPERAND_VALUE:
-				return INFIX_LEFT_OPERAND;
-			case INFIX_OTHER_OPERAND_VALUE:
-				return INFIX_OTHER_OPERAND;
-		}
-		return null;
-	}
-	
-	private InternalInfixOperandType(int value, String name) {
-		super(value, name);
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/NoExpressionValueException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/NoExpressionValueException.java
deleted file mode 100644
index 7005354b5..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/NoExpressionValueException.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
- 
-
-/**
- * The expression (or some nested expression) did not return a value. I.e. it was <code>void</code>.
- * This would occur only if the value of expression was being retrieved through getExpressionValue,
- * or if a nested expression was used, since in that case the value would of been used as an
- * argument or receiver to another expression.
- * 
- * @since 1.0.0
- */
-public class NoExpressionValueException extends Exception {
-	
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 * 
-	 * @since 1.1.0
-	 */
-	private static final long serialVersionUID = -7953101867782417964L;
-	
-	private InternalExpressionProxy proxy;
-
-	/**
-	 * Construct with no arguments.
-	 * 
-	 * @since 1.0.0
-	 */
-	public NoExpressionValueException() {
-		super();
-	}
-	
-	public NoExpressionValueException(Throwable e) {
-		super(e);
-	}
-
-	/**
-	 * Construct with a message.
-	 * 
-	 * @param message
-	 * 
-	 * @since 1.0.0
-	 */
-	public NoExpressionValueException(String message) {
-		this(message, null);
-	}
-	
-	/**
-	 * Construct with a message and a proxy. This is only used from {@link ExpressionProcesser#getExpressionProxyValue(int, Object[])} when
-	 * the proxy existed but it was not set.
-	 * 
-	 * @param message
-	 * @param proxy
-	 * 
-	 * @since 1.1.0
-	 */
-	public NoExpressionValueException(String message, InternalExpressionProxy proxy) {
-		super (message);
-		this.proxy = proxy;
-	}
-	
-	/**
-	 * Get the proxy if there is one. It will be a proxy if {@link ExpressionProcesser#getExpressionProxyValue(int, Object[])}
-	 * was for an existing proxy but that proxy was not set. Otherwise it will be null. This is here for callers to
-	 * put special info in the proxy for the not set condition and report better info.
-	 * 
-	 * @return the proxy (if not set) or <code>null</code> if no proxy available.
-	 * 
-	 * @since 1.1.0
-	 */
-	public InternalExpressionProxy getProxy() {
-		return proxy;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java
deleted file mode 100644
index b8b99b504..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java
+++ /dev/null
@@ -1,77 +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.proxy.initParser.tree;
-
-/**
- * Enum for prefix operator.
- * 
- * @since 1.1.0
- */
-public class PrefixOperator extends AbstractEnum {
-
-	/**
-	 * Prefix plus "+"
-	 */
-	public static final int PRE_PLUS_VALUE = 0;
-
-	public static final PrefixOperator PRE_PLUS = new PrefixOperator(PRE_PLUS_VALUE, "Prefix +"); //$NON-NLS-1$
-
-	/**
-	 * Prefix minus "-"
-	 */
-	public static final int PRE_MINUS_VALUE = 1;
-
-	public static final PrefixOperator PRE_MINUS = new PrefixOperator(PRE_MINUS_VALUE, "Prefix -"); //$NON-NLS-1$
-
-	/**
-	 * Prefix bitwise complement "~"
-	 */
-	public static final int PRE_COMPLEMENT_VALUE = 2;
-
-	public static final PrefixOperator PRE_COMPLEMENT = new PrefixOperator(PRE_COMPLEMENT_VALUE, "Prefix ~"); //$NON-NLS-1$
-
-	/**
-	 * Prefix logical not "!"
-	 */
-	public static final int PRE_NOT_VALUE = 3;
-
-	public static final PrefixOperator PRE_NOT = new PrefixOperator(PRE_NOT_VALUE, "Prefix !"); //$NON-NLS-1$
-
-	/**
-	 * Return the prefix operator for the given enum value.
-	 * @param value
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static PrefixOperator get(int value) {
-		switch (value) {
-			case PRE_PLUS_VALUE:
-				return PRE_PLUS;
-			case PRE_MINUS_VALUE:
-				return PRE_MINUS;
-			case PRE_COMPLEMENT_VALUE:
-				return PRE_COMPLEMENT;
-			case PRE_NOT_VALUE:
-				return PRE_NOT;
-		}
-		return null;
-	}
-
-	private PrefixOperator(int value, String name) {
-		super(value, name);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/VariableReference.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/VariableReference.java
deleted file mode 100644
index 7588b6294..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/VariableReference.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
- 
-
-/**
- * This represents a Variable Reference value. A variable reference value can be on the left
- * side of an assignment (e.g. field or array access) or on any side
- * of any expression. When on the left side of an assignment, then the
- * value can assigned to. Such as <code>x[3] = 4</code>. Or it is value
- * that can be used in expressions, such as <code>x[3] + 2</code>.
- * <p>
- * When dereferenced, the value is given (see {@link VariableReference#dereference()}) as
- * the result or it is set with a value and then deferenced (see {@link VariableReference#set(Object, Class)}).
- * <p>
- * The type of the reference is the type stored in the corresponding expressionTypeStack entry. This is the type
- * for assignment, and the type for dereferenced.
- * @since 1.1.0
- */
-public abstract class VariableReference {
-
-	/**
-	 * Dereference the value. 
-	 * @return the dereferenced value. Such as the result of <code>x[3]</code>. The type of the reference 
-	 * is the type stored in the corresponding expressionTypeStack entry for this reference.
-	 * @throws IllegalAccessException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.1.0
-	 */
-	public abstract Object dereference();
-	
-	/**
-	 * Set the value into the variable and dereference it. Once it is set it is
-	 * no longer a reference and must be dereferenced.
-	 * @param value value to set to.
-	 * @param type type of the value being set. It may be of use to the reference or maybe not.
-	 * @return the dereferenced value after being set. The type of the dereferenced value 
-	 * is the type stored in the corresponding expressionTypeStack entry for this reference.
-	 * @throws IllegalAccessException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.1.0
-	 */
-	public abstract Object set(Object value, Class type) throws IllegalArgumentException, IllegalAccessException;
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties
deleted file mode 100644
index da6840dc1..000000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-ExpressionProcesser.CannotCastXToY_EXC_                           = IWAV0156E Cannot cast "{0}" to be "{1}".
-ExpressionProcesser.InvalidOperandOfPrefixOperator_EXC_           = IWAV0157E {0} not valid as the operand of prefix operator "{1}".
-ExpressionProcesser.PopExpressionType.ExpressionVoid_EXC_=Expression was void.
-ExpressionProcesser.InvalidOperandOfOperator_EXC_                 = IWAV0158E {0} not valid as the operand of operator "{1}".
-ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray_EXC_  = IWAV0159E {0} is greater then number of dimensions ({1}) in the array
-ExpressionProcesser.CreateArrayAccessReference.OutOfBounds_EXC_=Index: {0} size:{1}
-ExpressionProcesser.PushTryEnd.TryEndReceivedOutOfOrder_EXC_=Try/end received out of order.
-ExpressionProcesser.PushEndmark.EndMarkOnNonExistingID_EXC_=Tried to do an end mark on a non-existing markID ({0})
-ExpressionProcesser.NotAnArray_EXC_                               = IWAV0160E "{0}" is not an array.
-ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested_EXC_ = IWAV0161E Arraytype "{0}" has fewer dimensions than creation requested ({1}).
-ExpressionProcesser.CreateFieldAccessReference.FieldsTypesNotMatching_EXC_=Field receiver does not match the type of the field: Field: {0} receiver: {1}
-ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyNotSet_EXC_=Expression Proxy never set.
-ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyDoesntExist_EXC_=Expression proxy doesn't exist.
-ExpressionProcesser.PushBlockEnd.ReceivedEndBlocksOutOfOrder_EXC_=End Blocks received out of order.
-ExpressionProcesser.PushTryCatchClause.CatchReceivedOutOfOrder_EXC_=Catch received out of order.
-ExpressionProcesser.PushTryFinallyClause.FinallyReceivedOutOfOrder_EXC_=Finally received out of order.
-ExpressionProcesser.PushTryRethrow.RethrowReceivedOutOfOrder_EXC_=Rethrow received out of order.
-ExpressionProcesser.PushTryRethrow.RetryReceivedOutOfExecutingCatchClause_EXC_=Retry received outside of an executing catch clause
-ExpressionProcesser.PushSubexpressionEnd.ReceivedEndSubexpressionsOutOfOrder_EXC_=End Subexpressions received out of order.
diff --git a/plugins/org.eclipse.jem.proxy/plugin.properties b/plugins/org.eclipse.jem.proxy/plugin.properties
deleted file mode 100644
index e07dfc9d5..000000000
--- a/plugins/org.eclipse.jem.proxy/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/plugin.properties,v $
-# $Revision: 1.7 $  $Date: 2005/08/24 20:39:07 $
-#
-
-
-pluginName=Java EMF Model Proxy Support
-providerName = Eclipse.org
-contributors.extensionpoint.name=Proxy configuration contributors
-extensions.extensionpoint.name=Proxy configuration extension registrations
-Launch.localProxy=Local Proxy Application
diff --git a/plugins/org.eclipse.jem.proxy/plugin.xml b/plugins/org.eclipse.jem.proxy/plugin.xml
deleted file mode 100644
index ca74b4218..000000000
--- a/plugins/org.eclipse.jem.proxy/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension-point id="contributors" name="%contributors.extensionpoint.name" schema="schema/contributors.exsd"/>
-   <extension-point id="extensions" name="%extensions.extensionpoint.name" schema="schema/extensions.exsd"/>
-
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            name="%Launch.localProxy"
-            delegate="org.eclipse.jem.internal.proxy.remote.LocalProxyLaunchDelegate"
-            category="org.eclipse.jem.proxy"
-            modes="run"
-            id="org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"
-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
-      </launchConfigurationType>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.proxy/proxy.jars b/plugins/org.eclipse.jem.proxy/proxy.jars
deleted file mode 100644
index 10aede430..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy.jars
+++ /dev/null
@@ -1,4 +0,0 @@
-proxycommon.jar=/org.eclipse.jem.proxy/common_bin/
-initparser.jar=/org.eclipse.jem.proxy/common_bin/
-remotecommon.jar=/org.eclipse.jem.proxy/common_bin/
-vm/remotevm.jar=/org.eclipse.jem.proxy/vm_bin/
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/IStandardAwtBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/IStandardAwtBeanProxyFactory.java
deleted file mode 100644
index 00e894e57..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/IStandardAwtBeanProxyFactory.java
+++ /dev/null
@@ -1,48 +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.proxy.awt;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IBeanProxyFactory;
-/**
- * The Standard awt bean proxy factory.
- * This is the Interface that the desktop will talk
- * to.
- * Creation date: (12/3/99 11:52:09 AM)
- * @author: Joe Winchester
- */
-public interface IStandardAwtBeanProxyFactory extends IBeanProxyFactory {
-	public static final String REGISTRY_KEY = "standard-java.awt"; //$NON-NLS-1$
-
-/**
- * Return a new bean proxy for the dimension argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IDimensionBeanProxy createDimensionBeanProxyWith(int width, int height);
-/**
- * Return a new bean proxy for the point argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IPointBeanProxy createPointBeanProxyWith(int x, int y);
-/**
- * Return a new bean proxy for the rectangle argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IRectangleBeanProxy createBeanProxyWith(int x, int y, int width, int height);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/JavaStandardAwtBeanConstants.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/JavaStandardAwtBeanConstants.java
deleted file mode 100644
index 57cecb79b..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/JavaStandardAwtBeanConstants.java
+++ /dev/null
@@ -1,254 +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.proxy.awt;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Standard AWT Constants
- *
- * Use the static accessor method (getConstants()) to get the appropriate 
- * constants instance for the registry. This is done so that until the
- * the constants are needed, they aren't registered.
- *
- * NOTE: Since everything in here just proxies, there is
- *       no need to have them separated by VM. That is why
- *       this in the Proxy package.
- *
- * This is final because this can't be extended. This specific one
- * will be registered with the factory for this key. Any extensions
- * must be done in their own constants and registry key.
- *
- * Creation date: (4/7/00 4:47:48 PM)
- * @author: Administrator
- */
-public final class JavaStandardAwtBeanConstants {
-		
-	public static final Object REGISTRY_KEY = new Object();
-			
-	final boolean AWTLoaded;	// AWT may not be available. So non-ui JVM's don't have AWT.
-	final boolean AWTRegistered;	// AWT was registered to be used in this VM. It may be registered, but still not available.
-		
-	final IFieldProxy dimensionHeightProxy;
-	final IFieldProxy dimensionWidthProxy;
-	final IMethodProxy setDimensionSizeHWProxy;
-	final IMethodProxy setDimensionSizeDProxy;
-	
-	final IFieldProxy pointXProxy;
-	final IFieldProxy pointYProxy;
-	final IMethodProxy setPointLocationXYProxy;
-	final IMethodProxy setPointLocationPProxy;
-	
-	final IFieldProxy rectangleHeightProxy;
-	final IFieldProxy rectangleWidthProxy;
-	final IFieldProxy rectangleXProxy;
-	final IFieldProxy rectangleYProxy;
-	final IMethodProxy setRectangleSizeHWProxy;
-	final IMethodProxy setRectangleSizeDProxy;
-	final IMethodProxy setRectangleLocationXYProxy;
-	final IMethodProxy setRectangleLocationPProxy;
-	final IMethodProxy setRectangleBoundsXYHWProxy;
-	final IMethodProxy setRectangleBoundsRProxy;
-	
-/**
- * Get the constants instance for the specified registry.
- */
-public static JavaStandardAwtBeanConstants getConstants(ProxyFactoryRegistry registry) {
-	JavaStandardAwtBeanConstants constants = (JavaStandardAwtBeanConstants) registry.getConstants(REGISTRY_KEY);
-	if (constants == null)
-		registry.registerConstants(REGISTRY_KEY, constants = new JavaStandardAwtBeanConstants(registry, registry.getBeanProxyFactoryExtension(IStandardAwtBeanProxyFactory.REGISTRY_KEY) != null));
-	return constants;
-}
-		
-
-public JavaStandardAwtBeanConstants(ProxyFactoryRegistry registry, boolean isRegistered) {
-	super();
-	
-	AWTRegistered = isRegistered;
-	if (!AWTRegistered) {
-		AWTLoaded = false;
-		dimensionHeightProxy = dimensionWidthProxy = pointXProxy = pointYProxy = rectangleHeightProxy = rectangleWidthProxy = rectangleXProxy = rectangleYProxy = null;
-		setDimensionSizeHWProxy = setDimensionSizeDProxy = setPointLocationXYProxy = setPointLocationPProxy = setRectangleSizeHWProxy = setRectangleSizeDProxy = setRectangleLocationXYProxy = setRectangleLocationPProxy = setRectangleBoundsXYHWProxy = setRectangleBoundsRProxy = null;		
-		return;
-	}
-	
-	IStandardBeanTypeProxyFactory typeFactory = registry.getBeanTypeProxyFactory();
-	
-	IBeanTypeProxy dimensionTypeProxy = typeFactory.getBeanTypeProxy("java.awt.Dimension");//$NON-NLS-1$
-	if (dimensionTypeProxy != null) {
-		// AWT is available.
-		AWTLoaded = true;
-		IBeanTypeProxy intTypeProxy = typeFactory.getBeanTypeProxy("int"); //$NON-NLS-1$
-		
-		dimensionHeightProxy = dimensionTypeProxy.getFieldProxy("height");//$NON-NLS-1$
-		dimensionWidthProxy = dimensionTypeProxy.getFieldProxy("width");//$NON-NLS-1$
-		setDimensionSizeHWProxy = dimensionTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
-		setDimensionSizeDProxy = dimensionTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {dimensionTypeProxy}); //$NON-NLS-1$
-	
-		IBeanTypeProxy pointTypeProxy = typeFactory.getBeanTypeProxy("java.awt.Point");//$NON-NLS-1$
-		pointXProxy = pointTypeProxy.getFieldProxy("x");//$NON-NLS-1$
-		pointYProxy = pointTypeProxy.getFieldProxy("y");	//$NON-NLS-1$
-		setPointLocationXYProxy = pointTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
-		setPointLocationPProxy = pointTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {pointTypeProxy}); //$NON-NLS-1$
-		
-		
-		IBeanTypeProxy rectangleTypeProxy = typeFactory.getBeanTypeProxy("java.awt.Rectangle");//$NON-NLS-1$
-		rectangleHeightProxy = rectangleTypeProxy.getFieldProxy("height");//$NON-NLS-1$
-		rectangleWidthProxy = rectangleTypeProxy.getFieldProxy("width");//$NON-NLS-1$
-		rectangleXProxy = rectangleTypeProxy.getFieldProxy("x");//$NON-NLS-1$
-		rectangleYProxy = rectangleTypeProxy.getFieldProxy("y");//$NON-NLS-1$
-		setRectangleSizeHWProxy = rectangleTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
-		setRectangleSizeDProxy = rectangleTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {dimensionTypeProxy}); //$NON-NLS-1$
-		setRectangleLocationXYProxy = rectangleTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
-		setRectangleLocationPProxy = rectangleTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {pointTypeProxy});		 //$NON-NLS-1$
-		setRectangleBoundsXYHWProxy = rectangleTypeProxy.getMethodProxy("setBounds", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy, intTypeProxy, intTypeProxy}); //$NON-NLS-1$
-		setRectangleBoundsRProxy = rectangleTypeProxy.getMethodProxy("setBounds", new IBeanTypeProxy[] {rectangleTypeProxy}); //$NON-NLS-1$
-	} else {
-		AWTLoaded = false;
-		dimensionHeightProxy = dimensionWidthProxy = pointXProxy = pointYProxy = rectangleHeightProxy = rectangleWidthProxy = rectangleXProxy = rectangleYProxy = null;
-		setDimensionSizeHWProxy = setDimensionSizeDProxy = setPointLocationXYProxy = setPointLocationPProxy = setRectangleSizeHWProxy = setRectangleSizeDProxy = setRectangleLocationXYProxy = setRectangleLocationPProxy = setRectangleBoundsXYHWProxy = setRectangleBoundsRProxy = null;
-	}
-}
-
-/**
- * Answer if AWT is available.
- */
-public boolean isAWTAvailable() {
-	return AWTLoaded;
-}
-
-/**
- * Answer if AWT was registered to be available.
- */
-public boolean isAWTRegistered() {
-	return AWTRegistered;
-}
-
-
-
-/**
- * getDimensionHeightFieldProxy method comment.
- */
-public IFieldProxy getDimensionHeightFieldProxy() {
-	return dimensionHeightProxy;
-}
-/**
- * getDimensionWidthProxy method comment.
- */
-public IFieldProxy getDimensionWidthFieldProxy() {
-	return dimensionWidthProxy;
-}
-/**
- * getDimensionSetSizeWHProxy method comment.
- */
-public IMethodProxy getDimensionSetSizeHWProxy() {
-	return setDimensionSizeHWProxy;
-}
-/**
- * getDimensionSetSizeDProxy method comment.
- */
-public IMethodProxy getDimensionSetSizeDProxy() {
-	return setDimensionSizeDProxy;
-}
-
-/**
- * getPointXFieldProxy method comment.
- */
-public IFieldProxy getPointXFieldProxy() {
-	return pointXProxy;
-}
-/**
- * getPointYFieldProxy method comment.
- */
-public IFieldProxy getPointYFieldProxy() {
-	return pointYProxy;
-}
-/**
- * getPointSetLocationXYProxy method comment.
- */
-public IMethodProxy getPointSetLocationXYProxy() {
-	return setPointLocationXYProxy;
-}
-/**
- * getPointSetLocationPProxy method comment.
- */
-public IMethodProxy getPointSetLocationPProxy() {
-	return setPointLocationPProxy;
-}
-/**
- * getRectangleHeightFieldProxy method comment.
- */
-public IFieldProxy getRectangleHeightFieldProxy() {
-	return rectangleHeightProxy;
-}
-/**
- * getRectangleWidthFieldProxy method comment.
- */
-public IFieldProxy getRectangleWidthFieldProxy() {
-	return rectangleWidthProxy;
-}
-/**
- * getRectangleXFieldProxy method comment.
- */
-public IFieldProxy getRectangleXFieldProxy() {
-	return rectangleXProxy;
-}
-/**
- * getRectangleYFieldProxy method comment.
- */
-public IFieldProxy getRectangleYFieldProxy() {
-	return rectangleYProxy;
-}
-/**
- * getRectangleSetSizeWHProxy method comment.
- */
-public IMethodProxy getRectangleSetSizeHWProxy() {
-	return setRectangleSizeHWProxy;
-}
-/**
- * getRectangleSetSizeDProxy method comment.
- */
-public IMethodProxy getRectangleSetSizeDProxy() {
-	return setRectangleSizeDProxy;
-}
-/**
- * getRectangleSetLocationXYProxy method comment.
- */
-public IMethodProxy getRectangleSetLocationXYProxy() {
-	return setRectangleLocationXYProxy;
-}
-/**
- * getRectangleSetLocationPProxy method comment.
- */
-public IMethodProxy getRectangleSetLocationPProxy() {
-	return setRectangleLocationPProxy;
-}
-
-/**
- * getRectangleSetBoundsXYHWProxy method comment.
- */
-public IMethodProxy getRectangleSetBoundsXYHWProxy() {
-	return setRectangleBoundsXYHWProxy;
-}
-/**
- * getRectangleSetBoundsRProxy method comment.
- */
-public IMethodProxy getRectangleSetBoundsRProxy() {
-	return setRectangleBoundsRProxy;
-}
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/BaseProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/BaseProxyFactoryRegistry.java
deleted file mode 100644
index ba972293b..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/BaseProxyFactoryRegistry.java
+++ /dev/null
@@ -1,89 +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.proxy.core;
- 
-/**
- * This is the Base Registry that all implementations should subclass. 
- * <p>
- * It is not meant to be used by customers. It provides public functions only for access of individual implementations.
- * Customers should only access {@link org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry}.
- * 
- * @since 1.1.0
- */
-public abstract class BaseProxyFactoryRegistry extends ProxyFactoryRegistry {
-
-	private final String registryTypeID;
-
-	/**
-	 * Construct with registry type ID. The type id should be provided by
-	 * each implementation. This will be used to provide specific type
-	 * registrations through contributions.
-	 *  
-	 * @param registryTypeID
-	 * 
-	 * @since 1.1.0
-	 */
-	protected BaseProxyFactoryRegistry(String registryTypeID) {
-		super();
-		this.registryTypeID = registryTypeID;
-	}
-	
-	/**
-	 * Return the reqistry type id.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public String getRegistryTypeID() {
-		return registryTypeID;
-	}
-
-	/**
-	 Register the current registered bean proxy factory to be used for creating IBeanProxy instances
-	 */
-	public void registerBeanProxyFactory(IStandardBeanProxyFactory aStandardFactory) {
-		fCurrentStandardBeanProxyFactory = aStandardFactory;
-	}
-
-	/**
-	 Register a factory to be used for creating IBeanProxy instances
-	 */
-	public void registerBeanProxyFactory(String packageName, IBeanProxyFactory aFactory) {
-		fRegisteredExtensionBeanProxyFactories.put(packageName, aFactory);
-	}
-
-	/**
-	 Register the current registered bean type proxy factory to be used for creating IBeanTypeProxy instances
-	 */
-	public void registerBeanTypeProxyFactory(IStandardBeanTypeProxyFactory aStandardFactory) {
-		fCurrentStandardBeanTypeProxyFactory = aStandardFactory;
-	}
-
-	/**
-	 Register a factory to be used for creating IBeanTypeProxy instances
-	 */
-	public void registerBeanTypeProxyFactory(String packageName, IBeanTypeProxyFactory aFactory) {
-		fRegisteredExtensionBeanTypeProxyFactories.put(packageName, aFactory);
-	}
-
-	/**
-	 * Set the Method Proxy Factory for this VM.
-	 * Creation date: (3/13/00 10:58:19 AM)
-	 */
-	public void registerMethodProxyFactory(IMethodProxyFactory newMethodProxyFactory) {
-		fMethodProxyFactory = newMethodProxyFactory;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/CollectionBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/CollectionBeanProxyWrapper.java
deleted file mode 100644
index 51c415882..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/CollectionBeanProxyWrapper.java
+++ /dev/null
@@ -1,137 +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.proxy.core;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.*;
-/**
- * This is a wrapper for an java.util.Collection proxy.
- * It provides the collection methods to interface to
- * the proxy.
- */
-
-public class CollectionBeanProxyWrapper {
-	protected final IBeanProxy fCollection;
-	protected final JavaStandardBeanProxyConstants fConstants;
-	
-	/**
-	 * Construct with the collection.
-	 */
-	public CollectionBeanProxyWrapper(IBeanProxy aCollectionProxy) {
-		if (!aCollectionProxy.getTypeProxy().isKindOf(aCollectionProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.Collection"))) //$NON-NLS-1$
-			throw new ClassCastException(java.text.MessageFormat.format(ProxyMessages.ClassCast_EXC__IncorrectType, new Object[] {aCollectionProxy.getTypeProxy().getTypeName(), "java.util.Collection"}));  //$NON-NLS-1$
-		else
-			fCollection = aCollectionProxy;
-			
-		fConstants = JavaStandardBeanProxyConstants.getConstants(aCollectionProxy.getProxyFactoryRegistry());
-	}
-	
-	/**
-	 * Answer the collection proxy that this is wrappering.
-	 */
-	public IBeanProxy getBeanProxy() {
-		return fCollection;
-	}
-
-	/**
-	 * equals - Pass it on to the proxy to handle this.
-	 */
-	public boolean equals(Object object) {
-		return fCollection.equals(object);
-	}
-	
-	/**
-	 * hashCode - Pass it on to the proxy to handle this.
-	 */
-	public int hashCode() {
-		return fCollection.hashCode();
-	}
-	
-	/**
-	 * Collection accessors
-	 */
-	public boolean add(IBeanProxy object) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getCollectionAdd().invoke(fCollection, object)).booleanValue();
-	}
-	public boolean addAll(IBeanProxy collection) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getCollectionAddAll().invoke(fCollection, collection)).booleanValue();
-	}
-	public void clear() throws ThrowableProxy {
-		fConstants.getCollectionClear().invoke(fCollection);
-	}
-	public boolean contains(IBeanProxy object) {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getCollectionContains().invoke(fCollection, object)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return false;
-		}
-	}
-	public boolean containsAll(IBeanProxy collection) {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getCollectionContainsAll().invoke(fCollection, collection)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return false;
-		}			
-	}		
-	public boolean isEmpty() {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getCollectionIsEmpty().invoke(fCollection)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return true;
-		}			
-	}		
-	public IteratorBeanProxyWrapper iterator() {
-		try {
-			IBeanProxy itr = fConstants.getCollectionIterator().invoke(fCollection);
-			if (itr != null)
-				return new IteratorBeanProxyWrapper(itr);
-			else
-				return null;
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return null;
-		}			
-	}
-	public boolean remove(IBeanProxy object) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getCollectionRemove().invoke(fCollection, object)).booleanValue();
-	}
-	public boolean removeAll(IBeanProxy collection) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getCollectionRemoveAll().invoke(fCollection, collection)).booleanValue();
-	}		
-	public boolean retainAll(IBeanProxy collection) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getCollectionRetainAll().invoke(fCollection, collection)).booleanValue();
-	}
-	public int size() {
-		try {
-			return ((IIntegerBeanProxy) fConstants.getCollectionSize().invoke(fCollection)).intValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return 0;
-		}			
-	}	
-	public IArrayBeanProxy toArray() throws ThrowableProxy {
-		return (IArrayBeanProxy) fConstants.getCollectionToArray().invoke(fCollection);
-	}
-	public IArrayBeanProxy toArray(IArrayBeanProxy array) throws ThrowableProxy {
-		return (IArrayBeanProxy) fConstants.getCollectionToArrayWithArray().invoke(fCollection, array);
-	}	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ConfigurationContributorAdapter.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ConfigurationContributorAdapter.java
deleted file mode 100644
index 570c72bd4..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ConfigurationContributorAdapter.java
+++ /dev/null
@@ -1,51 +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.proxy.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
- 
-/**
- * This is an implementation of IConfigurationContributor that does nothing. It
- * can be subclassed to provide specific overrides.
- * @since 1.0.0
- */
-public class ConfigurationContributorAdapter implements IConfigurationContributor {
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#initialize(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
-	 */
-	public void initialize(IConfigurationContributionInfo info) {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#contributeClasspaths(org.eclipse.jem.internal.proxy.core.IConfigurationContributionController)
-	 */
-	public void contributeClasspaths(IConfigurationContributionController controller) throws CoreException {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#contributeToConfiguration(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void contributeToConfiguration(ILaunchConfigurationWorkingCopy config) throws CoreException {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#contributeToRegistry(org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry)
-	 */
-	public void contributeToRegistry(ProxyFactoryRegistry registry) {
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContainerPathContributionMapping.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContainerPathContributionMapping.java
deleted file mode 100644
index 1f4ca36cc..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContainerPathContributionMapping.java
+++ /dev/null
@@ -1,196 +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.proxy.core;
-
-import java.lang.reflect.Array;
-import java.util.*;
-import java.util.regex.Pattern;
-
-
-/**
- * Mapping of container paths (Regular expressions) to configuration elements.
- * <p>
- * It can be instantiated by clients that need to built up a subset of the mapping from the 
- * normal mapping done by {@link ProxyPlugin#getPluginExtensions(String)}.
- * <p>
- * To build one up separately clients would:
- * <pre><code>
- * ContainerPathContributionMapping mapping = new ContainerPathContributionMapping(contributionType);
- * mapping.addContribution(containerid, pattern, contribution);
- * 	...
- * mapping.finalizeMapping();
- * </code></pre>
- * 
- * @since 1.2.0
- */
-public class ContainerPathContributionMapping {
-	
-	/**
-	 * Used in {@link ContainerPathContributionMapping#containerIdToContributions} as the value of the map. 
-	 * This contains a Pattern for a container path to match against to see if the contribution
-	 * should be used.
-	 * <p>
-	 * Normally it would be better to use {@link ContainerPathContributionMapping#getContributors(String, String[])}
-	 * to get all of the contributors for all of the paths of the same container id. 
-	 * 
-	 * @since 1.2.0
-	 */
-	public static class ContainerContributionEntry {
-		
-		private final Object contribution;
-		private final Pattern containerPathPattern;
-	
-		public ContainerContributionEntry(Object contribution, Pattern containerPathPattern) {
-			this.contribution = contribution;
-			this.containerPathPattern = containerPathPattern;
-		}
-		
-		
-		/**
-		 * @return Returns the contribution.
-		 * 
-		 * @since 1.2.0
-		 */
-		public final Object getContribution() {
-			return contribution;
-		}
-		
-		
-		/**
-		 * @return Returns the container pattern for matching.
-		 * 
-		 * @since 1.2.0
-		 */
-		public final Pattern getContainerPathPattern() {
-			return containerPathPattern;
-		}
-	}
-
-	
-	/**
-	 * Map of container ids (String, first segment of container path) to {@link ContainerContributionEntry[]}.
-	 * <p>
-	 * Normally it would be better to use {@link #getContributors(String, String[])}
-	 * to get all of the contributors for all of the paths of the same container id. 
-	 * 
-	 * @since 1.2.0
-	 */
-	public Map containerIdToContributions = Collections.EMPTY_MAP;
-	
-	// TODO When 1.5, this can go away.
-	private final Class contributionType;
-	
-	/**
-	 * Create with contribution type (i.e. the array type returned from {@link #getContributors(String, String[])}.
-	 * <p>
-	 * TODO This will go away with 1.5 because this will be templated.
-	 * 
-	 * @param type
-	 * 
-	 * 
-	 * @since 1.2.0
-	 */
-	public ContainerPathContributionMapping(Class type) {
-		contributionType = type;
-	}
-	
-	
-	/**
-	 * Get the unique array of configuration elements (no duplicates) for the given container id, and
-	 * the set of container paths for that container id. For example, "SWT_CONTAINER" as containerID and
-	 * {"/SWT_CONTAINER/", "/SWT_CONTAINER/PDE/JFACE"} for container paths. This will then return configuration elements
-	 * that match these two paths in the container attribute of the configuration element. The container attribute
-	 * is a regular expression. For example "SWT_CONTAINER" will match both "/SWT_CONTAINER/" and "/SWT_CONTAINER/PDE/JFACE"
-	 * while "SWT_CONTAINER/.* /JFACE" will match "/SWT_CONTAINER/PDE/JFACE". (Note it is actually no space between the "*" and "/" but java comment syntax won't allow it.)   
-	 * @param containerId id of all the containers in the list of paths (the first segment of all of the paths).
-	 * @param containerPaths array of all of the paths to look for contributions for.
-	 * @return array of configuration elements for the given list of paths. They will be in order declared within a plugin within plugin order.
-	 * 
-	 * @since 1.2.0
-	 */
-	public Object[] getContributors(String containerId, String[] containerPaths) {
-		ContainerContributionEntry[] bundleContributions = (ContainerContributionEntry[]) containerIdToContributions.get(containerId);
-		if (bundleContributions == null)
-			return (Object[]) Array.newInstance(contributionType, 0);
-		List contributions = new ArrayList();
-		// Patterns that have been tested. Key is a pattern, value is Boolean. true if this pattern matched any of the container paths.
-		// This way a pattern will only be tested once for the list of paths. If the pattern is found the list again we will know if it
-		// should be selected or not.
-		// The bundleContributions are in order declared within each plugin within plugin order.
-		Map testedPatterns = new HashMap();
-		for (int i = 0; i < bundleContributions.length; i++) {
-			Boolean tested = (Boolean) testedPatterns.get(bundleContributions[i].getContainerPathPattern());
-			if (tested == null) {
-				// Need to test it.
-				// Run through container paths and see if any match.
-				tested = Boolean.FALSE;
-				Pattern pattern = bundleContributions[i].getContainerPathPattern();
-				for (int j = 0; j < containerPaths.length; j++) {
-					if (pattern.matcher(containerPaths[j]).matches()) {
-						tested = Boolean.TRUE;
-						break;
-					}
-				}
-				testedPatterns.put(pattern, tested);
-			}
-			if (tested.booleanValue())
-				contributions.add(bundleContributions[i].getContribution());
-		}
-		return contributions.toArray((Object[]) Array.newInstance(contributionType, contributions.size()));
-	}
-
-	/**
-	 * Add contribution to mapping. This is not normally needed by clients unless the client needs to
-	 * build up a different container path mapping than the one normally created by {@link ProxyPlugin#processContributionExtensionPoint(String)}.
-	 * <p>
-	 * After all contributions have been added {@link #finalizeMapping()} must be called. If this
-	 * is not called then {@link #getContributors(String, String[])} will fail with exceptions.
-
-	 * @param containerId
-	 * @param pattern
-	 * @param contribution
-	 * 
-	 * @since 1.2.0
-	 */
-	public void addContribution(String containerId, Pattern pattern, Object contribution) {
-		if (containerIdToContributions == Collections.EMPTY_MAP)
-			containerIdToContributions = new HashMap();	// This is first call to add something.
-		// We will build as list, but then change to array when done.
-		Object contributions = containerIdToContributions.get(containerId);
-		if (contributions == null) {
-			contributions = new ArrayList(1);
-			containerIdToContributions.put(containerId, contributions);
-		} else if (!(contributions instanceof List)) {
-			// It must be an array, so convert back to list so that we can add to it.
-			List oldContributions = Arrays.asList((Object[]) contribution);
-			contributions = new ArrayList(oldContributions.size());
-			((List) contributions).addAll(oldContributions);
-			containerIdToContributions.put(containerId, contributions);
-		}
-		((List) contributions).add(new ContainerContributionEntry(contribution, pattern));
-
-	}
-	
-	/**
-	 * Finalize the mapping. This is called when clients are done with all {@link #addContribution(String)}.
-	 * It takes the mapping from an internal format that allowed for quicker building into the final format.
-	 * 
-	 * 
-	 * @since 1.2.0
-	 */
-	public void finalizeMapping() {
-		for (Iterator iter = containerIdToContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			if (entry.getValue() instanceof List)
-				entry.setValue(((List) entry.getValue()).toArray(new ContainerContributionEntry[((List) entry.getValue()).size()]));
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContributorExtensionPointInfo.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContributorExtensionPointInfo.java
deleted file mode 100644
index 61839e0a7..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContributorExtensionPointInfo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-
-import java.util.Map;
-
-
-/**
- * Result from {@link ProxyPlugin#processContributionExtensionPoint(String)}
- * 
- * @since 1.0.0
- */
-public class ContributorExtensionPointInfo {
-	
-	/**
-	 * Contributions that are based upon container paths that are built up from
-	 * the extension point.
-	 * 
-	 * @since 1.2.0
-	 */
-	public ContainerPathContributionMapping containerPathContributions;
-
-	ContributorExtensionPointInfo() {
-		// Not meant to be instantiated or subclassed outside of ProxyPlugin.
-	}
-	
-	/**
-	 * Map of plugin ids (String) to contributions (IConfigurationElement[]) that was found with that id. For each plugin,
-	 * the contributions will be listed in plugin prereq order.
-	 */
-	public Map pluginToContributions;
-
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/EnumerationBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/EnumerationBeanProxyWrapper.java
deleted file mode 100644
index feb900fc5..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/EnumerationBeanProxyWrapper.java
+++ /dev/null
@@ -1,77 +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.proxy.core;
-/*
-
-
- */
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.Enumeration proxy.
- * It provides the Enumeration methods to interface to
- * the proxy.
- */
-
-public class EnumerationBeanProxyWrapper {
-	protected final IBeanProxy fEnumeration;
-	protected final JavaStandardBeanProxyConstants fConstants;
-	
-	/**
-	 * Construct with the collection.
-	 */
-	public EnumerationBeanProxyWrapper(IBeanProxy anEnumerationProxy) {
-		
-		fEnumeration = anEnumerationProxy;
-			
-		fConstants = JavaStandardBeanProxyConstants.getConstants(anEnumerationProxy.getProxyFactoryRegistry());
-	}
-	
-	/**
-	 * Answer the iterator proxy that this is wrappering.
-	 */
-	public IBeanProxy getBeanProxy() {
-		return fEnumeration;
-	}
-
-	/**
-	 * equals - Pass it on to the proxy to handle this.
-	 */
-	public boolean equals(Object object) {
-		return fEnumeration.equals(object);
-	}
-	
-	/**
-	 * hashCode - Pass it on to the proxy to handle this.
-	 */
-	public int hashCode() {
-		return fEnumeration.hashCode();
-	}
-	
-	/**
-	 * Enumeration accessors
-	 */
-	public boolean hasMoreElements() {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getEnumerationHasMoreElements().invoke(fEnumeration)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return false;
-		}			
-	}
-	public IBeanProxy nextElement() throws ThrowableProxy {
-		return fConstants.getEnumerationNextElement().invoke(fEnumeration);
-	}	
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java
deleted file mode 100644
index 99645a746..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java
+++ /dev/null
@@ -1,2546 +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.proxy.core;
-
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
- 
-/**
- * This is implementation of IExpression. It encapsulates much of the processing required
- * into a common form that will be turned into simple push/pop/evaluate type of interaction with the
- * actual other side. All registry specific implementations of IExpression must subclass this class.
- * <p>
- * It will maintain a stack of the expressions. As the expressions come in they will be stacked if not
- * able to be executed immediately. The expressions come to this class in an  outside to inside order,
- * but they need to be processed in an inside-out order instead. 
- * <p>
- * Subclasses will be used for the different types of proxy interfaces. The abstract methods will
- * then be the simple interface. 
- * <p>
- * It is not meant for subclasses to override the actual create expression methods because the processing the stack
- * is very sensitive and must execute in the proper sequence. So the create methods are final for this reason.
- * <p>
- * This class is not thread-safe.
- * <p>
- * This class also has API of its own and can be used by customers for advanced usage. Those advanced API are
- * listed on each method as to whether it is customer API or implementers API (i.e. API for implementers of
- * expression subclasses to use). 
- * 
- * 
- * @since 1.0.0
- */
-public abstract class Expression implements IExpression {
-
-	/*
-	 * We have stack here, but rather than create a class that does the
-	 * stack protocol, will simply have some private methods to do
-	 * the same thing for the stack. (Note: Can't use java.util.Stack
-	 * because that is a synchronized class, and don't want the overhead). 
-	 * 
-	 * The purpose of the stack is to stack up expressions that have not yet
-	 * been evaluated. 
-	 * 
-	 * Each expression type will control the content of what it pushes and pops.
-	 * The expression type will be the last thing it pushes so that on popping
-	 * we know what kind of expression is now completed and ready for evaluation.
-	 */
-	private ArrayList controlStack = new ArrayList(30);
-	
-	protected final ProxyFactoryRegistry registry;
-	protected final IStandardBeanProxyFactory beanProxyFactory;
-	protected Boolean traceFlag;
-	
-	/**
-	 * Answer whether trace has been explicitly set.
-	 * This is not in the IExpression interface because it is for advanced users.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isTraceSet() {
-		return traceFlag != null; 
-	}
-	
-	/**
-	 * Answer if trace is on. If not explicitly set this will answer false.
-	 * Use {@link Expression#isTraceSet()} first to determine if this
-	 * should be called or not.
-	 * This is not in the IExpression interface because it is for advanced users.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isTrace() {
-		return traceFlag != null ? traceFlag.booleanValue() : false;
-	}
-	
-	/**
-	 * Explicitly set the trace flag. This will only be honoured before any
-	 * expressions have been created. After that this will be ignored.
-	 * The trace is initially set to use default. Once set it cannot be unset.
-	 * This is not in the IExpression interface because it is for advanced users.
-	 * @param trace
-	 * 
-	 * @since 1.1.0
-	 */
-	public void setTrace(boolean trace) {
-		traceFlag = Boolean.valueOf(trace);
-	}
-	
-	/**
-	 * Push an object onto the control stack.
-	 * 
-	 * @param o
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void push(Object o) {
-		controlStack.add(o);
-	}
-	
-	/**
-	 * Pop an object off of the control stack
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final Object pop() {
-		return controlStack.remove(controlStack.size()-1);
-	}
-	
-	/**
-	 * Peek at an object from the control stack. <code>fromTop</code> is how far from the top of the stack to look.
-	 * If it one, then it is the top entry, two is the next one down. Zero is an invalid value for the parameter.
-	 * @param fromTop How far from the top to peek. <code>1</code> is the top, not zero.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final Object peek(int fromTop) {
-		// 1 means the top, 2 is the next one down.
-		return controlStack.get(controlStack.size()-fromTop);
-	}
-	
-	/*
-	 * Expression type constants.
-	 */
-	
-	/*
-	 * ARRAY ACCESS expression.
-	 * The expression stack will have:
-	 * 	IExpression.ARRAYACCESS_ARRAY
-	 * 	IExpression.ARRAYACCESS_INDEX (for 1 to n times depending on index count)
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have
-	 * 	ARRAYACCESS
-	 * 	Integer(index count) 
-	 */
-	private static final Integer ARRAYACCESS_INDEX_1 = new Integer(1);	// Use in normal case of one index count. Saves object creation.
-	
-	/*
-	 * ARRAY CREATION expression.
-	 * The expression stack will have:
-	 * 	ARRAYCREATION_INITIALIZER - if hasInitializer
-	 *  IExpression.ARRAYCREATION_DIMENSION (for 0 to n times depending on dimension count)
-	 *  PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have
-	 *  ARRAYCREATION
-	 *  type (either a string representing the type, or an IBeanProxyType representing the type).
-	 *  Integer(dimension count) (if zero then there is an initializer) 
-	 * 
-	 * 
-	 * Note: Array Initializer works with this in that it will peek into the value stack two entries down
-	 * to find the type of array it should be creating.
-	 */
-	private static final Integer ARRAY_CREATION_DIMENSION_1 = new Integer(1);	// Use in normal case of one dimension. Save object creation.
-	private static final Integer ARRAY_CREATION_DIMENSION_0 = new Integer(0);	// Use in normal case of initializer. Save object creation.
-	private static final ForExpression ARRAY_INITIALIZER = new ExpressionEnum(Integer.MIN_VALUE+1, "Array Initializer Internal"); //$NON-NLS-1$
-	
-	/*
-	 * ARRAY INITIALIZER expression
-	 * The expression stack will have:
-	 * 	IExpression.ARRAYINITIALIZER_EXPRESSION (for n times depending on number of expressions count)
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have
-	 * 	ARRAYINITIALIZER
-	 *  type (either a string representing the type, or an IBeanProxyType representing the type).
-	 * 		I.e. if array being created is int[][], the value pushed here will be int[]. This is because when created
-	 * 		the array will wind up with int[expressioncount][] in the end.
-	 * 	Integer (expression count)
-	 * 
-	 * Note: Imbedded Array Initializers works with this in that it will peek into the value stack two entries down
-	 * to find the type of array it should be creating.
-	 */
-	private static final Integer ARRAYINITIALIZER_COUNT_0 = new Integer(0);	// Use in normal case of empty array. Save object creation.
-	private static final Integer ARRAYINITIALIZER_COUNT_1 = new Integer(1);	// Use in normal case of one element array. Save object creation.
-	private static final Integer ARRAYINITIALIZER_COUNT_2 = new Integer(2);	// Use in normal case of two element array. Save object creation.	
-	
-	/*
-	 * CAST expression.
-	 * The expression stack will have:
-	 * 	IExpression.CAST_EXPRESSION
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	CAST
-	 * 	type (either a string representing the type, or an IBeanProxyType representing the type).
-	 */
-
-	/*
-	 * CLASS INSTANCE CREATION expression.
-	 * The expression stack will have:
-	 *  IExpression.CLASSINSTANCECREATION_ARGUMENT (for 0 to n times depending on argument count)
-	 *  PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have
-	 *  CLASSINSTANCECREATION
-	 *  type (either a string representing the type, or an IBeanProxyType representing the type).
-	 *  Integer(argument count) 
-	 * 
-	 * 
-	 * Note: Array Initializer works with this in that it will peek into the value stack two entries down
-	 * to find the type of array it should be creating.
-	 */
-	private static final Integer CLASS_INSTANCE_CREATION_ARGUMENTS_1 = new Integer(1);	// Use in normal case of one argument. Save object creation.
-	private static final Integer CLASS_INSTANCE_CREATION_ARGUMENTS_0 = new Integer(0);	// Use in normal case of no arguments (default ctor). Save object creation.
-
-	/*
-	 * CONDITIONAL expression.
-	 * Since this can cause skipping of expressions (e.g. if condition is false, then the true condition should not be evaluated),
-	 * we need to have a process expression and process call to the other side for each expression so that it can
-	 * determine if it should be ignored or not.
-	 * 
-	 * The expression stack will have:
-	 * 	IExpression.CONDITIONAL_CONDITION
-	 * 	PROCESS_EXPRESSION
-	 * 	IExpression.CONDITIONAL_TRUE
-	 * 	PROCESS_EXPRESSION
-	 * 	IExpression.CONDITIONAL_FALSE
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	CONDITIONAL
-	 * 	CONDITIONAL_CONDITION
-	 * 	CONDITIONAL
-	 * 	CONDITIONAL_TRUE
-	 * 	CONDITIONAL
-	 * 	CONDITIONAL_FALSE
-	 * 
-	 */
-	
-	/*
-	 * PREFIX expression.
-	 * The expression stack will have:
-	 * 	IExpression.PREFIX_OPERAND
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	PREFIX
-	 * 	operator (using Integer prefix operator constants defined here) 
-	 */
-	
-	/*
-	 * INFIX expression.
-	 * Since two types of infix operators (conditional and AND or) can cause skipping of expressions (e.g. once
-	 * conditional and sees a false expression, the rest of the expressions are skipped and should not be evaluated),
-	 * we need to have a process expression and process call to the other side for each expression so that it can
-	 * determine if it should be ignored or not.
-	 * 
-	 * The expression stack will have:
-	 * 	IExpression.INFIX_LEFT
-	 * 	PROCESS_EXPRESSION
-	 * 	IExpression.INFIX_RIGHT
-	 *  PROCESS_EXPRESSION
-	 * 		(for 0 to n times depending upon extended count)
-	 * 		IExpression.INFIX_EXTENDED 
-	 * 		PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	INFIX
-	 * 	operator (using Integer infix operator constants defined here)
-	 *  IN_LEFT
-	 * 		(for (extendedCount) times) This will cover the right one and all but last extended
-	 * 		INFIX
-	 * 		operator (using Integer infix operator constants defined here)
-	 *  	IN_OTHER
-	 * INFIX
-	 * 	operator (using Integer infix operator constants defined here)
-	 *  IN_LAST (this is covers either the right one if no extended, or the last extended)
-	 */
-	
-	/*
-	 * INSTANCEOF expression.
-	 * The expression stack will have:
-	 * 	IExpression.INSTANCEOF_EXPRESSION
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	INSTANCEOF
-	 * 	type (either a string representing the type, or an IBeanProxyType representing the type).
-	 */
-
-	/*
-	 * Field access expression.
-	 * The expression stack will have:
-	 * 	IExpression.FIELD_RECEIVER (if hasReceiver is true)
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	FIELDACCESS
-	 * 	name (the name of the field)
-	 *  Boolean (true if has receiver)
-	 */
-
-	/*
-	 * Method invocation expression.
-	 * The expression stack will have:
-	 * 	IExpression.METHOD_RECEIVER (if hasReceiver is true)
-	 * 	IExpression.METHOD_ARGUMENT (0 to n times for how many arguments).
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	METHODINVOCATION
-	 * 	name (the name of the method)
-	 *  Boolean (true if has receiver)
-	 *  argCount (the number of arguments).
-	 */
-	private static final Integer METHOD_ARGUMENTS_1 = new Integer(1);	// Use in normal case of one argument. Save object creation.
-	private static final Integer METHOD_ARGUMENTS_0 = new Integer(0);	// Use in normal case of no arguments. Save object creation.
-	
-
-	/*
-	 * Assignment expression
-	 * The expression stack will have:
-	 *  IExpression.ASSIGNMENT_RIGHT
-	 *  IExpression.ASSIGNMENT_LEFT
-	 *  PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 *  ASSIGNMENT
-	 *  left expression (variable reference)
-	 *  right expression
-	 */
-
-	/*
-	 * Assignment proxy expression
-	 * The expression stack will have:
-	 *  IExpression.ASSIGNMENT_RIGHT
-	 *  PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 *  ASSIGNMENT_PROXY
-	 *  expression proxy (an expression proxy)
-	 */
-	
-	/*
-	 * Next valid for expression stack. This is kept as a stack also.
-	 * As the expressions come in, the appropriate order (in reverse)
-	 * of expression types will be pushed, and then popped as they 
-	 * come in.
-	 * 
-	 * Since we can't have an array list of ints, will simulate the
-	 * stack here.
-	 */
-	private ForExpression[] nextForExpressionStack = new ForExpression[30];
-	private int nextForExpressionStackPos = -1;	// Position of top entry in stack.
-	private boolean expressionValid = true;	// Is the expression currently valid.
-	private String invalidMsg = null;	// Msg for being invalid if default msg not sufficient.
-	private List expressionProxies;	// List of expression proxies. The index of the proxy is its id. This list must never shrink in size.
-
-	// A MarkEntry. To allow restore in case of error.
-	private static class MarkEntry {
-		public int markID;
-		public int controlStackPos;	// Position of control stack at time of mark.
-		public int nextExpressionStackPos;	// Position of nextForExpression stack at time of mark.
-		public int expressionProxiesPos;	// Position of expressionProxies list at time of mark.
-	}
-	
-	private int highestMarkID = 0;	// Next mark id. '0' is invalid, as in no marks. This is incremented for each new mark. Never decremented.
-	private MarkEntry currentMarkEntry;	// Just a convienence to the current mark entry so no need to look into the list every time.
-	private List markEntries;	// Stack of mark entries.
-	
-	// This class is here so we can add our special internal ForExpression: PROCESS_EXPRESSION. These are never used outside Expression.
-	private static class ExpressionEnum extends ForExpression {
-
-		public ExpressionEnum(int value, String name) {
-			super(value, name);
-		}
-		
-	}
-	
-	// This is pushed onto the next expression stack, and when it is popped, then the expression is complete and ready to be pushed to the proxy side.
-	private static final ForExpression PROCESS_EXPRESSION = new ExpressionEnum(Integer.MIN_VALUE, "Process Expression"); //$NON-NLS-1$
-	
-	// This is pushed onto the next expression stack for end block and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression BLOCKEND_EXPRESSION = new ExpressionEnum(PROCESS_EXPRESSION.getValue()-2, "End Block Expression"); //$NON-NLS-1$
-
-	// This is pushed onto the next expression stack for end try and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression TRYEND_EXPRESSION = new ExpressionEnum(BLOCKEND_EXPRESSION.getValue()-1, "End Try Expression"); //$NON-NLS-1$
-
-	// This is pushed onto the next expression stack for catch and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression TRYCATCH_EXPRESSION = new ExpressionEnum(TRYEND_EXPRESSION.getValue()-1, "Catch Expression"); //$NON-NLS-1$
-	
-
-	// This is pushed onto the next expression stack for begin thread transfer and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression THREADTRANSFER_EXPRESSION = new ExpressionEnum(TRYCATCH_EXPRESSION.getValue()-1, "Catch Expression"); //$NON-NLS-1$
-
-	// This is pushed onto the next expression stack for end subexpression and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression SUBEXPRESSIONEND_EXPRESSION = new ExpressionEnum(THREADTRANSFER_EXPRESSION.getValue()-2, "End Subexpression"); //$NON-NLS-1$
-
-	/**
-	 * Check the for expression, and if legal, set to the next valid for expression type,
-	 * if it can. If the stack entry is ROOTEXPRESSION, and the forExpression is ROOTEXPRESSION,
-	 * then the expression is allowed, but it is not popped. It must be popped later when appropriate.
-	 * <p>
-	 * This is for "block" expressions. We don't want to pop down the stack passed the ROOTEXPRESSION
-	 * that got added by the create block until we get an end block. That allows root expressions to
-	 * be added to the block without the stack popping up past the block start in the stack.
-	 * 
-	 * @param forExpression
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void checkForExpression(ForExpression forExpression) throws IllegalStateException {
-		if (expressionValid) {
-			if (nextForExpressionStackPos == -1)
-				if (forExpression == ForExpression.ROOTEXPRESSION)
-					return;	// valid. We are at the root (i.e. nothing is waiting).
-				else
-					;	// invalid. drop through
-			else if (nextForExpressionStack[nextForExpressionStackPos] == forExpression) {
-				// Valid, either the root expression matched (We don't implicitly pop those. That needs to be done explicitly). 
-				// Or we matched non-root, those will be popped.
-				if (forExpression != ForExpression.ROOTEXPRESSION) {
-					popForExpression();	// Pop the stack since stack not a root expression.
-				}
-				return;	
-			}
-		} else {
-			String expMsg = invalidMsg != null ? MessageFormat.format(ProxyMessages.Expression_InInvalidStateDueTo_EXC_, new Object[] {invalidMsg}) : ProxyMessages.Expression_InInvalidState_EXC_; 
-			throw new IllegalStateException(expMsg);
-		}
-		
-		// If we got here, then invalid.
-		ForExpression expected = nextForExpressionStackPos >= 0 ? nextForExpressionStack[nextForExpressionStackPos] : ForExpression.ROOTEXPRESSION;
-		expressionValid = false;
-		throw new IllegalStateException(MessageFormat.format(ProxyMessages.Expression_TypeSentInInvalidOrder_EXC_, new Object[] {forExpression, expected})); 
-	}
-	
-	/**
-	 * Pop the top for expression, whatever it is.
-	 * @throws IllegalStateException thrown if try to pop through through the current mark entry. The endMark is the only one who can do this.
-	 * @since 1.1.0
-	 */
-	protected final void popForExpression() throws IllegalStateException {
-		if (expressionValid && nextForExpressionStackPos >= 0) {
-			nextForExpressionStackPos--;
-			if (currentMarkEntry != null && nextForExpressionStackPos < currentMarkEntry.nextExpressionStackPos) {
-				nextForExpressionStackPos++;	// Restore to what it was
-				throwInvalidMarkNesting();
-			}
-		}
-	}
-
-	/*
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	private void throwInvalidMarkNesting() throws IllegalStateException {
-		expressionValid = false;
-		throw new IllegalStateException(MessageFormat.format(ProxyMessages.Expression_InvalidMarkNesting, new Object[] {new Integer(currentMarkEntry != null ? currentMarkEntry.markID : 0)})); 
-	}
-	
-	/**
-	 * Peek into the for expression stack to see if the top entry is the passed in value. It will
-	 * not pop the stack nor throw any exceptions.
-	 * 
-	 * @param forExpression The top expression flag will be compared against this value.
-	 * @return <code>true</code> if the top expression equals the parameter passed in.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final boolean peekForExpression(ForExpression forExpression) {
-		if (expressionValid) {
-			if (nextForExpressionStackPos == -1)
-				if (forExpression == ForExpression.ROOTEXPRESSION)
-					return true;	// valid. We are at the root (i.e. nothing is waiting).
-				else
-					;	// invalid. drop through
-			else if (nextForExpressionStack[nextForExpressionStackPos] == forExpression)
-				return true;	// Valid, the top expression matched.
-		} 
-		return false;
-	}	
-	
-	/**
-	 * Mark this expression as now invalid.
-	 */
-	protected final void markInvalid() {
-		expressionValid = false;
-	}
-	
-	/**
-	 * Mark this expression as now invalid, but supply a message to go with it.
-	 * 
-	 * @param msg
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void markInvalid(String msg) {
-		invalidMsg = msg;
-		markInvalid();
-	}
-	
-	public void close() {
-		nextForExpressionStackPos = -1;
-		controlStack.clear();
-		if (expressionProxies != null)
-			markAllProxiesNotResolved(expressionProxies);	// They weren't processed, close must of been called early.
-		expressionProxies = null;
-		markEntries = null;
-		expressionValid = false;
-		closeProxy();
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#isValid()
-	 */
-	public boolean isValid() {
-		return expressionValid;
-	}
-	
-	/*
-	 * Check if the pending expression is ready for evaluation.
-	 * It is complete if the next entry on the stack is a PROCESS_EXPRESSION
-	 */
-	private boolean expressionReady() {
-		if (nextForExpressionStackPos >= 0 && nextForExpressionStack[nextForExpressionStackPos] == PROCESS_EXPRESSION) {
-			checkForExpression(PROCESS_EXPRESSION);	// pop it
-			return true;
-		} else
-			return false;
-	}
-	
-	/*
-	 * Push the next expression type.
-	 */
-	private void pushForExpression(ForExpression nextExpression) {
-		if (++nextForExpressionStackPos >= nextForExpressionStack.length) {
-			// Increase stack size.
-			ForExpression[] newStack = new ForExpression[nextForExpressionStackPos*2];	// So room to grow without excessive allocations.
-			System.arraycopy(nextForExpressionStack, 0, newStack, 0, nextForExpressionStack.length);
-			nextForExpressionStack = newStack;
-		}
-		nextForExpressionStack[nextForExpressionStackPos] = nextExpression;
-	}
-	
-	/*
-	 * Check if expression is complete, and if it is, process it.
-	 */
-	private void processExpression() {
-		while (expressionReady()) {
-			try {
-				// We've received all of the expressions for the expression, so process it.
-				int expType = ((InternalExpressionTypes) pop()).getValue();
-				switch (expType) {
-					case InternalExpressionTypes.CAST_EXPRESSION_VALUE:
-						pushCastToProxy((IProxyBeanType) pop());
-						break;
-					case InternalExpressionTypes.INSTANCEOF_EXPRESSION_VALUE:
-						pushInstanceofToProxy((IProxyBeanType) pop());
-						break;
-					case InternalExpressionTypes.PREFIX_EXPRESSION_VALUE:
-						pushPrefixToProxy((PrefixOperator)pop());
-						break;
-					case InternalExpressionTypes.INFIX_EXPRESSION_VALUE:
-						pushInfixToProxy((InfixOperator) pop(), (InternalInfixOperandType) pop());
-						break;
-					case InternalExpressionTypes.ARRAY_ACCESS_EXPRESSION_VALUE:
-						pushArrayAccessToProxy(((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.ARRAY_CREATION_EXPRESSION_VALUE:
-						pushArrayCreationToProxy((IProxyBeanType) pop(), ((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION_VALUE:
-						pushArrayInitializerToProxy((IProxyBeanType) pop(), ((Integer) pop()).intValue(), ((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.CLASS_INSTANCE_CREATION_EXPRESSION_VALUE:
-						pushClassInstanceCreationToProxy((IProxyBeanType) pop(), ((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.FIELD_ACCESS_EXPRESSION_VALUE:
-						pushFieldAccessToProxy(pop(), ((Boolean) pop()).booleanValue());
-						break;
-					case InternalExpressionTypes.METHOD_EXPRESSION_VALUE:
-						pushMethodInvocationToProxy(pop(), ((Boolean) pop()).booleanValue(), ((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.CONDITIONAL_EXPRESSION_VALUE:
-						pushConditionalToProxy((InternalConditionalOperandType) pop());
-						break;
-					case InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION_VALUE:
-						pushAssignmentToProxy((ExpressionProxy) pop());
-						break;
-					case InternalExpressionTypes.ASSIGNMENT_EXPRESSION_VALUE:
-						pushAssignmentToProxy();
-						break;
-					case InternalExpressionTypes.BLOCK_END_EXPRESSION_VALUE:
-						pushBlockEndToProxy(((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.TRY_END_EXPRESSION_VALUE:
-						pushTryEndToProxy(((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.THROW_EXPRESSION_VALUE:
-						pushThrowToProxy();
-						break;
-					case InternalExpressionTypes.IF_TEST_EXPRESSION_VALUE:
-						pushIfTestToProxy();
-						break;												
-					case InternalExpressionTypes.IF_ELSE_EXPRESSION_VALUE:
-						pushIfElseToProxy((InternalIfElseOperandType) pop());
-						break;	
-					case InternalExpressionTypes.SUBEXPRESSION_END_EXPRESSION_VALUE:
-						pushSubexpressionEndToProxy(((Integer) pop()).intValue());
-						break;						
-					default:
-						internalProcessUnknownExpressionType(expType);
-						break;
-				}
-			} catch (RuntimeException e) {
-				markInvalid();
-				throw e;
-			}
-		}
-	}
-	
-
-	private void internalProcessUnknownExpressionType(int expressionType) throws IllegalArgumentException {
-		if (!processUnknownExpressionType(expressionType))
-			throw new IllegalArgumentException();
-	}
-
-	/**
-	 * An unknown expression type was found in the processing of expression stack. Subclasses can override
-	 * to process new types of expressions. 
-	 * <p>
-	 * Overrides must return <code>true</code> if they processed the expression type. If they return <code>false</code>
-	 * it means they didn't understand it either and we should do default processing for unknow type.
-	 * @param expressionType
-	 * @return <code>true</code> if type was processed, <code>false</code> if not known by subclass either.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected boolean processUnknownExpressionType(int expressionType) {
-		return false;
-	}
-
-	/**
-	 * Create the expression.
-	 * 
-	 * @param registry
-	 * 
-	 * @since 1.0.0
-	 */
-	protected Expression(ProxyFactoryRegistry registry) {
-		this.registry = registry;
-		this.beanProxyFactory = this.registry.getBeanProxyFactory();
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#getRegistry()
-	 */
-	public ProxyFactoryRegistry getRegistry() {
-		return registry;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#invokeExpression()
-	 */
-	public final void invokeExpression() throws ThrowableProxy, IllegalStateException, NoExpressionValueException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION); // We are at the root.
-			popForExpression();	// Get rid of any intermediate roots.
-			checkForExpression(ForExpression.ROOTEXPRESSION);	// We should be at true root now. We don't have more than one intermediate root pushed in sequence.
-			List proxies = expressionProxies;
-			expressionProxies = null;
-			pushInvoke(processExpressionProxyCallbacks(proxies), proxies);
-		} finally {
-			markInvalid(); // Mark invalid so any new calls after this will fail.
-			close();
-		}
-	}
-		
-	/*
-	 * Process the expression proxy callbacks, if any.
-	 * @return the number of proxies that have callbacks.
-	 */
-	private int processExpressionProxyCallbacks(List proxies) {
-		if (proxies != null) {
-			// Strip list down to only those with callbacks and send on.
-			int proxiesWithCallbacks = 0;
-			for (ListIterator eps = proxies.listIterator(); eps.hasNext();) {
-				ExpressionProxy proxy = (ExpressionProxy) eps.next();
-				if (!proxy.hasListeners())
-					eps.set(null);	// Remove it from the list. No one cares.
-				else
-					proxiesWithCallbacks++;
-			}
-			return proxiesWithCallbacks;
-		}
-		return 0;
-	}
-	
-	/**
-	 * Called to validate this is a valid proxy for this expression. This could happen
-	 * if a proxy from another expression is sent to this expression. If the proxy
-	 * is a bean proxy or is an expression proxy for this expression, then this
-	 * just returns. Else it will throw the {@link IllegalArgumentException}. 
-	 * @param proxy
-	 * @throws IllegalArgumentException if the proxy is an expression proxy for another expression.
-	 * 
-	 * @since 1.1.0.1
-	 */
-	private void validateProxy(IProxy proxy) throws IllegalArgumentException {
-		if (proxy != null && (proxy.isExpressionProxy() && ((ExpressionProxy) proxy).getExpression() != this))
-			throw new IllegalArgumentException(ProxyMessages.Expression_InvalidProxy);
-	}
-		
-	/**
-	 * Called by subclass to fill in the value of an expression proxy. See {@link Expression#pullProxyValue(int, List))} for an example of who would call it.
-	 * @param ep
-	 * @param beanproxy
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireProxyResolved(ExpressionProxy ep, IBeanProxy beanproxy) {
-		ep.fireResolved(beanproxy);
-	}
-	
-	/**
-	 * Called by subclass to fire proxy was not resolved. See {@link Expression#pullProxyValue(int, List))} for an example of who would call it.
-	 * @param ep
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireProxyNotResolved(ExpressionProxy ep) {
-		ep.fireNotResolved();
-	}
-	
-	/**
-	 * Called by subclass to fire proxy resolved to a void return type. See {@link Expression#pullProxyValue(int, List))} for an example of who would call it.
-	 * @param ep
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireProxyVoid(ExpressionProxy ep) {
-		ep.fireVoidResolved();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#getExpressionValue()
-	 */
-	public final IBeanProxy getExpressionValue() throws ThrowableProxy, NoExpressionValueException, IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION); // We are at the root.
-			popForExpression();	// Get rid of any intermediate roots.
-			checkForExpression(ForExpression.ROOTEXPRESSION);	// We should be at true root now. We don't have more than one intermediate root pushed in sequence.
-			List proxies = expressionProxies;
-			expressionProxies = null;
-			return pullProxyValue(processExpressionProxyCallbacks(proxies), proxies); // Get the top value.
-		} finally {
-			markInvalid();	// Mark invalid so any new calls after this will fail. 
-			close();
-		}
-	}
-
-	
-	/**
-	 * Mark the list of proxies as not resolved. 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void markAllProxiesNotResolved(List proxies) {
-		if (proxies != null) {
-			for (ListIterator eps = proxies.listIterator(); eps.hasNext();) {
-				ExpressionProxy proxy = (ExpressionProxy) eps.next();
-				if (proxy != null && proxy.hasListeners())
-					fireProxyNotResolved(proxy);
-			}
-		}
-	}
-
-	private int blockNumber = -1;	// Current block number. This is always incrementing.
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createBlockBegin()
-	 */
-	public final int createBlockBegin() throws IllegalStateException {
-		try {
-			// Blocks are special, they can be anywhere at root, of could be the true or else clause of an if/else.
-			if (peekForExpression(ForExpression.ROOTEXPRESSION))
-				checkForExpression(ForExpression.ROOTEXPRESSION);
-			else if (peekForExpression(ForExpression.IF_TRUE))
-				checkForExpression(ForExpression.IF_TRUE);
-			else
-				checkForExpression(ForExpression.IF_ELSE);
-			
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(BLOCKEND_EXPRESSION);
-			pushForExpression(ForExpression.ROOTEXPRESSION);
-
-			pushBlockBeginToProxy(++blockNumber);
-			push(new Integer(blockNumber));
-			push(InternalExpressionTypes.BLOCK_END_EXPRESSION);
-			processExpression();
-			return blockNumber;
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createBlockBreak(int)
-	 */
-	public final void createBlockBreak(int blockNumber) throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			pushBlockBreakToProxy(blockNumber);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createBlockEnd()
-	 */
-	public final void createBlockEnd() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			popForExpression(); // Remove the root expression since block is done.
-			checkForExpression(BLOCKEND_EXPRESSION); // This needs to be next for it to be valid.
-			processExpression(); // Now let it handle the previously pushed end block, containing the block number being ended.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayAccess(int, int)
-	 */
-	public final void createArrayAccess(ForExpression forExpression, int indexCount) {
-		try {
-			checkForExpression(forExpression);
-			pushForExpression(PROCESS_EXPRESSION);
-			int i = indexCount;
-			while (i-- > 0)
-				pushForExpression(ForExpression.ARRAYACCESS_INDEX);
-			pushForExpression(ForExpression.ARRAYACCESS_ARRAY);
-
-			push(indexCount == 1 ? ARRAYACCESS_INDEX_1 : new Integer(indexCount));
-			push(InternalExpressionTypes.ARRAY_ACCESS_EXPRESSION);
-			processExpression(); // See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayCreation(int, java.lang.String, int)
-	 */
-	public final void createArrayCreation(ForExpression forExpression, String type, int dimensionExpressionCount)
-		throws IllegalStateException {
-		pushArrayCreation(forExpression, getProxyBeanType(type), dimensionExpressionCount);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayCreation(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
-	 */
-	public final void createArrayCreation(ForExpression forExpression, IProxyBeanType type, int dimensionExpressionCount)
-		throws IllegalStateException, IllegalArgumentException {
-		pushArrayCreation(forExpression, type, dimensionExpressionCount);
-	}
-
-	private void pushArrayCreation(ForExpression forExpression, IProxyBeanType type, int dimensionExpressionCount) throws IllegalStateException, IllegalArgumentException {
-		try {
-			checkForExpression(forExpression);
-			validateProxy(type);
-			switch (dimensionExpressionCount) {
-				case 0:
-					push(ARRAY_CREATION_DIMENSION_0);
-					break;
-				case 1:
-					push(ARRAY_CREATION_DIMENSION_1);
-					break;
-				default:
-					push(new Integer(dimensionExpressionCount));
-					break;
-			}
-			push(type);
-			push(InternalExpressionTypes.ARRAY_CREATION_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			if (dimensionExpressionCount == 0)
-				pushForExpression(ARRAY_INITIALIZER);
-			else {
-				while (dimensionExpressionCount-- > 0)
-					pushForExpression(ForExpression.ARRAYCREATION_DIMENSION);
-			}
-			processExpression(); // See if previous expression is ready for processing.		
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayInitializer(int)
-	 */
-	public final void createArrayInitializer(int expressionCount) throws IllegalStateException {
-		try {
-			// This is special, we could be waiting for an array initializer or an array initializer expression.
-			// We will peek to see what it is and handle it.
-			if (peekForExpression(ARRAY_INITIALIZER))
-				checkForExpression(ARRAY_INITIALIZER);
-			else
-				checkForExpression(ForExpression.ARRAYINITIALIZER_EXPRESSION);
-
-			// At this point in time that stack may either have:
-			// array_type, array_creation
-			// strip_count, array_type, array_initializer
-			// So we can get the array type from peek(2), and get the command type from peek(1).
-			// Then if the command type is array_creation, strip_count will be inited to 0, while
-			// else it will be inited to peek(3). From that we can increment the strip_count to
-			// use for this initializer.
-			//
-			// We need to peek here because we will be adding various pushes to the stack and we
-			// need to get the info while it is still at the top of the stack.
-			Object arrayType = peek(2); 
-			int stripCount = 0;
-			if (peek(1) == InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION)
-				stripCount = ((Integer) peek(3)).intValue();
-
-			switch (expressionCount) {
-				case 0:
-					push(ARRAYINITIALIZER_COUNT_0);
-					break;
-				case 1:
-					push(ARRAYINITIALIZER_COUNT_1);
-					break;
-				case 2:
-					push(ARRAYINITIALIZER_COUNT_2);
-					break;
-				default:
-					push(new Integer(expressionCount));
-					break;
-			}
-
-			if (arrayType instanceof String) {
-				String at = (String) arrayType;
-				int i = at.lastIndexOf("[]"); //$NON-NLS-1$
-				if (i == -1)
-					throw new IllegalArgumentException(MessageFormat.format(
-							ProxyMessages.Expression_ArrayTypeNotAnArray_EXC_, new Object[] { arrayType})); 
-				arrayType = getProxyBeanType(at);
-			} else if (!(arrayType instanceof IProxyBeanType)) {
-				throw new IllegalArgumentException(MessageFormat.format(
-						ProxyMessages.Expression_ArrayTypeNotAnArray_EXC_, new Object[] { arrayType})); 
-			}
-			push(new Integer(++stripCount));
-			push(arrayType);
-			push(InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			while (expressionCount-- > 0)
-				pushForExpression(ForExpression.ARRAYINITIALIZER_EXPRESSION);
-
-			processExpression(); 
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
- 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createCastExpression(int, java.lang.String)
-	 * A cast expression has one nested expression.
-	 */
-	public final void createCastExpression(ForExpression forExpression, String type) throws IllegalStateException {
-		pushCast(forExpression, getProxyBeanType(type)); // Push this onto the local stack to wait for completion.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createCastExpression(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	public final void createCastExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException {
-		pushCast(forExpression, type); // Push this onto the local stack to wait for completion.
-	}
-	
-	/*
-	 * Push for a cast.
-	 */
-	private void pushCast(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException {
-		try {
-			checkForExpression(forExpression);
-			validateProxy(type);
-			push(type);
-			push(InternalExpressionTypes.CAST_EXPRESSION);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.CAST_EXPRESSION); // The next expression must be for the cast expression.
-			processExpression(); 
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createClassInstanceCreation(int, java.lang.String, int)
-	 */
-	public final void createClassInstanceCreation(ForExpression forExpression, String type, int argumentCount)
-		throws IllegalStateException {
-		pushClassInstanceCreation(forExpression, getProxyBeanType(type), argumentCount);	// Push this onto the local stack to wait for completion.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createClassInstanceCreation(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
-	 */
-	public final void createClassInstanceCreation(ForExpression forExpression, IProxyBeanType type, int argumentCount)
-		throws IllegalStateException, IllegalArgumentException {
-		pushClassInstanceCreation(forExpression, type, argumentCount);	// Push this onto the local stack to wait for completion.
-	}
-
-	/*
-	 * Push for a class instance creation
-	 */
-	private void pushClassInstanceCreation(ForExpression forExpression, IProxyBeanType type, int argumentCount) throws IllegalStateException, IllegalArgumentException {
-		try {
-			checkForExpression(forExpression);
-			validateProxy(type);
-			switch (argumentCount) {
-				case 0:
-					push(CLASS_INSTANCE_CREATION_ARGUMENTS_0);
-					break;
-				case 1:
-					push(CLASS_INSTANCE_CREATION_ARGUMENTS_1);
-					break;
-				default:
-					push(new Integer(argumentCount));
-					break;
-			}
-			push(type);
-			push(InternalExpressionTypes.CLASS_INSTANCE_CREATION_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			while (argumentCount-- > 0)
-				pushForExpression(ForExpression.CLASSINSTANCECREATION_ARGUMENT);
-			processExpression(); // See if previous expression is ready for processing.						
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createConditionalExpression(int)
-	 */
-	public final void createConditionalExpression(ForExpression forExpression) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.CONDITIONAL_FALSE);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.CONDITIONAL_TRUE);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.CONDITIONAL_CONDITION);
-
-			push(InternalConditionalOperandType.CONDITIONAL_FALSE);
-			push(InternalExpressionTypes.CONDITIONAL_EXPRESSION);
-			push(InternalConditionalOperandType.CONDITIONAL_TRUE);
-			push(InternalExpressionTypes.CONDITIONAL_EXPRESSION);
-			push(InternalConditionalOperandType.CONDITIONAL_TEST);
-			push(InternalExpressionTypes.CONDITIONAL_EXPRESSION);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createFieldAccess(int, java.lang.String, boolean)
-	 */
-	public final void createFieldAccess(ForExpression forExpression, String fieldName, boolean hasReceiver) throws IllegalStateException, IllegalArgumentException {
-		try {
-			// Only for string fieldnames is this invalid when no receiver because no way to determine receiver. (Don't handle implicit "this" yet for fields). 
-			// For the accessor that takes a IFieldProxy we can get away with no receiver because the field proxy can determine if static or not, and if not
-			// static it will fail at evaluation time.
-			if (!hasReceiver)
-				throw new IllegalArgumentException(MessageFormat.format(
-						ProxyMessages.Expression_CannotHandleNoReceiveOnFieldAccess_EXC_, new Object[] { fieldName})); 
-			pushFieldAccess(forExpression, fieldName, hasReceiver);
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createIfElse(boolean)
-	 */
-	public final void createIfElse(boolean hasElseClause) throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			
-			pushForExpression(PROCESS_EXPRESSION);
-			if (hasElseClause) {
-				pushForExpression(ForExpression.IF_ELSE);
-			}
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.IF_TRUE);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.IF_CONDITION);
-
-			// We still push an else clause so that we know when finished. We don't have a pushForExpression for it because there
-			// won't be any. But the else clause processing will be on the push stack so that we can clean up when end of if stmt occurs.
-			push(InternalIfElseOperandType.ELSE_CLAUSE);	
-			push(InternalExpressionTypes.IF_ELSE_EXPRESSION);
-			
-			push(InternalIfElseOperandType.TRUE_CLAUSE);
-			push(InternalExpressionTypes.IF_ELSE_EXPRESSION);
-			push(InternalExpressionTypes.IF_TEST_EXPRESSION);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 * Push the field access.
-	 * @param forExpression
-	 * @param field String if field name, or IProxyField.
-	 * @param hasReceiver
-	 * @throws IllegalAccessException
-	 * 
-	 * @since 1.1.0
-	 */
-	private void pushFieldAccess(ForExpression forExpression, Object field, boolean hasReceiver) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			push(hasReceiver ? Boolean.TRUE : Boolean.FALSE); // We have a receiver
-			push(field);
-			push(InternalExpressionTypes.FIELD_ACCESS_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			if (hasReceiver)
-				pushForExpression(ForExpression.FIELD_RECEIVER);
-			processExpression(); // See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createInfixExpression(int, int, int)
-	 */
-	public final void createInfixExpression(ForExpression forExpression, InfixOperator operator, int extendedOperandCount) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			push(InternalInfixOperandType.INFIX_LAST_OPERAND);
-			push(operator);
-			push(InternalExpressionTypes.INFIX_EXPRESSION);
-			int i = extendedOperandCount;
-			while (i-- > 0) {
-				push(InternalInfixOperandType.INFIX_OTHER_OPERAND);
-				push(operator);
-				push(InternalExpressionTypes.INFIX_EXPRESSION);
-			}
-			push(InternalInfixOperandType.INFIX_LEFT_OPERAND);
-			push(operator);
-			push(InternalExpressionTypes.INFIX_EXPRESSION);
-
-			i = extendedOperandCount;
-			while (i-- > 0) {
-				pushForExpression(PROCESS_EXPRESSION);
-				pushForExpression(ForExpression.INFIX_EXTENDED);
-			}
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.INFIX_RIGHT);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.INFIX_LEFT);
-			processExpression(); // See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createInstanceofExpression(int, java.lang.String)
-	 */
-	public final void createInstanceofExpression(ForExpression forExpression, String type) throws IllegalStateException {
-		pushInstanceof(forExpression, getProxyBeanType(type));	// Push this onto the local stack to wait for completion.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createInstanceofExpression(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	public final void createInstanceofExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException {
-		pushInstanceof(forExpression, type);	// Push this onto the local stack to wait for completion.
-	}
-	
-	/*
-	 * Push for a cast.
-	 */
-	private void pushInstanceof(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException {
-		try {
-			checkForExpression(forExpression);
-			validateProxy(type);
-			push(type);
-			push(InternalExpressionTypes.INSTANCEOF_EXPRESSION);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.INSTANCEOF_VALUE); // The next expression must be for the instance of expression.
-			processExpression(); 
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createMethodInvocation(int, java.lang.String, boolean, int)
-	 */
-	public final void createMethodInvocation(ForExpression forExpression, String name, boolean hasReceiver, int argumentCount)
-		throws IllegalStateException, IllegalArgumentException {
-		try {
-			// Only for string methodnames is this invalid when no receiver because no way to determine receiver. (Don't handle implicit "this" yet for methods). 
-			// For the accessor that takes a IFieldProxy we can get away with no receiver because the field proxy can determine if static or not, and if not
-			// static it will fail at evaluation time.
-			if (!hasReceiver)
-				throw new IllegalArgumentException(MessageFormat.format(
-						ProxyMessages.Expression_MethodsNeedReceiver_EXC_, new Object[] { name})); 
-
-			pushMethodInvocation(forExpression, name, hasReceiver, argumentCount);
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/**
-	 * @param forExpression
-	 * @param method String for method name, IMethodProxy otherwise.
-	 * @param hasReceiver 
-	 * @param argumentCount
-	 * @throws ThrowableProxy
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.1.0
-	 */
-	private void pushMethodInvocation(ForExpression forExpression, Object method, boolean hasReceiver, int argumentCount) throws IllegalArgumentException, IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			switch (argumentCount) {
-				case 0:
-					push(METHOD_ARGUMENTS_0);
-					break;
-				case 1:
-					push(METHOD_ARGUMENTS_1);
-					break;
-				default:
-					push(new Integer(argumentCount));
-					break;
-			}
-			push(hasReceiver ? Boolean.TRUE : Boolean.FALSE);
-			push(method);
-			push(InternalExpressionTypes.METHOD_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			while (argumentCount-- > 0)
-				pushForExpression(ForExpression.METHOD_ARGUMENT);
-			if (hasReceiver)
-				pushForExpression(ForExpression.METHOD_RECEIVER);
-			processExpression(); // See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrefixExpression(int, org.eclipse.jem.internal.proxy.initParser.tree.PrefixOperator)
-	 */
-	public final void createPrefixExpression(ForExpression forExpression, PrefixOperator operator) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			push(operator);
-			push(InternalExpressionTypes.PREFIX_EXPRESSION);
-			
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.PREFIX_OPERAND);
-			processExpression();	// See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/**
-	 * Create a new instance using the initialization string. The result must be compatible with the
-	 * given type. This is not on the IExpression interface because it is not for use of regular
-	 * customers. It is here for the allocation processer to create entries that are just strings.
-	 * <p>
-	 * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
-	 * 
-	 * @param forExpression
-	 * @param initializationString
-	 * @param type
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void createNewInstance(ForExpression forExpression, String initializationString, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException{
-		try {
-			checkForExpression(forExpression);
-			validateProxy(type);
-			pushNewInstanceToProxy(initializationString, type);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createNull(int)
-	 */
-	public final void createNull(ForExpression forExpression) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(null);
-			processExpression();	// See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTypeLiteral(int, java.lang.String)
-	 */
-	public final void createTypeLiteral(ForExpression forExpression, String type) throws IllegalStateException {
-		createProxyExpression(forExpression, getProxyBeanType(type));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTypeReceiver(java.lang.String)
-	 */
-	public final void createTypeReceiver(String type) throws IllegalStateException {
-		pushTypeReceiver(getProxyBeanType(type));
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTypeReceiver(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	public final void createTypeReceiver(IProxyBeanType type) throws IllegalStateException, IllegalArgumentException {
-		validateProxy(type);
-		pushTypeReceiver(type);
-	}
-
-	/*
-	 * Push for a type receiver.
-	 * @param type
-	 * 
-	 * @since 1.0.0
-	 */
-	private void pushTypeReceiver(IProxyBeanType type) throws IllegalStateException {
-		try {
-			// This is special because type receivers are only valid as the receiver for a field access or a method access.
-			// Since each has a different forExpression we need to test for one or the other. It doesn't make any difference
-			// which one it is, but it must be one or the other.
-			if (peekForExpression(ForExpression.FIELD_RECEIVER))
-				checkForExpression(ForExpression.FIELD_RECEIVER);
-			else
-				checkForExpression(ForExpression.METHOD_RECEIVER);
-			
-			pushTypeReceiverToProxy(type);
-			processExpression();	// See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}			
-	}
-	
-	/*
-	 * For all of the primitive types we will be creating a IBeanProxy for them. That is because that
-	 * would be the expected result of the expression, and no need to get the other side involved.
-	 */
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, boolean)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, boolean value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, char)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, char value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, byte)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, byte value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, double)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, double value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, float)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, float value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, int)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, int value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, long)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, long value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, short)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, short value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createStringLiteral(int, java.lang.String)
-	 */
-	public final void createStringLiteral(ForExpression forExpression, String value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createProxyExpression(int, org.eclipse.jem.internal.proxy.core.IProxy)
-	 */
-	public final void createProxyExpression(ForExpression forExpression, IProxy proxy) throws IllegalStateException, IllegalArgumentException {
-		try {
-			checkForExpression(forExpression);
-			validateProxy(proxy);
-			pushToProxy(proxy);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createAssignmentExpression(int)
-	 */
-	public final void createAssignmentExpression(ForExpression forExpression) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			push(InternalExpressionTypes.ASSIGNMENT_EXPRESSION);
-			
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.ASSIGNMENT_RIGHT);
-			pushForExpression(ForExpression.ASSIGNMENT_LEFT);
-			processExpression();	// See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createAssignmentExpression(int)
-	 */
-	public final ExpressionProxy createProxyAssignmentExpression(ForExpression forExpression) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			ExpressionProxy proxy = allocateExpressionProxy(NORMAL_EXPRESSION_PROXY);
-			push(proxy);
-			push(InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.ASSIGNMENT_RIGHT);
-			processExpression(); // See if previous expression is ready for processing.
-			return proxy;
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/**
-	 * Called by registries to create an expression proxy for a bean type. It is not in the interface because it should
-	 * only be called by the proxy registry to create an expression proxy. It shouldn't be called outside of the registries
-	 * because there may already exist in the registry the true IBeanTypeProxy, and that one should be used instead.
-	 * <p>
-	 * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
-	 * 
-	 * @param typeName
-	 * @return expression proxy that is hooked up and will notify when resolved. It can be called at any time. The resolution will occur at this point in the
-	 * execution stack, but since it will not interfere with the stack this is OK, other than it could throw a ClassNotFoundException on the
-	 * execution.
-	 * 
-	 * @since 1.1.0
-	 */
-	public final IProxyBeanType createBeanTypeExpressionProxy(String typeName) {
-		IBeanTypeExpressionProxy proxy = (IBeanTypeExpressionProxy) allocateExpressionProxy(BEANTYPE_EXPRESSION_PROXY);
-		proxy.setTypeName(typeName);
-		// This can be sent at any time. It doesn't matter what is on the expression stack. It will be sent to be resolved immediately.
-		pushBeanTypeToProxy(proxy);
-		return proxy;
-	}
-
-	/**
-	 * Called by registries to create an expression proxy for a method. It is not in the interface because it should
-	 * only be called by the proxy registry to create an expression proxy. It shouldn't be called outside of the registries
-	 * because there may already exist in the registry the true IMethodProxy, and that one should be used instead.
-	 * <p>
-	 * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
-	 * 
-	 * @param declaringType
-	 * @param methodName
-	 * @param parameterTypes parameter types or <code>null</code> if no parameter types.
-	 * @return
-	 * 
-	 * @throws IllegalArgumentException
-	 * @since 1.1.0
-	 */
-	public final IProxyMethod createMethodExpressionProxy(IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes) throws IllegalArgumentException{
-		validateProxy(declaringType);
-		if (parameterTypes != null && parameterTypes.length > 0) {
-			for (int i = 0; i < parameterTypes.length; i++) {
-				validateProxy(parameterTypes[i]);
-			}
-		}
-		ExpressionProxy proxy = allocateExpressionProxy(METHOD_EXPRESSION_PROXY);
-		// This can be sent at any time. It doesn't matter what is on the expression stack. It will be sent to be resolved immediately.
-		pushMethodToProxy(proxy, declaringType, methodName, parameterTypes);
-		return (IProxyMethod) proxy;
-	}
-	
-	/**
-	 * Called by registries to create an expression proxy for a field. It is not in the interface because it should
-	 * only be called by the proxy registry to create an expression proxy. It shouldn't be called outside of the registries
-	 * because there may already exist in the registry the true IFieldProxy, and that one should be used instead.
-	 * <p>
-	 * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
-	 * 
-	 * @param declaringType
-	 * @param fieldName
-	 * @return
-	 * 
-	 * @throws IllegalArgumentException
-	 * @since 1.1.0
-	 */
-	public final IProxyField createFieldExpressionProxy(IProxyBeanType declaringType, String fieldName) throws IllegalArgumentException {
-		validateProxy(declaringType);
-		ExpressionProxy proxy = allocateExpressionProxy(FIELD_EXPRESSION_PROXY);
-		// This can be sent at any time. It doesn't matter what is on the expression stack. It will be sent to be resolved immediately.
-		pushFieldToProxy(proxy, declaringType, fieldName);
-		return (IProxyField) proxy;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createProxyReassignmentExpression(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.ExpressionProxy)
-	 */
-	public final void createProxyReassignmentExpression(ForExpression forExpression, ExpressionProxy proxy) throws IllegalStateException, IllegalArgumentException {
-		try {
-			checkForExpression(forExpression);
-			if (!proxy.isValidForReassignment())
-				throw new IllegalArgumentException(MessageFormat.format(ProxyMessages.Expression_CreateProxyReassignmentExpression_InvalidForReassignment_EXC_, new Object[]{proxy.toString()})); 
-			push(proxy);
-			push(InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.ASSIGNMENT_RIGHT);
-			processExpression(); // See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-		
-	protected static final int NORMAL_EXPRESSION_PROXY = 0;
-	protected static final int BEANTYPE_EXPRESSION_PROXY = 1;
-	protected static final int METHOD_EXPRESSION_PROXY = 2;
-	protected static final int FIELD_EXPRESSION_PROXY = 3;
-	/**
-	 * Allocate a new ExpressionProxy
-	 * @return new ExpressionProxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final ExpressionProxy allocateExpressionProxy(int proxyType) {
-		if (expressionProxies == null)
-			expressionProxies = new ArrayList();
-		// It is very important that this always creates a proxy id that is greater than all previous. This is
-		// so that it can be assured that proxies will be resolved in order of creation.
-		// Currently this is done here by using expressionProxies.size().
-		ExpressionProxy proxy = createExpressionProxy(proxyType, expressionProxies.size());
-		expressionProxies.add(proxy);
-		return proxy;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createFieldAccess(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyField, boolean)
-	 */
-	public final void createFieldAccess(ForExpression forExpression, IProxyField fieldProxy, boolean hasReceiver) throws IllegalStateException, IllegalArgumentException {
-		validateProxy(fieldProxy);
-		pushFieldAccess(forExpression, fieldProxy, hasReceiver);
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createMethodInvocation(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyMethod, boolean, int)
-	 */
-	public final void createMethodInvocation(ForExpression forExpression, IProxyMethod methodProxy, boolean hasReceiver, int argumentCount) throws IllegalArgumentException,
-			IllegalStateException {
-		validateProxy(methodProxy);
-		pushMethodInvocation(forExpression, methodProxy, hasReceiver, argumentCount);
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createSimpleFieldAccess(org.eclipse.jem.internal.proxy.core.IProxyField, org.eclipse.jem.internal.proxy.core.IProxy)
-	 */
-	public final ExpressionProxy createSimpleFieldAccess(IProxyField field, IProxy receiver) throws IllegalStateException, IllegalArgumentException {
-		validateProxy(field);
-		validateProxy(receiver);
-		ExpressionProxy result = createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
-		createFieldAccess(ForExpression.ASSIGNMENT_RIGHT, field, receiver != null);
-		if (receiver != null)
-			createProxyExpression(ForExpression.FIELD_RECEIVER, receiver);
-		return result;
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createSimpleFieldSet(org.eclipse.jem.internal.proxy.core.IProxyField, org.eclipse.jem.internal.proxy.core.IProxy, org.eclipse.jem.internal.proxy.core.IProxy, boolean)
-	 */
-	public final ExpressionProxy createSimpleFieldSet(IProxyField field, IProxy receiver, IProxy value, boolean wantResult) throws IllegalStateException, IllegalArgumentException {
-		validateProxy(field);
-		validateProxy(receiver);
-		ExpressionProxy result = null;
-		ForExpression forExpression = ForExpression.ROOTEXPRESSION;
-		if (wantResult) {
-			result = createProxyAssignmentExpression(forExpression);
-			forExpression = ForExpression.ASSIGNMENT_RIGHT;			
-		}		
-		createAssignmentExpression(forExpression);
-		createFieldAccess(ForExpression.ASSIGNMENT_LEFT, field, receiver != null);
-		if (receiver != null)
-			createProxyExpression(ForExpression.FIELD_RECEIVER, receiver);
-		createProxyExpression(ForExpression.ASSIGNMENT_RIGHT, value);
-		return result;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createSimpleMethodInvoke(org.eclipse.jem.internal.proxy.core.IMethodProxy, org.eclipse.jem.internal.proxy.core.IProxy, org.eclipse.jem.internal.proxy.core.IProxy[], boolean)
-	 */
-	public final ExpressionProxy createSimpleMethodInvoke(IProxyMethod method, IProxy receiver, IProxy[] arguments, boolean wantResult)
-			throws IllegalStateException, IllegalArgumentException {
-		validateProxy(method);
-		validateProxy(receiver);
-		if (arguments != null && arguments.length > 0) {
-			for (int i = 0; i < arguments.length; i++) {
-				validateProxy(arguments[i]);
-			}
-		}
-		ForExpression nextExpression = ForExpression.ROOTEXPRESSION;
-		ExpressionProxy result = null;
-		if (wantResult) {
-			result = createProxyAssignmentExpression(nextExpression);
-			nextExpression = ForExpression.ASSIGNMENT_RIGHT;
-		}
-		createMethodInvocation(nextExpression, method, receiver != null, arguments != null ? arguments.length : 0);
-		if (receiver != null)
-			createProxyExpression(ForExpression.METHOD_RECEIVER, receiver);
-		if (arguments != null) {
-			for (int i = 0; i < arguments.length; i++) {
-				createProxyExpression(ForExpression.METHOD_ARGUMENT, arguments[i]);
-			}
-		}
-		return result;
-	}
-	
-	private int subexpressionNumber = -1;	// Current subexpression number. This is always incrementing.
-	
-	public void createSubexpression() throws IllegalStateException {
-		try {
-			// Subexpressions are special, they can be anywhere.
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(SUBEXPRESSIONEND_EXPRESSION);
-			pushForExpression(ForExpression.ROOTEXPRESSION);
-
-			pushSubexpressionBeginToProxy(++subexpressionNumber);
-			push(new Integer(subexpressionNumber));
-			push(InternalExpressionTypes.SUBEXPRESSION_END_EXPRESSION);
-			processExpression();
-			return;
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	public void createSubexpressionEnd() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			popForExpression(); // Remove the root expression since block is done.
-			checkForExpression(SUBEXPRESSIONEND_EXPRESSION); // This needs to be next for it to be valid.
-			processExpression(); // Now let it handle the previously pushed end subexpression, containing the subexpression number being ended.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	
-	private int tryNumber = -1;	// Current try number. This is always incrementing.
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTry()
-	 */
-	public final void createTry() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			pushForExpression(PROCESS_EXPRESSION); // Set up so that when reached we can process the TRY_END that we've pushed data for later in this method.
-			pushForExpression(TRYEND_EXPRESSION); // Must get a try end before we can process it.
-			pushForExpression(TRYCATCH_EXPRESSION); // Must get a catch/finally clause (or try end, which knows how to handle this).
-			pushForExpression(ForExpression.ROOTEXPRESSION); // Expecting root expressions for the try clause.
-
-			pushTryBeginToProxy(++tryNumber);
-			push(new Integer(tryNumber));
-			push(InternalExpressionTypes.TRY_END_EXPRESSION);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryCatchClause(org.eclipse.jem.internal.proxy.core.IProxyBeanType, boolean)
-	 */
-	public final ExpressionProxy createTryCatchClause(IProxyBeanType exceptionType, boolean wantExceptionReturned)
-			throws IllegalStateException, IllegalArgumentException {
-		validateProxy(exceptionType);
-		return pushTryCatch(exceptionType, wantExceptionReturned);
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryCatchClause(java.lang.String, boolean)
-	 */
-	public final ExpressionProxy createTryCatchClause(String exceptionType, boolean wantExceptionReturned)
-		throws IllegalStateException {
-		return pushTryCatch(getProxyBeanType(exceptionType), wantExceptionReturned);
-	}
-
-	/**
-	 * @param exceptionType
-	 * @param wantExceptionReturned
-	 * @return
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	private ExpressionProxy pushTryCatch(IProxyBeanType exceptionType, boolean wantExceptionReturned) throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			popForExpression(); // Remove the root expression since try or previous catch clause is done.
-			checkForExpression(TRYCATCH_EXPRESSION); // This needs to be next for it to be valid.
-			pushForExpression(TRYCATCH_EXPRESSION); // Set up for a following catch/finally clause.
-			pushForExpression(ForExpression.ROOTEXPRESSION); // Root expressions are next for the catch clause.
-
-			int tryNumber = ((Integer) peek(2)).intValue(); // Get the try#. It should be in this place on the stack.
-
-			ExpressionProxy ep = null;
-			if (wantExceptionReturned)
-				ep = allocateExpressionProxy(NORMAL_EXPRESSION_PROXY);
-			pushTryCatchClauseToProxy(tryNumber, exceptionType, ep);
-
-			processExpression();
-			return ep;
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryEnd()
-	 */
-	public final void createTryEnd() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			popForExpression(); // Remove the root expression since try or previous catch clause is done.
-			if (peekForExpression(TRYCATCH_EXPRESSION))
-				checkForExpression(TRYCATCH_EXPRESSION); // This may of been next if no finally clause was added. If a finally clause was added this would not be here.
-			checkForExpression(TRYEND_EXPRESSION); // And this needs to be after that to be valid.
-
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryFinallyClause()
-	 */
-	public final void createTryFinallyClause() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			popForExpression(); // Remove the root expression since try or previous catch clause is done.
-			checkForExpression(TRYCATCH_EXPRESSION); // This needs to be next for it to be valid.
-			pushForExpression(ForExpression.ROOTEXPRESSION); // Root expressions are next for the finally clause.
-
-			int tryNumber = ((Integer) peek(2)).intValue(); // Get the try#. It should be in this place on the stack.
-
-			pushTryFinallyClauseToProxy(tryNumber);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createRethrow()
-	 */
-	public final void createRethrow() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			popForExpression(); // Remove the root expression since try or previous catch clause is done.
-			checkForExpression(TRYCATCH_EXPRESSION); // This needs to be next for it to be valid.
-			// It is in a valid state, so put the catch and root back on so that things work correctly.
-			pushForExpression(TRYCATCH_EXPRESSION);
-			pushForExpression(ForExpression.ROOTEXPRESSION); 
-
-			int tryNumber = ((Integer) peek(2)).intValue(); // Get the try#. It should be in this place on the stack.
-
-			pushRethrowToProxy(tryNumber);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createThrow()
-	 */
-	public final void createThrow() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			push(InternalExpressionTypes.THROW_EXPRESSION);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.THROW_OPERAND); // The next expression must be for the throw value.
-			processExpression(); 
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	
-	public final int mark() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			++highestMarkID;
-			currentMarkEntry = new MarkEntry();
-			currentMarkEntry.markID = highestMarkID;
-			currentMarkEntry.controlStackPos = controlStack.size() - 1;
-			currentMarkEntry.nextExpressionStackPos = nextForExpressionStackPos;
-			currentMarkEntry.expressionProxiesPos = expressionProxies != null ? expressionProxies.size() - 1 : -1;
-			if (markEntries == null)
-				markEntries = new ArrayList(5);
-			markEntries.add(currentMarkEntry);
-			pushMarkToProxy(highestMarkID);
-			return highestMarkID;
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	public void endMark(int markNumber) throws IllegalStateException {
-		if (isValid()) {
-			// Can only do a valid end mark if we are at root. If not at root, we fall through and treat as invalid.
-			if (peekForExpression(ForExpression.ROOTEXPRESSION)) {
-				checkForExpression(ForExpression.ROOTEXPRESSION);	// Now remove it if it should be removed. 
-				// If the current mark number is not the same as the incoming mark number, we have improper nesting.
-				if (currentMarkEntry == null || currentMarkEntry.markID != markNumber)
-					throwInvalidMarkNesting();	// We have improper nesting.
-				// We are popping the current mark. Since we are valid, just move up one in the mark stack.
-				MarkEntry me = (MarkEntry) markEntries.remove(markEntries.size()-1);
-				if (!markEntries.isEmpty())
-					currentMarkEntry = (MarkEntry) markEntries.get(markEntries.size()-1);
-				else
-					currentMarkEntry = null;
-				pushEndmarkToProxy(markNumber, false);
-				if (me.controlStackPos != controlStack.size()-1 || me.nextExpressionStackPos != nextForExpressionStackPos)
-					throwInvalidMarkNesting();	// The stacks should be back to the same size at this point for a valid end mark.
-				return;
-			}
-		} 
-		
-		// It was invalid, or became invalid.
-		if (markEntries == null)
-			throwInvalidMarkNesting();	// We have no marks, so this is an invalid end mark.
-		
-		// We are invalid, need to pop to the given markNumber.
-		// Starting from the end we search back to find the entry for the given mark number. We do it
-		// from the end because it is more likely to be closer to the end than to the beginning.
-		for (int i = markEntries.size()-1; i >=0; i--) {
-			MarkEntry me = (MarkEntry) markEntries.get(i);
-			if (me.markID == markNumber) {
-				// Found it.
-				// Trim the control stack down to the size at time of mark. (No easy way to do this other than repeated remove's.
-				// We do it backwards to eliminate repeated shuffling of entries.
-				for (int j = controlStack.size()-1; j > me.controlStackPos; j--) {
-					controlStack.remove(j);
-				}
-				
-				// Trim the expression stack. This is simple, just reset the next entry pointer.
-				nextForExpressionStackPos = me.nextExpressionStackPos;
-				
-				if (expressionProxies != null) {
-					// Now we need to mark all of the expression proxies that occured after the mark as
-					// not resolved (since someone may be listening), and remove them, and reuse the proxies.
-					for (int j = expressionProxies.size()-1; j > me.expressionProxiesPos; j--) {
-						ExpressionProxy proxy = (ExpressionProxy) expressionProxies.remove(j);
-						if (proxy != null && proxy.hasListeners())
-							fireProxyNotResolved(proxy);
-					}
-				}
-				
-				// Now that we know it is valid, we want to remove all of the mark entries above it in the stack
-				// since those are now invalid. We couldn't remove them as we were searching for the entry because
-				// if the entry wasn't found we didn't want to wipe out the probably valid ones.
-				for (int j = markEntries.size()-1; j >= i; j--) {
-					markEntries.remove(j);
-				}
-				
-				if (!markEntries.isEmpty())
-					currentMarkEntry = (MarkEntry) markEntries.get(markEntries.size()-1);
-				else
-					currentMarkEntry = null;					
-				pushEndmarkToProxy(markNumber, true);
-				expressionValid = true;
-				return;
-			} 
-		}
-		throwInvalidMarkNesting();	// The mark number wasn't found, so this is an invalid end mark.
-	}
-	
-	/**
-	 * Begin the transfer of the expression to another thread.
-	 * <p>
-	 * This is used when the expression needs to continue to be built up, but it needs
-	 * to be done on a different thread. The reason for doing something special other
-	 * than just using it on the other thread is that some proxy registries connections are
-	 * tied through the thread. If you switched to another thread the connections would not
-	 * be properly set up.
-	 * This is not on the IExpression interface because even though it is API, it is tricky
-	 * to use and so not exposed to everyone. Users can legitimately cast to Expression and 
-	 * use this as API for advanced use. 
-	 * <p>
-	 * This is used to begin the transfer. It puts it into a state ready for the transfer. Calling this
-	 * method will cause a synchronization of the expression up to the current level. This means
-	 * that it will not return until the expression has been completely processed in the proxy registry
-	 * up to this point. Typically the connection is a pipe where the instructions are just pushed onto
-	 * it and the caller is not held up waiting for the registry to process it. 
-	 * <p>
-	 * Then when the other thread is done, it will call beginTransferThread itself to signal that it is done
-	 * and that the old thread can pick it up. Then the old thread will call transferThread to pick up processing.
-	 * <p>
-	 * It will be:
-	 * <pre><code>
-	 *   ... expression stuff ...
-	 *   expression.beginTransferThread()
-	 *   ... do what is necessary to get to the other thread ...
-	 *   ... on other thread:
-	 *   expression.transferThread();
-	 *   try {
-	 *     ... do your expression stuff on this thread ...
-	 *   } finally {
-	 *     expression.beginTransferThread(); // This is to return it to old thread.
-	 *   }
-	 *   ... tell old thread to pick up ...
-	 *   ... back on old thread:
-	 *   expression.transferThread();
-	 *   ... do more expression stuff ...
-	 *   expression.invokeExpression();
-	 * </code></pre>
-	 * 
-	 * @throws IllegalStateException
-	 * @throws ThrowableProxy Thrown if there was an exception with the remote vm during this request.
-	 * @since 1.1.0
-	 */
-	public final void beginTransferThread() throws IllegalStateException, ThrowableProxy {
-		try {
-			pushForExpression(THREADTRANSFER_EXPRESSION);
-			pushBeginTransferThreadToProxy();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-		
-	/**
-	 * Transfer the expression to the current thread.
-	 * <p>
-	 * This is called to actually transfer to the current thread. It must be the next call against
-	 * the expression after the beginTransferThread, but on the new thread.
-	 * <p>
-	 * This is not on the IExpression interface because even though it is API, it is tricky
-	 * to use and so not exposed to everyone. Users can legitimately cast to Expression and 
-	 * use this as API for advanced use. 
-	 * @see Expression#beginTransferThread() for a full explanation.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void transferThread() throws IllegalStateException {
-		try {
-			checkForExpression(THREADTRANSFER_EXPRESSION);
-			pushTransferThreadToProxy();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}		
-	}
-	
-	
-	/**
-	 * Get the IProxyBeanType for the type string sent in.
-	 * @param type
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected IProxyBeanType getProxyBeanType(String type) {
-		return getRegistry().getBeanTypeProxyFactory().getBeanTypeProxy(this, type);
-	}
-	
-	/**
-	 * Create the expression proxy subclass that is applicable for this kind of processor. 
-	 * @param proxyType type of proxy. {@link Expression#NORMAL_EXPRESSION_PROXY
-	 * @param proxyID the id of the new expression proxy.
-	 * 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract ExpressionProxy createExpressionProxy(int proxyType, int proxyID);
-	
-	/**
-	 * Push this proxy to the other side. It will simply take the proxy and push it onto
-	 * its evaluation stack. It will be treated as the result of an expression. It's just 
-	 * that the expression was evaluatable on this side (since it is already a proxy).
-	 * 
-	 * @param proxy
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushToProxy(IProxy proxy);
-
-	/**
-	 * Tell the other side we are complete. This will always be called after expression evaluation, or
-	 * if expression was prematurely closed.
-	 * <p>
-	 * <b>Note:</b> The implementation must be able to handle multiple invocations, where the first call is a valid close and any
-	 * subsequent call should be ignored.
-	 * 
-	 * @throws ThrowableProxy
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void closeProxy();
-	
-	/**
-	 * Do invoke. This should simply make sure everything is done and throw any pending errors.
-	 * <p>
-	 * <b>Note:</b> The expression proxies MUST be resolved (callbacks called) in the order they are found in the expressionProxies list. This
-	 * is so that the contract is followed that resolution notifications will occur in the order of creation.
-	 * 
-	 * @param proxycount Number of Expression Proxies that need a callback.
-	 * @param list of expression proxies. If proxycount > 0, then process the non-null entries in the list. They will be of type ExpressionProxy.
-	 * @throws ThrowableProxy
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushInvoke(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException;
-	
-	/**
-	 * Pull the top expression value from the evaluation stack. It will also under
-	 * the covers call closeProxy.  It also must process the expression proxy callbacks. It must do the expression proxy callbacks first, and then
-	 * process the result value. If an error had occured sometime during processing, it should still process the proxy callbacks before throwing
-	 * an exception.
-	 * <p>
-	 * <b>Note:</b> The expression proxies MUST be resolved (callbacks called) in the order they are found in the expressionProxies list. This
-	 * is so that the contract is followed that resolution notifications will occur in the order of creation. Also <b>REQUIRED</b> is that
-	 * the entire list must be processed of proxies must be processed by this call. It cannot do some or none.
-	 * 
-	 * @param proxycount Number of Expression Proxies that need a callback.
-	 * @param list of expression proxies. If proxycount > 0, then process the non-null entries in the list. They will be of type ExpressionProxy.
-	 * @return The top level evaluation stack value.
-	 * @throws ThrowableProxy
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract IBeanProxy pullProxyValue(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException;
-	
-	/**
-	 * Push to proxy the cast expression. The expression to use will be on the top of its evaluation stack.
-	 * The result of the cast expression will be placed onto the evaluation stack.
-	 *  
-	 * @param type Cast type. 
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushCastToProxy(IProxyBeanType type);
-
-	/**
-	 * Push to proxy the instanceof expression. The expression to use will be on the top of its evaluation stack.
-	 * The result of the instanceof expression will be placed onto the evaluation stack.
-	 *  
-	 * @param type Instanceof type.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushInstanceofToProxy(IProxyBeanType type);
-	
-	/**
-	 * Push to proxy the infix operation. This is called on the completion of each operand of the expression.
-	 * So it will be called a minimum of two times.
-	 * 
-	 * @param operator The operator.
-	 * @param operandType The operand type. left, other, or last.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushInfixToProxy(InfixOperator operator, InternalInfixOperandType operandType);
-	
-	/**
-	 * Push to proxy the prefix expression. The expression to use will be on top of its evaluation stack.
-	 * The result of the prefix operation will be placed onto the evaluation stack.
-	 * 
-	 * @param operator 
-	 * 
-	 * @see IExpressionConstants#PRE_MINUS
-	 * @since 1.0.0
-	 */
-	protected abstract void pushPrefixToProxy(PrefixOperator operator);	
-
-	
-	/**
-	 * Push to proxy the array access. The result will be placed onto the evaluation stack.
-	 * 
-	 * @param indexCount
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushArrayAccessToProxy(int indexCount);
-	
-	/**
-	 * Push to proxy the array creation. The result will be placed onto the evaluation stack.
-	 * @param type The array type. 
-	 * @param dimensionCount
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushArrayCreationToProxy(IProxyBeanType type, int dimensionCount);
-	
-	/**
-	 * Push to proxy the array initializer. The resulting array will be placed onto the evaluation stack.
-	 * @param type The array type. (must be an array type).
-	 * @param stripDimCount the number of dimensions that must be stripped from the array type. This is needed
-	 * because the first array initializer needs to be for the component type of the array (array minus one dimension), and
-	 * each initializer after that needs one more dimension stripped off. But since we are working with possible expression
-	 * proxies for "type", we can't create the appropriate component types of the array. So we need to tell the
-	 * processor how many dims to strip from the original type (which is what is sent in on every initializer push, the original type).
-	 * @param expressionCount
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushArrayInitializerToProxy(IProxyBeanType type, int stripDimCount, int expressionCount);
-	
-	/**
-	 * Push to proxy the class instance creation. The resulting class instance will be placed onto the evaluation stack.
-	 * 
-	 * @param type Class type. 
-	 * @param argumentCount The number of arguments.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushClassInstanceCreationToProxy(IProxyBeanType type, int argumentCount);
-	
-	/**
-	 * Push to proxy the type receiver. The resulting class will be placed onto the evaluation stack, along with it also
-	 * being the expression type.
-	 * @param type Class type. 
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushTypeReceiverToProxy(IProxyBeanType type);
-
-	/**
-	 * Push to proxy the field access. The result value will be placed onto the evaluation stack.
-	 * @param field The name of the field if string, or an IFieldProxy.
-	 * @param hasReceiver Has receiver flag.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushFieldAccessToProxy(Object field, boolean hasReceiver);
-	
-	/**
-	 * Push to proxy the method invocation. The result value will be placed onto the evaluation stack.
-	 * 
-	 * @param method String for method name or IProxyMethod
-	 * @param hasReceiver
-	 * @param argCount
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushMethodInvocationToProxy(Object method, boolean hasReceiver, int argCount);
-	
-	/**
-	 * Push to proxy the conditional expression. This will be called on each part of expression. The expression type
-	 * will be the current part (e.g. test, true, false).
-	 * 
-	 * @param expressionType The expression type.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushConditionalToProxy(InternalConditionalOperandType expressionType);
-	
-	/**
-	 * Push to the proxy the expression proxy. Whatever the last expression value is will be assigned to the ExpressionProxy.
-	 * 
-	 * @param proxy
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushAssignmentToProxy(ExpressionProxy proxy);
-	
-	/**
-	 * Push the assignment expression. The operands are already on the stack.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushAssignmentToProxy();
-
-	
-	/**
-	 * Push the begin block expression. 
-	 * @param blockNumber 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushBlockBeginToProxy(int blockNumber);
-	
-	/**
-	 * Push the end block expression.
-	 * @param blockNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushBlockEndToProxy(int blockNumber);
-
-	/**
-	 * Push the break block expression.
-	 * @param blockNumber
-	 * 
-	 * @since 1.1.0
-	 *
-	 */
-	protected abstract void pushBlockBreakToProxy(int blockNumber);
-	
-	/**
-	 * Push the begin try expression. 
-	 * @param tryNumber 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushTryBeginToProxy(int tryNumber);
-
-	/**
-	 * Push the catch clause to proxy.
-	 * @param tryNumber
-	 * @param exceptionType 
-	 * @param ep ExpressionProxy to be assigned with the exception or <code>null</code> if exception is not to be assigned.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushTryCatchClauseToProxy(int tryNumber, IProxyBeanType exceptionType, ExpressionProxy ep);
-
-	/**
-	 * Push the finally clause to proxy.
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushTryFinallyClauseToProxy(int tryNumber);
-
-	/**
-	 * Push try end to proxy.
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushTryEndToProxy(int tryNumber);
-	
-	/**
-	 * Push the throw of the exception to proxy.
-	 * @param exception
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushThrowToProxy();
-	
-	/**
-	 * Push a rethrow to proxy.
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushRethrowToProxy(int tryNumber);
-
-	/**
-	 * Push the BeanType Expression proxy to be resolved on the execution side.
-	 * @param proxy
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushBeanTypeToProxy(IBeanTypeExpressionProxy proxy);
-	
-	/**
-	 * Push the Method Expression proxy to be resolved on the execution side.
-	 * @param proxy
-	 * @param declaringType
-	 * @param methodName
-	 * @param parameterTypes parameter types or <code>null</code> if no parameters.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushMethodToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes);
-
-	/**
-	 * Push the Field Expression Proxy to be resolved on the execution side.
-	 * @param proxy
-	 * @param declaringType
-	 * @param fieldName
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushFieldToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String fieldName);
-	
-	/**
-	 * Push the If test condition to proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushIfTestToProxy();
-	
-	/**
-	 * Push a true or else clause to proxy.
-	 * @param clauseType
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushIfElseToProxy(InternalIfElseOperandType clauseType);
-	
-	/**
-	 * Push to proxy a new instance using an initialization string.
-	 * @param initializationString
-	 * @param resultType
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushNewInstanceToProxy(String initializationString, IProxyBeanType resultType);
-	
-	/**
-	 * Push the mark id to proxy.
-	 * 
-	 * @param markID
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushMarkToProxy(int markID);
-	
-	/**
-	 * Push the end mark id to proxy.
-	 * 
-	 * @param markID
-	 * @param restore <code>true</code> if this is a restore due to error, <code>false</code> if this is just a normal end mark.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushEndmarkToProxy(int markID, boolean restore);
-	
-	/**
-	 * Push the begin transfer thread to proxy.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushBeginTransferThreadToProxy() throws ThrowableProxy;
-	
-	/**
-	 * Push the actual transfer to the current thread to proxy.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushTransferThreadToProxy();
-	
-	/**
-	 * Push the subexpression begin to proxy.
-	 * @param subexpressionNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushSubexpressionBeginToProxy(int subexpressionNumber);
-	
-	/**
-	 * Push the subexpression end to proxy.
-	 * @param subexpressionNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushSubexpressionEndToProxy(int subexpressionNumber);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java
deleted file mode 100644
index ec12faad8..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java
+++ /dev/null
@@ -1,349 +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.proxy.core;
-
-import java.util.EventObject;
-import java.util.logging.Level;
- 
-
-/**
- * This is a proxy for an IExpression evaluation value. It is used as a place holder proxy value for result of an expression, and
- * then the value can be used in a later expression, or at the end, it can callback and return a proxy in the IDE 
- * side in a callback for usage later on outside of the IExpression.
- * <p>
- * After receiving the resolved event, listeners should not hold onto the ExpressionProxy because it would then be invalid. At that
- * point they should instead hold onto the resolved bean proxy.
- * 
- * @see org.eclipse.jem.internal.proxy.core.IExpression#assignExpressionProxy()
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createExpressionProxyExpression(int, ExpressionProxy)
- * @since 1.1.0
- */
-public class ExpressionProxy implements IProxy {
-
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return getExpression().getRegistry();
-	}
-	
-	/**
-	 * The event object for the resolved event of the proxy listener.
-	 * <p>
-	 * The source will be the ExpressionProxy that is being resolved.
-	 * @since 1.1.0
-	 */
-	public static class ProxyEvent extends EventObject {
-		
-		/**
-		 * Comment for <code>serialVersionUID</code>
-		 * 
-		 * @since 1.1.0
-		 */
-		private static final long serialVersionUID = -2305781662465107377L;
-		private final IBeanProxy proxy;
-
-		/**
-		 * @param source the expression proxy for the event.
-		 * @param proxy the bean proxy the expression proxy (source) resolved to.
-		 * 
-		 * @since 1.1.0
-		 */
-		public ProxyEvent(ExpressionProxy source, IBeanProxy proxy) {
-			super(source);
-			this.proxy = proxy;
-		}
-		
-		/**
-		 * Construct the event with no proxy. Used for not resolved and void.
-		 * @param source
-		 * 
-		 * @since 1.1.0
-		 */
-		public ProxyEvent(ExpressionProxy source) {
-			this(source, null);
-		}
-		
-		/**
-		 * Get the proxy value that the expression proxy (source) resolved to.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public IBeanProxy getProxy() {
-			return proxy;
-		}
-	}
-	
-	/**
-	 * Listener for expression proxy events.
-	 * 
-	 * @since 1.1.0
-	 */
-	public interface ProxyListener {
-		/**
-		 * The expression proxy has been resolved. The event contains the resolved proxy.
-		 * At this point, any listeners should no longer hold onto the ExpressionProxy
-		 * because it is now invalid. They should hold onto the resolved bean proxy instead.
-		 * 
-		 * @param event
-		 * 
-		 * @since 1.1.0
-		 */
-		public void proxyResolved(ProxyEvent event);
-		
-		/**
-		 * This is called for ExpressionProxies that have a callback listener, but the proxy 
-		 * was never resolved. This means that the expression that assigns to the proxy was
-		 * not executed. In this case the event does not have a bean proxy in it.
-		 * 
-		 * @param event
-		 * 
-		 * @since 1.1.0
-		 */
-		public void proxyNotResolved(ProxyEvent event);
-		
-		/**
-		 * This is called for ExpressionProxies that were assigned to an expression that
-		 * had a <code>VOID</code> return type. This is usually for method invocations that
-		 * have a void return type. In this case the event does not have a bean proxy in it.
-		 * @param event
-		 * 
-		 * @since 1.1.0
-		 */
-		public void proxyVoid(ProxyEvent event);
-	}
-	
-	/**
-	 * An implementation of ProxyListener that does nothing. It can be
-	 * used as a superclass for individual listeners that are only interested
-	 * in some of the events.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static class ProxyAdapter implements ProxyListener {
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyNotResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
-		 */
-		public void proxyNotResolved(ProxyEvent event) {
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
-		 */
-		public void proxyResolved(ProxyEvent event) {
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyVoid(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
-		 */
-		public void proxyVoid(ProxyEvent event) {
-		}
-	}
-	
-	final private int proxyID;
-	final private int proxyType;
-	private ListenerList listenerList;
-	private Expression expression;
-	
-	/**
-	 * Create with the given proxy id.
-	 * @param proxyid
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy(int proxyid, int proxyType, Expression expression) {
-		this.proxyID = proxyid;
-		this.proxyType = proxyType;
-		this.expression = expression;
-	}
-	
-	/**
-	 * Get the expression this proxy is for. 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public Expression getExpression() {
-		return expression;
-	}
-	
-	/**
-	 * Used internally in expression to get the proxy type. 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final int getProxyType() {
-		return proxyType;
-	}
-	
-	/**
-	 * Return the proxy id.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public final int getProxyID() {
-		return proxyID;
-	}
-	
-	/**
-	 * Add a listener. If listener already added, it has no effect.
-	 * @param listener
-	 * 
-	 * @since 1.1.0
-	 */
-	public void addProxyListener(ProxyListener listener) {
-		if (listenerList == null)
-			listenerList = new ListenerList();
-		listenerList.add(listener);
-	}
-	
-	/**
-	 * Remove a listener. If listener not already added, then no error.
-	 * @param listener
-	 * 
-	 * @since 1.1.0
-	 */
-	public void removeProxyListener(ProxyListener listener) {
-		if (listenerList != null)
-			listenerList.remove(listener);
-	}
-	
-	/**
-	 * Used by internal subclasses or Expression to know if anyone is listening.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final boolean hasListeners() {
-		return listenerList != null && !listenerList.isEmpty();
-	}
-	
-	/**
-	 * The proxy has been fired (one of the events has occurred). Subclasses should clean
-	 * up and not hold onto anything that would be expensive in case the proxy is still
-	 * held onto be someone. For example the default clears the listener list.
-	 * <p>
-	 * <b>Note:</b> Subclasses must call super.dispose().
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void dispose() {
-		listenerList = null;
-		expression = null;
-	}
-	
-	/**
-	 * Used by internal subclasses  or by Expression to fire the resolved event. Once fired all listeners are removed.
-	 * This is because only one kind of firing can be done for a expression proxy and then the proxy is dead. This
-	 * prevents listeners from being held on to if any one accidently still holds the proxy.
-	 * @param proxy
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireResolved(IBeanProxy proxy) {
-		if (hasListeners()) {
-			ProxyEvent event = new ProxyEvent(this, proxy);
-			Object[] listeners = listenerList.getListeners();
-			for (int i = 0; i < listeners.length; i++) {
-				try {
-					((ProxyListener) listeners[i]).proxyResolved(event);
-				} catch (RuntimeException e) {
-					ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-				}
-			}
-		}
-		dispose();
-	}
-	
-	/**
-	 * Used by internal subclasses or by Expression to fire the not resolved event. Once fired all listeners are removed.
-	 * This is because only one kind of firing can be done for a expression proxy and then the proxy is dead. This
-	 * prevents listeners from being held on to if any one accidently still holds the proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireNotResolved() {
-		if (hasListeners()) {
-			ProxyEvent event = new ProxyEvent(this);
-			Object[] listeners = listenerList.getListeners();
-			for (int i = 0; i < listeners.length; i++) {
-				try {
-					((ProxyListener) listeners[i]).proxyNotResolved(event);
-				} catch (RuntimeException e) {
-					ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-				}
-				
-			}
-		}
-		dispose();
-	}
-	
-	/**
-	 * Used by internal subclasses or by Expression to fire the void resolved event. Once fired all listeners are removed.
-	 * This is because only one kind of firing can be done for a expression proxy and then the proxy is dead. This
-	 * prevents listeners from being held on to if any one accidently still holds the proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireVoidResolved() {
-		if (hasListeners()) {
-			ProxyEvent event = new ProxyEvent(this);
-			Object[] listeners = listenerList.getListeners();
-			for (int i = 0; i < listeners.length; i++) {
-				try {
-					((ProxyListener) listeners[i]).proxyVoid(event);
-				} catch (RuntimeException e) {
-					ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-				}
-				
-			}
-		}
-		dispose();
-	}	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return false;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return true;
-	}
-	
-	/**
-	 * Is this proxy valid for reassignment. By default only if the type is NORMAL_EXPRESSION_PROXY.
-	 * Subclasses may override and return true in their cases.
-	 * 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isValidForReassignment() {
-		return getProxyType() == Expression.NORMAL_EXPRESSION_PROXY;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return super.toString()+": "+getProxyID(); //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IAccessibleObjectProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IAccessibleObjectProxy.java
deleted file mode 100644
index d563228b9..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IAccessibleObjectProxy.java
+++ /dev/null
@@ -1,39 +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.proxy.core;
-/*
-
-
- */
-
-/**
- * Proxy for an AccessibleObject.
- * 
- * @since 1.0.0 
- */ 
-public interface IAccessibleObjectProxy extends IBeanProxy {
-	
-	/**
-	 * Is the proxy accessible or not?
-	 * 
-	 * @return <code>true</code> if accessible.
-	 */
-	public boolean isAccessible() throws ThrowableProxy;
-	
-	/**
-	 * Set the accessible flag on the proxy.
-	 * 
-	 * @param flag <code>true</code> if accessible.
-	 * @throws ThrowableProxy
-	 */
-	public void setAccessible(boolean flag) throws ThrowableProxy;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanProxy.java
deleted file mode 100644
index 8bdbaa278..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanProxy.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Proxy wrappering an array.
- */
-public interface IArrayBeanProxy extends IBeanProxy {
-	/**
-	 * Get the object at the specified index.
-	 */
-	IBeanProxy get(int index) throws ThrowableProxy;
-
-	IBeanProxy getCatchThrowableException(int index);
-	
-	/**
-	 * Get the object at the specified multi-dimensional index.
-	 * The array must be at least the number of dimensions specified,
-	 * and each index along the way must exist.
-	 * The number of dimensions can't be greater than the number
-	 * of dimensions of the real object.
-	 */
-	IBeanProxy get(int [] indexes) throws ThrowableProxy; 
-	
-	/**
-	 * Get a snapshot of the array. It will return an array of proxies of the
-	 * complete first dimension of the array. This is useful if you need
-	 * to be working with more than one entry of the array. You can save
-	 * accesses to the vm by doing this. 
-	 * <p>
-	 * NOTE: This is a snapshot. It will not see changes to the array.
-	 * If an entry is set into the returned array of proxies, this will
-	 * not be reflected into the real array. Also any changes in the
-	 * contents of the first dimension of the real array will not
-	 * be reflected into this returned array of proxies. The proxies
-	 * returned are real proxies, so any changes to them will be reflected
-	 * back and forth. Treat this as an array copy to a new array.
-	 * 
-	 * @return array of proxies of the first dimension of the array.
-	 * @throws ThrowableProxy
-	 * 
-	 * @since 1.1.0
-	 */
-	IBeanProxy[] getSnapshot() throws ThrowableProxy;
-	
-	/**
-	 * Set the object at the specified index.
-	 */
-	void set(IBeanProxy value, int index) throws ThrowableProxy;
-	
-	/**
-	 * Set the object at the specified multi-dimensional index.
-	 * The array must be at least the number of dimensions specified,
-	 * and each index along the way must exist.
-	 * The number of dimensions can't be greater than the number
-	 * of dimensions of the real object.
-	 */
-	void set(IBeanProxy value, int [] indexes) throws ThrowableProxy;	 
-	
-	/**
-	 * Get the length of the first dimension of this array.
-	 * If there are multi-dimensions, you must get the appropriate
-	 * dimension from the get method to see the size of that dimension.
-	 *
-	 * e.g.
-	 *    int [3] returns 3
-	 *    int [3][2] returns 3
-	 *
-	 *    ((IArrayBeanProxy) get(1)).getLength() returns 2
-	 *    Since arrays do not have to be homogenous, there could
-	 *    be a different length array for each of the arrays 
-	 *    returned from the first dimension, the returned length
-	 *    from get(2) and get(3) could result in a different value
-	 *    from get(1).
-	 */
-	int getLength();
-
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanTypeProxy.java
deleted file mode 100644
index aceff093e..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanTypeProxy.java
+++ /dev/null
@@ -1,41 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * A Proxy for an array type.
- */
-
-public interface IArrayBeanTypeProxy extends IBeanTypeProxy {
-	/**
-	 * getComponentType: Get the component type of this array.
-	 * e.g. (new Object[3]).getClass().getComponentType() will
-	 * return "java.lang.Object".
-	 * and (new Object[3][2][1]).getClass().getComponentType() will
-	 * return "Object[][]";
-	 */
-	public IBeanTypeProxy getComponentType();
-	/**
-	 * Return the final type, i.e. the final non-array type.
-	 * i.e. int[][] will return int.
-	 */
-	public IBeanTypeProxy getFinalComponentType();	
-	/**
-	 * Return the number of dimensions for this type.
-	 * i.e. int [][] will return 2.
-	 */
-	public int getDimensions();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxy.java
deleted file mode 100644
index 7fc92f42e..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxy.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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Bean Proxy interface. This is the
- * root interface for any bean proxy instance.
- * Creation date: (12/3/99 11:37:01 AM)
- * @author: Joe Winchester
- */
-public interface IBeanProxy extends IProxy {
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject);
-
-/**
- * Test for identity among this bean proxy and the other bean proxy.
- * For some proxy systems, this may be redundent and you can be assured
- * that if the objects being proxied are identical you will receive the
- * same proxy for both. However, other implementations may not have this
- * condition. Therefor this method was created.
- * 
- * There is one restriction, constants may not necessarily be identical.
- * For instance, in some implementations, the Boolean proxy (i.e. an instance of class Boolean) is a constant, i.e. 
- * it cannot be changed. In those cases a new proxy may be created for each
- * access and so they will not be considered to be identical. In those cases false will be returned.
- * But in other implementations a new proxy will not be created and so sameAs will return true. 
- * 
- * Primitives will return true if just equal because in Java primitives are identical if the same value.
- * 
- * @param aBeanProxy
- * @return true if they are identical (i.e. ==) and not just equals.
- */
-public boolean sameAs(IBeanProxy aBeanProxy);
-  
-/**
- * Return the registry this proxy was created with.
- */
-public ProxyFactoryRegistry getProxyFactoryRegistry();
-/**
- * Return the proxied class of the bean
- * Creation date: (12/3/99 11:37:01 AM)
- * @author: Joe Winchester
- */
-public IBeanTypeProxy getTypeProxy();
-
-/**
- * Return a string representation of the bean itself
- * This could be done by finding the toString() method by a findMethod()
- * on the type proxy, etc... but toString() is so ubiquitous that it is
- * explicitly declared on the IBeanProxy interface
- * Creation date: (12/3/99 11:37:01 AM)
- * @author: Joe Winchester
- */
-public String toBeanString();
-/**
- * Is this bean still valid? It could be invalid because it
- * was specifically released but someone is still holding onto it.
- */
-public boolean isValid();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxyFactory.java
deleted file mode 100644
index 510d8f908..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxyFactory.java
+++ /dev/null
@@ -1,49 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Bean Proxy Factory for creating bean proxies.
- * Creation methods are actually package protected.
- * All creation is done through the IBeanTypeProxy.
- * Specific factories may have helper methods that
- * allow creation of specific types, such as the
- * standard factory allows creation of Boolean, int's, etc.
- * Creation date: (12/3/99 11:52:09 AM)
- * @author: Joe Winchester
- */
-public interface IBeanProxyFactory {
-	/**
-	 * The factory is being terminated.
-	 * <p>
-	 * It should clean up its resources.
-	 * It should not reference any other factory because they could of
-	 * already been terminated.
-	 * <p>
-	 * For example, if it is holding onto IREMBeanProxy's, it doesn't
-	 * need to call release on them except if they are constants because
-	 * the BeanProxyFactory has all non-constant bean proxies registered
-	 * and will call the release itself.
-	 * <p>
-	 * Note: This is not meant to be called by users. It will be called internally by the proxy registry when necessary.
-	 * 
-	 * @param wait <code>true</code> should wait for completion, <code>false</code> don't necessarily wait. False is just
-	 * a suggestion. The factory may not permit not waiting. True must be honoured and it must wait.
-	 * 
-	 * @since 1.0.2
-	 */
-	public void terminateFactory(boolean wait); 
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeExpressionProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeExpressionProxy.java
deleted file mode 100644
index 8966aa17d..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeExpressionProxy.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.proxy.core;
- 
-
-/**
- * An internal interface for the registries to create the appropriate beantype expression proxy.
- * Not to be implemented or referenced by customers.
- * @since 1.1.0
- */
-public interface IBeanTypeExpressionProxy extends IProxyBeanType {
-
-	/**
-	 * Allow the expression to set the type name.
-	 * @param typeName
-	 * 
-	 * @since 1.1.0
-	 */
-	public void setTypeName(String typeName);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxy.java
deleted file mode 100644
index 30f733fd9..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxy.java
+++ /dev/null
@@ -1,319 +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.proxy.core;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-
-/**
- * A proxy for a BeanType (i.e. Java type/class). Creation date: (12/3/99 11:38:06 AM)
- * 
- * @author: Joe Winchester
- */
-public interface IBeanTypeProxy extends IBeanProxy, IProxyBeanType {
-	
-	/**
-	 * Find the most compatible constructor (out of the declared constructors). This means it will
-	 * find either an exact match or an override that is compatible, e.g. X(Object j) is returned when looking with arg type of "java.lang.String".
-	 * @param argumentTypes array of arg types or <code>null</code> if none. (In case of null, this is the default ctor, so just use that).
-	 * @return
-	 * @throws NoSuchMethodException
-	 * @throws AmbiguousMethodException
-	 * @throws IllegalAccessException 
-	 * 
-	 * @since 1.1.0
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) throws AmbiguousMethodException, NoSuchMethodException, IllegalAccessException;
-	
-	/**
-	 * Find the most compatible public method, including inheritied. This means it will
-	 * find either an exact match or an override that is compatible, e.g. xyz(Object j) is returned when looking with arg type of "java.lang.String".
-	 * @param methodName
-	 * @param argumentTypes array of arg types or <code>null</code> if none. (In case of null, just use getMethod(String methodName) since only one is compatible then.
-	 * @return
-	 * @throws AmbiguousMethodException
-	 * @throws NoSuchMethodException
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes)  throws AmbiguousMethodException, NoSuchMethodException;
-
-	/**
-	 * Return the constructor proxy on the receiver with the specified arguments Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames);
-
-	/**
-	 * Return the constructor proxy on the receiver with the specified types Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes);
-	
-	/**
-	 * Return an array of public constructors for this class. 
-	 * 
-	 * @return an array of constructor proxies or <code>null</code> if an error.
-	 * 
-	 * @since 1.1.0
-	 */
-	public IConstructorProxy[] getConstructors();
-
-	/**
-	 * Return the declared constructor proxy on the receiver with the specified arguments Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames);
-
-	/**
-	 * Return the declared constructor proxy on the receiver with the specified types Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes);
-
-	/**
-	 * Return an array of declared constructors for this class. 
-	 * 
-	 * @return an array of constructor proxies or <code>null</code> if an error.
-	 * 
-	 * @since 1.1.0
-	 */
-	public IConstructorProxy[] getDeclaredConstructors();
-
-	/**
-	 * Return the array of field proxies.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IFieldProxy[] getFields();
-
-	/**
-	 * Return the array of declared field proxies.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IFieldProxy[] getDeclaredFields();
-
-	/**
-	 * Return the fieldproxy on the receiver with the specified name Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IFieldProxy getFieldProxy(String fieldName);
-
-	/**
-	 * Return the declared fieldproxy on the receiver with the specified name
-	 */
-	public IFieldProxy getDeclaredFieldProxy(String fieldName);
-
-	/**
-	 * Return the method proxy on the receiver with the specified name and no arguments.
-	 * 
-	 * @param methodName
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getMethodProxy(String methodName);
-
-	/**
-	 * Return the method proxy on the receiver with the qualified class names as string arguments
-	 * 
-	 * @param methodName
-	 * @param argumentClassNames
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames);
-
-	/**
-	 * Return the method proxy on the receiver with the specified name and one argument
-	 * 
-	 * @param methodName
-	 * @param argumentClassName
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String argumentClassName);
-
-	/**
-	 * Return the method proxy on the receiver with the beanTypes as arguments
-	 * 
-	 * @param methodName
-	 * @param argumentTypes
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes);
-
-	/**
-	 * Return an array of public methods for this class. 
-	 * 
-	 * @return an array of method proxies or <code>null</code> if an error.
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy[] getMethods();
-
-	/**
-	 * Return the declared method proxy on the receiver with the specified arguments Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames);
-
-	/**
-	 * Return the declared method proxy on the receiver with the specified types Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes);
-
-	/**
-	 * Return an array of declared methods for this class. 
-	 * 
-	 * @return an array of method proxies or <code>null</code> if an error.
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy[] getDeclaredMethods();
-
-	/**
-	 * Return the invokable on the receiver with the specified name and no arguments.
-	 * <p>
-	 * The method proxy is not retrieved. Instead the method will be looked up
-	 * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
-	 * be retrieved instead.
-	 * <p>
-	 * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
-	 * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
-	 * <p>
-	 * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
-	 * 
-	 * @param methodName
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(String methodName);
-
-	/**
-	 * Return the method proxy on the receiver with the qualified class names as string arguments
-	 * <p>
-	 * The method proxy is not retrieved. Instead the method will be looked up
-	 * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
-	 * be retrieved instead.
-	 * <p>
-	 * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
-	 * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
-	 * <p>
-	 * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
-	 * 
-	 * @param methodName
-	 * @param argumentClassNames
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(String methodName, String[] argumentClassNames);
-
-	/**
-	 * Return the method proxy on the receiver with the specified name and one argument
-	 * <p>
-	 * The method proxy is not retrieved. Instead the method will be looked up
-	 * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
-	 * be retrieved instead.
-	 * <p>
-	 * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
-	 * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
-	 * <p>
-	 * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
-	 * 
-	 * @param methodName
-	 * @param argumentClassName
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(String methodName, String argumentClassName);
-
-	/**
-	 * Return the method proxy on the receiver with the beanTypes as arguments
-	 * <p>
-	 * The method proxy is not retrieved. Instead the method will be looked up
-	 * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
-	 * be retrieved instead.
-	 * <p>
-	 * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
-	 * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
-	 * <p>
-	 * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
-	 * 
-	 * @param methodName
-	 * @param argumentTypes
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(String methodName, IBeanTypeProxy[] argumentTypes);
-	
-	/**
-	 * Return the constructor proxy on the receiver with no arguments Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IConstructorProxy getNullConstructorProxy();
-
-	/**
-	 * Answer the type proxy for the superclass Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IBeanTypeProxy getSuperBeanTypeProxy();
-
-	/**
-	 * Answer the name of the type we are proxying This is the fully qualified name. For arrays it will return the format: [Lclassname; Creation date:
-	 * (12/3/99 2:25:07 PM)
-	 */
-	public String getTypeName();
-
-	/**
-	 * Answer the formal format type name. For normal classes, this just the same as getTypeName(), but for arrays, it is of the format classname[]
-	 */
-	public String getFormalTypeName();
-
-	/**
-	 * Answer a boolean as to whether we are an array type.
-	 */
-	public boolean isArray();
-
-	/**
-	 * Answer a boolean as to whether we are a type or an interface Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public boolean isInterface();
-
-	/**
-	 * Answer a boolean as to whether we are a primitive or not.
-	 */
-	public boolean isPrimitive();
-
-	/**
-	 * Answer a boolean as to whether we are a kind of the argument We can either be it, inherit from it, or implement it
-	 */
-	public boolean isKindOf(IBeanTypeProxy aBeanProxyType);
-
-	/**
-	 * Return a new instance Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IBeanProxy newInstance() throws ThrowableProxy;
-
-	/**
-	 * Return a new instance of this type using the initialization string to create the proxy. ClassCastException is thrown if the initstring doesn't
-	 * result in an object compatible with this type. InstantiationException is thrown when the initialization string cannot be parsed correctly.
-	 * Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException;
-
-	/**
-	 * Return the exception message that happened when trying to find this bean type. Class not found is not such an exception. In that case the bean
-	 * type will be returned as a null instead. An example of such is an initialization error during loading the class, i.e. it was found but some
-	 * static failed to initialize.
-	 * 
-	 * Return null if there is no initialization error.
-	 */
-	public String getInitializationError();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxyFactory.java
deleted file mode 100644
index ce1164672..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,31 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Factory for creating BeanTypeProxy's.
- * This is a common tag interface so that
- * the factory can be registered. But each
- * VM requires a different interface that
- * extends this interface. That extended
- * interface is what must be implemented in
- * each VM.
- * Creation date: (12/3/99 2:26:00 PM)
- * @author: Joe Winchester
- */
-public interface IBeanTypeProxyFactory extends IBeanProxyFactory {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBooleanBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBooleanBeanProxy.java
deleted file mode 100644
index 625d83964..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBooleanBeanProxy.java
+++ /dev/null
@@ -1,31 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Optimized implementation that should be used for Boolean proxies that
- * allows the IDE VM to get the boolean value easily
- * Creation date: (2/6/00 8:58:22 AM)
- * @author: Joe Winchester
- */
-public interface IBooleanBeanProxy extends IBeanProxy {
-/**
- * Return the proxied boolean as a boolean that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-boolean booleanValue();
-Boolean getBooleanValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallback.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallback.java
deleted file mode 100644
index 7f8a02d4e..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallback.java
+++ /dev/null
@@ -1,152 +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.proxy.core;
-/*
-
-
- */
-
-import java.io.InputStream;
-
-/**
- * Users will create a callback of this interface
- * and register it with the factory. Then when ever
- * the callback occurs, this callback will be called
- * with data from the proxy. It can return a value too.
- *
- * Or an InputStream can be returned to supply the data.
- *  
- * @since 1.0.0
- */
-public interface ICallback {
-
-	/**
-	 * This is the entry point of the callback.
-	 * It will be called whenever the callback
-	 * occurred. It will be on its own thread.
-	 * A particular thread cannot be requested.
-	 * <p>
-	 * The implementation MUST return. This is 
-	 * because the callback will not be completed
-	 * until it is returned, and the process will
-	 * not continue on the remote vm until it is
-	 * returned.
-	 * <p>
-	 * The value returned must either be an
-	 * IBeanProxy or IBeanProxy[]. It is typed
-	 * to Object to allow either one, but it
-	 * will be checked, and if it isn't, then
-	 * null will be returned instead to the
-	 * caller.
-	 * 
-	 * @param msgID
-	 * @param parm The beanproxy - will not be null
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public Object calledBack(int msgID, IBeanProxy parm);
-
-	/**
-	 * This is the entry point of the callback.
-	 * It will be called whenever the callback
-	 * occurred. It will be on its own thread.
-	 * A particular thread cannot be requested.
-	 * <p>
-	 * The parms will be an array of IBeanProxys,
-	 * or an entry could be another array of IBeanProxys,
-	 * or null if null was sent to callBackWithParms.
-	 * The final component of any entry will be an
-	 * IBeanProxy. It is up to the developers to
-	 * agree on the format of the parms.
-	 * <p>
-	 * The implementation MUST return. This is 
-	 * because the callback will not be completed
-	 * until it is returned, and the process will
-	 * not continue on the remote vm until it is
-	 * returned.
-	 * <p>
-	 * The value returned must either be an
-	 * IBeanProxy or IBeanProxy[]. It is typed
-	 * to Object to allow either one, but it
-	 * will be checked, and if it isn't, then
-	 * null will be returned instead to the
-	 * caller.
-	 * 
-	 * @param msgID
-	 * @param parms
-	 * @return
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.common.ICallbackHandler#callbackWithParms(int, int, Object[])
-	 * @since 1.0.0
-	 */
-	public Object calledBack(int msgID, Object[] parms);
-	
-	/**
-	 * This is the entry point of the callback.
-	 * It will be called whenever the callback
-	 * occurred. It will be on its own thread.
-	 * A particular thread cannot be requested.
-	 * <p>
-	 * The parm will be an object. This occurs
-	 * if remote vm just wanted to send some objects.
-	 * They will not be proxies. It is recommended
-	 * that this be used only for small items. For
-	 * anything large, the callbackStream should be
-	 * used instead.
-	 * <p>
-	 * The implementation MUST return. This is 
-	 * because the callback will not be completed
-	 * until it is returned, and the process will
-	 * not continue on the remote vm until it is
-	 * returned.
-	 * <p>
-	 * The value returned must either be an
-	 * IBeanProxy or IBeanProxy[]. It is typed
-	 * to Object to allow either one, but it
-	 * will be checked, and if it isn't, then
-	 * null will be returned instead to the
-	 * caller.
-	 * 
-	 * @param msgID
-	 * @param parm The parm or <code>null</code> if null was sent.
-	 * @return
-	 * 
-	 * @see ICallback#calledBackStream(int, InputStream)
-	 * @since 1.0.0
-	 */
-	public Object calledBack(int msgID, Object parm);
-
-	/**
-	 * This is the entry point of the callback.
-	 * It will be called whenever the callback stream
-	 * occurred. It will be on its own thread.
-	 * A particular thread cannot be requested.
-	 * <p>
-	 * The callback should continue to read from the InputStream
-	 * until it returns -1 indicating no more data. The stream can
-	 * be closed. In that case the next time the remote vm wants to
-	 * send data it will first check that the stream has not been closed.
-	 * If it has, it will raise an exception on that side.
-	 * <p>
-	 * The implementation MUST return. This is 
-	 * because the callback will not be completed
-	 * until it is returned, and the process will
-	 * not continue on the remote vm until it is
-	 * returned.
-	 * 
-	 * @param msgID
-	 * @param is
-	 * 
-	 * @since 1.0.0
-	 */
-	public void calledBackStream(int msgID, InputStream is);	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallbackRegistry.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallbackRegistry.java
deleted file mode 100644
index 0e3c561f7..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallbackRegistry.java
+++ /dev/null
@@ -1,75 +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.proxy.core;
-/*
-
-
- */
-
-/**
- * This is the registry for handling callbacks.
- * It is used to register and deregister callbacks.
- *
- * Callbacks are split into two parts:
- * 1) CallbackProxy. This is any proxy that implements the
- *    interface ICallback. (Or the
- *    equivalent one if not standard remote vm). This is the
- *    object which will actually submit the callback on the remote
- *    vm. For example, any kind of listener. It would implement
- *    both the ICallback and the appropriate listener interface.
- *    Then when it gets called as a listener, it will redirect the
- *    call to the remote vm callback handler to submit it to the
- *    proxy side.
- * 2) Callback. This is on this side and is the object that will
- *    be notified of the callback and will execute at that time.
- *
- */
-
-public interface ICallbackRegistry {
-	
-	/**
-	 * Register this callback proxy and this callback.
-	 *
-	 * The process is to:
-	 * 1) Create the callbackProxy and the callback
-	 * 2) register these with registerCallback
-	 * 3) Now connect the callbackProxy so that it will start notifying.
-	 *    For example, if it is a normal listener, at this time do the
-	 *    addListener call to add the callbackProxy to the appropriate object.
-	 *    You don't want it to start notifying before registering it.
-	 *    (Though it won't hust it, it will just return null).
-	 */
-	public void registerCallback(IBeanProxy callbackProxy, ICallback cb);
-	
-	/**
-	 * Same as {@link ICallbackRegistry#registerCallback(IBeanProxy, ICallback) registerCallback} except that
-	 * it is deferred off into an expression.
-	 *  
-	 * @param callbackProxy
-	 * @param cb
-	 * @param expression
-	 * 
-	 * @since 1.1.0
-	 */
-	public void registerCallback(IProxy callbackProxy, ICallback cb, IExpression expression);
-	
-	/**
-	 * Deregister the callback proxy. This will remove it from the
-	 * registry and release the callback.
-	 *
-	 * The process is to:
-	 * 1) Stop the proxy from listening so it no notifies. This is usually
-	 *    removeListener on the remote vm. You don't want it notifying
-	 *    after it deregister (though it won't hurt it, it will just return null).
-	 * 2) deregister it.
-	 */
-	public void deregisterCallback(IBeanProxy callbackProxy);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICharacterBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICharacterBeanProxy.java
deleted file mode 100644
index b2e7c3ed9..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICharacterBeanProxy.java
+++ /dev/null
@@ -1,35 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Optimized implementation that should be used for character proxies that
- * allows the IDE VM to get the character value easily
- * Creation date: (2/6/00 8:58:22 AM)
- * @author: Joe Winchester
- */
-public interface ICharacterBeanProxy extends IBeanProxy, INumberBeanProxy {
-/**
- * Return the proxied character as a char that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-char charValue();
-/**
- * Return the proxied character as a Character that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-Character characterValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionController.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionController.java
deleted file mode 100644
index 03267f944..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionController.java
+++ /dev/null
@@ -1,172 +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.proxy.core;
-/*
-
-
- */
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaProject;
-import org.osgi.framework.Bundle;
-;
-/**
- * Controls contribution to the configuration. This allows the classpath
- * to be modified in an acceptable manner, so that duplicates aren't in
- * the path, or adding a project to the path in an acceptable way.
- * 
- * If only deleting or moving entries from the classpath, that can be done directly
- * to the classpath list passed in. Adding entries needs to go through this
- * controller.
- * 
- * This is meant to be implemented by developers of proxy launch configurations.
- * 
- * @version 	1.0
- * @author
- */
-public interface IConfigurationContributionController {
-	
-	/**
-	 * Append to the user classpath.
-	 */
-	public static final int APPEND_USER_CLASSPATH = 0;
-	
-	/**
-	 * Prepend to the user classpath. This will stick it in position 0. If
-	 * another prepend comes along, it will go in pos 0 and this one will move to 1.
-	 */
-	public static final int PREPEND_USER_CLASSPATH = 1;
-	
-
-	/**
-	 * Append to the boot classpath.
-	 */
-	public static final int APPEND_BOOT_CLASSPATH = 2;
-
-	/**
-	 * Prepend to the boot classpath.
-	 */
-	public static final int PREPEND_BOOT_CLASSPATH = 3;
-	
-	/**
-	 * Append a folder to the java.library.path (for things like
-	 * dll's). This should result in a folder only.
-	 * The nlsLocalize flag contribute via plugin will be
-	 * ignored for this type flag. 
-	 */
-	public static final int APPEND_JAVA_LIBRARY_PATH = 4;
-	
-	/**
-	 * Get the java project that we are contributing for.
-	 * 
-	 * @return javaproject, may be <code>null</code>
-	 * 
-	 * @since 1.0.0
-	 */
-	public IJavaProject getJavaProject();
-		
-	/**
-	 * Add a project to the classpath. The type flag tells where to add it.
-	 * 
-	 * @param project
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeProject(IProject project) throws CoreException;
-	
-	/**
-	 * Add an external file/folder to the classpath. The type flag tells where to add it.
-	 * 
-	 * @param classpath
-	 * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
-	 * 
-	 * @deprecated use contributeClasspath(URL, int) instead.
-	 * @see #contributeClasspath(URL, int)
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(String classpath, int typeFlag);
-	
-	/**
-	 * Add an external file/folder to the classpath. The type flag tells where to add it.
-	 * 
-	 * @param classpathURL
-	 * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(URL classpathURL, int typeFlag);	
-	
-	/**
-	 * Add an external files/folders to the classpath. The type flag tells where to add it.
-	 * 
-	 * @param classpaths
-	 * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
-	 * 
-	 * @deprecated use contributeClasspath(URL[], int) instead.
-	 * @see #contributeClasspath(URL[], int)
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(String[] classpaths, int typeFlag);	
-
-	/**
-	 * Add an external files/folders to the classpath. The type flag tells where to add it.
-	 * 
-	 * @param classpathURLs
-	 * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(URL[] classpathURLs, int typeFlag);	
-	
-	/**
-	 * Add a file/folder from a plugin in the running Eclipse to the classpath. The type flag tells where to add it.
-	 * In development mode it will find the bin class files instead if proxy.jars is setup correctly.
-	 * <p>
-	 * If nlsLocalize is <code>true</code>, then it will also search through the fragments in this manner:
-	 * (Note: if <code>false</code> it will still search in the fragments, but it will only return the first file found that matches.
-	 * <p>
-	 * Find in the plugin and all of the fragments those that match the name exactly
-	 * <p>
-	 * This is useful for nls where the nls for the filename will be in one or more of the fragments of the plugin.	 	 
-	 * 
-	 * @param bundle The bundle it can be found in.
-	 * @param relativePath Path to file/folder relative to bundle root. Or <code>null</code> if it is the bundle/fragment itself (for when the bundle has been jar'ed up). 
-	 *   <b>Note: </b>If it is <code>APPEND_JAVA_LIBRARY_PATH</code>, it should be folder and nlsLocalize will be ignored.
-	 *   In this case be careful that if a folder and the plugin is jarred that the folder <b>IS NOT THE ROOT OF THE PLUGIN</b>. This will
-	 *   cause the entire plugin to be extracted instead of just the directory containing the libraries. If the libraries are in the root
-	 *   of a jarred plugin then a separate cache directory should be created instead and the libraries of interest extracted to there. And
-	 *   then point to the cache directory instead.
-	 * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
-	 * @param nlsLocalize The usual value should be <code>false</code>. Use <code>true</code> if should look through fragments to gather them all as described in this methods description. This will work for jarred bundles/fragments too.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(Bundle bundle, String relativePath, int typeFlag, boolean nlsLocalize);	
-	
-	/**
-	 * Same as {@link #contributeClasspath(Bundle, String, int, boolean)} except an IPath can be used as the relative path.
-	 * 
-	 * @param bundle
-	 * @param relativePath path to file within bundle. Or <code>null</code> if it is the bundle/fragment itself (for when the bundle has been jar'ed up).
-	 * @param typeFlag
-	 * @param nlsLocalize
-	 * 
-	 * @see #contributeClasspath(Bundle, String, int, boolean)
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(Bundle bundle, IPath relativePath, int typeFlag, boolean nlsLocalize);	
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionInfo.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionInfo.java
deleted file mode 100644
index 9d25a4524..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionInfo.java
+++ /dev/null
@@ -1,164 +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.proxy.core;
-
-import java.util.Map;
-
-import org.eclipse.jdt.core.IJavaProject;
- 
-/**
- * This interface will be passed to the IConfigurationContributor initialize method. It has info
- * that may be needed by the contributor. It may be saved for later use, but if classpaths have changed,
- * it won't be kept up to date.
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#initialize(IConfigurationContributionInfo)
- * @since 1.0.0
- */
-public interface IConfigurationContributionInfo {
-	
-	/**
-	 * Hold the visible and hidden container paths. 
-	 * A visible container path means it has been exported up to the top-level project. And also
-	 * the array of those not visible. The paths are the String form (i.e. IPath.toString()).
-	 * <p>
-	 * These are the values of the {@link IConfigurationContributionInfo#getContainerIds()} map.
-	 * 
-	 * @since 1.2.0
-	 */
-	public static class ContainerPaths {
-		
-		private final String[] visiblePath;
-		private final String[] hiddenPaths;
-		private final String containerId;
-	
-		ContainerPaths(String containerId, String[] visiblePath, String[] hiddenPaths) {
-			// Not meant to be subclassed or constructed by clients.
-			this.containerId = containerId;
-			this.visiblePath = visiblePath;
-			this.hiddenPaths = hiddenPaths;
-		}
-		
-		
-		/**
-		 * @return Returns the containerId.
-		 * 
-		 * @since 1.2.0
-		 */
-		public final String getContainerId() {
-			return containerId;
-		}
-		
-		/**
-		 * Array of visible container paths. A path is visible if it is exported up to and can
-		 * see by the top-level project.
-		 * 
-		 * @return
-		 * 
-		 * @since 1.2.0
-		 */
-		public final String[] getVisibleContainerPaths() {
-			return visiblePath;
-		}
-		
-		/**
-		 * Array of hidden container paths. A path is hidden if it is not exported up to and cannot
-		 * see by the top-level project.
-		 * 
-		 * @return
-		 * 
-		 * @since 1.2.0
-		 */
-		public final String[] getHiddenContainerPaths() {
-			return hiddenPaths;
-		}
-		
-		/**
-		 * Get all of the paths together, both visible and hidden.
-		 * @return
-		 * 
-		 * @since 1.2.0
-		 */
-		public String[] getAllPaths() {
-			String[] allPaths = new String[visiblePath.length+hiddenPaths.length];
-			System.arraycopy(visiblePath, 0, allPaths, 0, visiblePath.length);
-			System.arraycopy(hiddenPaths, 0, allPaths, visiblePath.length, hiddenPaths.length);
-			return allPaths;
-		}
-	}
-
-	/**
-	 * Get the java project that we are contributing for.
-	 * 
-	 * @return javaproject, may be <code>null</code>
-	 * 
-	 * @since 1.0.0
-	 */
-	public IJavaProject getJavaProject();
-	
-	/**
-	 * Return the map of containers (the key) that are found in the classpath. This is useful for determining
-	 * if the container impliments a contributor interface.
-	 * <p>
-	 * Value will be {@link ContainerPaths}
-	 * 
-	 * @return Map of containers. Keys of type String for container id (e.g. "SWT_CONTAINER" for a container classpath of "/SWT_CONTAINER/PDE/xyz".
-	 * 	Values will be {@link ContainerPaths} Empty if launch not in a project.
-	 * 
-	 * @since 1.0.0
-	 */
-	public Map getContainers();
-	
-	/**
-	 * Return the map of container ids that are found in the classpath.
-	 * <p>
-	 * Key will be String and it is the first segment of a container path. Value will {@link ContainerPaths}. This
-	 * will contain all of the visible and hidden paths that the project can see. All of the paths will have
-	 * the key (container id) as the first segment of the path.
-	 * 
-	 * @return map of container ids. Keys of type String. Values will be {@link ContainerPaths} Empty if launch not in a project.
-	 * 
-	 * @since 1.0.0
-	 */
-	public Map getContainerIds();
-	
-	/**
-	 * Return the map of plugin ids (the key) that are found in the classpath.
-	 * <p>
-	 * Value will <code>Boolean</code> and will be true if plugin was visible to top-level project.
-	 * 
-	 * @return map of plugin ids. Key of type String. Empty if launch not in a project.
-	 * 
-	 * @since 1.0.0
-	 */
-	public Map getPluginIds();	
-	
-	/**
-	 * Return the map of project paths (the key) that are found in the classpath. The top-level project
-	 * will NOT be in this list since it is assumed to be visible to itself.
-	 * <p>
-	 * Value will <code>Boolean</code> and will be true if project was visible to top-level project.
-	 * 
-	 * @return map of project paths. Key of type <code>IPath</code>. Empty if launch not in a project.
-	 * 
-	 * @see org.eclipse.core.runtime.IPath
-	 * @since 1.0.0
-	 */
-	public Map getProjectPaths();
-	
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributor.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributor.java
deleted file mode 100644
index d456b480a..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributor.java
+++ /dev/null
@@ -1,76 +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.proxy.core;
-/*
-
-
- */
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
-
-/**
- * This interface is used to contribute to the configuration that will be
- * used to start a proxy registry. 
- * 
- * @since 1.0.0
- */
-public interface IConfigurationContributor {
-	
-	/**
-	 * Called first before any of the other calls. This can be used to do any internal initializations
-	 * required by the other calls. That way the other calls can have the order changed as the implementation
-	 * requires.
-	 * <p>
-	 * NOTE: For those who nest configuration contributors (i.e. within an implementation of a contributor, more
-	 * contributors are discovered) then it is imperitive that when those contributors are discovered that this method
-	 * be called on them too. This is necessary so the contract with contributors can be followed. It is best if the
-	 * discoveries are actually done in the initialize method itself so that it can pass the launch info right there.
-	 * 
-	 * @param info info contains things like containers visible, etc.
-	 * 
-	 * @see IConfigurationContributionInfo
-	 * @since 1.0.0
-	 */
-	public void initialize(IConfigurationContributionInfo info);
-	
-	/**
-	 * Contribute to the classpath. The controller is used to do the actual contribution.
-	 * 
-	 * @param controller
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeClasspaths(IConfigurationContributionController controller) throws CoreException;
-
-	/**
-	 * Contribute updates to the configuration. It will be called before the launch has started.
-	 * 
-	 * @param config
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeToConfiguration(ILaunchConfigurationWorkingCopy config) throws CoreException;
-	
-	/**
-	 * Contribute to the registry (or interact with the remote vm) after the registry has been
-	 * created.
-	 * 
-	 * @param registry
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeToRegistry(ProxyFactoryRegistry registry);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConstructorProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConstructorProxy.java
deleted file mode 100644
index 0bc00835c..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConstructorProxy.java
+++ /dev/null
@@ -1,42 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * This is a proxy that allows a constructor to exist in the target VM
- * and be referenced in the IDE VM
- * Creation date: (1/17/00 1:21:52 PM)
- * @author: Joe Winchester
- */
-public interface IConstructorProxy extends IAccessibleObjectProxy {
-/**
- * Return a new instance with no creation arguments,
- * i.e. for a null constructor
- * Creation date: (1/17/00 1:22:11 PM)
- */
-IBeanProxy newInstance() throws ThrowableProxy;
-/**
- * Return a new instance with the specified creation arguments
- * Creation date: (1/17/00 1:22:11 PM)
- */
-IBeanProxy newInstance(IBeanProxy[] creationArguments) throws ThrowableProxy;
-
-IBeanProxy newInstanceCatchThrowableExceptions();
-IBeanProxy newInstanceCatchThrowableExceptions(IBeanProxy[] creationArguments);
-
-IBeanTypeProxy[] getParameterTypes();
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IDimensionBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IDimensionBeanProxy.java
deleted file mode 100644
index 549c1cb4f..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IDimensionBeanProxy.java
+++ /dev/null
@@ -1,34 +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.proxy.core;
-/*
-
-
- */
-
-
-
-/**
- * Interface to a Dimension bean proxy.
- * <p>
- * These are common for different windowing systems, e.g. AWT and SWT. So this here
- * is common interface for them.
- * Creation date: (4/7/00 3:46:39 PM)
- * @author: Administrator
- */
-public interface IDimensionBeanProxy extends IBeanProxy {
-	public int getHeight();
-	public int getWidth();
-	public void setHeight(int height);
-	public void setWidth(int width);
-	public void setSize(int width, int height);
-	public void setSize(IDimensionBeanProxy dim);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExpression.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExpression.java
deleted file mode 100644
index 561fe4112..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExpression.java
+++ /dev/null
@@ -1,1009 +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.proxy.core;
-
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.IExpressionConstants;
-import org.eclipse.jem.internal.proxy.initParser.tree.NoExpressionValueException;
- 
-/**
- * This is an expression. It will be evaluated on the other side. The difference between an
- * expression and using IMethodProxy's, IConstructorProxy's, etc. is the granularity. The proxies
- * are one round-trip to the other side for each access or execution. The expression builds them up
- * and will execute them all at once on the other side. Another difference is that the reflection
- * will be done on the other side too. For instance when invoking a method, the method name is
- * passed into the expression as a string then reflected and then invoked, while with method
- * proxies, the string is used to find the proxy on the other side, and then a later round-trip
- * will be used to invoke it.
- * <p>
- * Also an expression is a one-time use object. It can't be reused a second time. A new one must be
- * built up again.
- * <p>
- * We are not using separate instances of expressions, and types of expressions, because we don't
- * want to build up many objects (in a form of an expression tree) that will then be thrown away
- * (one for each expression in the nested list of expressions). We just build the command list as
- * we build the expression.
- * <p>
- * To use, you call the IStandardBeanProxyFactory's createExpression method. An IExpression is
- * returned. From there you will start creating the contents of the expression. And then you will
- * finally either getExpressionValue() to get the final value of the expression, or use
- * invokeExpression() to just execute the expression(s). If you use getExpressionValue(), there can
- * only be one root expression. If you use invokeExpression there can be more than one root
- * expression, and they will all be executed.
- * <p>
- * Since sequence is so important, it will be tested and if anything is done out of order an
- * IllegalStateException will be thrown.
- * <p>
- * Each time an expression is created, one argument passed in will be <code>forExpression</code> flag.
- * This is a set of constants used as a clue for what expression this expression is being created.
- * This is for a sanity check on the state. For example, when creating the array expression for an
- * array access, the ARRAYACCESS_ARRAY flag is passed in. This way if the current expression on the
- * stack is not for an array access waiting for the array expression, an IllegalStateException will be thrown.
- * Without this flag, it would be easy to accidently create the wrong expression at the wrong time.
- * Once such an error occurs, this IExpression will no longer be valid. IllegalStateException will be thrown
- * for any type of access.
- * <p>
- * It is guarenteed that the entire stack of commands will be sent without stopping except for IllegalStateException
- * due to out of order expressions.
- * <p>
- * <b>Note:</b> This interface is not meant to be neither instantiated nor implemented by customers.
- * It is the interface into the expression processing. It is to be instantiated through the createExpression request.
- * The {@link org.eclipse.jem.internal.proxy.core.Expression} class is available as API. It is not meant to
- * be instantiated by customers, but customers can take the IExpression and cast to Expression for some advanced
- * API.
- *  
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#createExpression()
- * @see java.lang.IllegalStateException
- * @since 1.0.0
- */
-public interface IExpression extends IExpressionConstants {
-	
-	/**
-	 * Return the registry this expression is working against.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public ProxyFactoryRegistry getRegistry();
-	
-	/**
-	 * Invoke the expression(s). If there is more than one root expression, it will invoke them
-	 * in the order created. If the expression stack is not complete, then <code>IllegalStateException</code>
-	 * will be thrown.
-	 * 
-	 * @throws ThrowableProxy
-	 * @throws IllegalStateException
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void invokeExpression() throws ThrowableProxy, NoExpressionValueException, IllegalStateException;
-	
-	/**
-	 * Return whether the expression is valid. It would be invalid if any of the create... calls had thrown an
-	 * exception or if the expression has already been evaluated (invoked or getExpressionValue()).
-	 * 
-	 * @return <code>true</code> if expression is valid, <code>false</code> if there had been some error, or if the expression has already been evaluated.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isValid();
-	
-	/**
-	 * Close the expression. This needs to be called if for some reason {@link IExpression#invokeExpression()} or {@link IExpression#getExpressionValue()}
-	 * were not called. It is not an error to always call this after these calls. It will not have any problems with the expression already
-	 * being closed. invoke and getvalue automatically call close for you. If you don't call close in case of an error, the resources
-	 * for the expression will not be freed up. 
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	public void close();
-	
-	/**
-	 * Invoke the root expression and return the value of the expression. If the expression stack
-	 * is not complete, or if there is more than one root expression, then <code>IllegalStateException</code>
-	 * will be thrown.
-	 * 
-	 * @return The value of the root expression. 
-	 * 
-	 * @throws ThrowableProxy
-	 * @throws IllegalStateException
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	public IBeanProxy getExpressionValue() throws ThrowableProxy, NoExpressionValueException, IllegalStateException;
-			
-	/**
-	 * Create an Array Access (e.g. x[3]).
-	 * This must be followed by create expressions for:
-	 * <pre>
-	 *  <code>ARRAYACCESS_ARRAY</code>
-	 *  <code>ARRAYACCESS_INDEX</code> an indexCount times. 
-	 * </pre>
-	 * <p>
-	 * So the array access must be followed by 1+indexCount expressions.
-	 * 
-	 * @param forExpression This is for what expression this expression is being created.
-	 * @param indexCount The number of index expressions that will be created.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createArrayAccess(ForExpression forExpression, int indexCount) throws IllegalStateException;
-	
-	/**
-	 * Create an Array Creation (e.g. <code>new int[3]</code> or <code>new int[3][]</code> or <code>new int[] {3, 4}</code>).
-	 * If <code>dimensionExpressionCount</code> is zero, then there must be an initializer. This is because
-	 * if there are any dimension expressions, then initializers are invalid and visa-versa.
-	 * <p>
-	 * The dimensionExpressionCount is for how many dimensions have an expression in them. For instance,
-	 * <code>new int[3]</code> will have a dimensionExpressionCount of 1. While
-	 * <code>new int[3][]</code> will also have count of 1. And finally
-	 * <code>new int []</code> will have a count of 0.
-	 * <p>
-	 * This must be followed by create expressions for:
-	 * <pre>
-	 *  <code>ARRAYCREATION_DIMENSION</code> a dimensionExpressionCount times, 
-	 *  or an <code>createArrayInitializer()</code> if dimension count is 0.
-	 * </pre>
-	 *  
-	 * @param forExpression
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format. It must also include the correct number of  <code>[]</code> at the end.
-	 * @param dimensionExpressionCount
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createArrayCreation(ForExpression forExpression, String type, int dimensionExpressionCount) throws IllegalStateException;
-
-	/**
-	 * Create an Array Creation (e.g. <code>new int[3]</code> or <code>new int[3][]</code> or <code>new int[] {3, 4}</code>).
-	 * If <code>dimensionExpressionCount</code> is zero, then there must be an initializer. This is because
-	 * if there are any dimension expressions, then initializers are invalid and visa-versa.
-	 * <p>
-	 * The dimensionExpressionCount is for how many dimensions have an expression in them. For instance,
-	 * <ol>
-	 * <li><code>new int[3]</code> will have a dimensionExpressionCount of 1. While
-	 * <li><code>new int[3][]</code> will also have count of 1. And finally
-	 * <li><code>new int []</code> will have a count of 0.
-	 * </ol>
-	 * The expressions that follow if dimensionExpressionCount is not zero must evaluate to be compatible to an int type (i.e. byte, char, short, or int).
-	 * Each expression will be used to create an array for that dimension of that size. For example <code>new int[3][]</code> will have an
-	 * dimension expression that evaluates to "3", and so it will create an array int[3][].
-	 * <p>
-	 * This must be followed by create expressions for:
-	 * 	dimensionExpressionCount times an: <code>ARRAYCREATION_DIMENSION</code>
-	 *  or an createArrayInitializer if dimension count is 0.
-	 *  
-	 * @param forExpression
-	 * @param type This is the type. This must be the actual type with the correct total number of dimensions (e.g. "java.lang.Object[][]").
-	 * @param dimensionExpressionCount number of int valued expressions that follow that give the size for each dimension.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createArrayCreation(ForExpression forExpression, IProxyBeanType type, int dimensionExpressionCount) throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * Create an array initializer. (e.g. <code>{2,3}</code>).
-	 * This one is unusual in that there is no forExpression. That is because array initializers are only valid in
-	 * certain places. And so if called when not expected, this is an IllegalStateException.
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	expressionCount times an: <code>ARRAYINITIALIZER_EXPRESSION</code>
-	 * 		except if the expression is another array initializer. That is valid and doesn't have a forExpression,
-	 * 		but it does count as one of the expressionCounts.
-	 * 
-	 * @param expressionCount Number of expressions, may be 0.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createArrayInitializer(int expressionCount) throws IllegalStateException;
-		
-	/**
-	 * Create a cast expression (e.g. <code>(short)10</code> or <code>(java.lang.String) "asd"</code>)
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	<code>CAST_EXPRESSION</code> 
-	 *  
-	 * @param forExpression
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createCastExpression(ForExpression forExpression, String type) throws IllegalStateException;
-
-	/**
-	 * Create a cast expression (e.g. <code>(short)10</code> or <code>(java.lang.String) "asd"</code>)
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	<code>CAST_EXPRESSION</code> 
-	 *  
-	 * @param forExpression
-	 * @param type This is the type.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createCastExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException;
-		
-	/**
-	 * Create a new class instance expression (e.g. <code>new java.lang.Integer(5)</code>)
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	argumentCount times an: <code>CLASSINSTANCECREATION_ARGUMENT</code>
-	 * 
-	 * <p>
-	 * <b>Note:</b> This method can throw {@link org.eclipse.jem.internal.proxy.common.UnresolvedCompilationError} while processing
-	 * and can be caught by an Expression try/catch. This is not thrown such that it can be caught by a real java try/catch.
-	 * 
-	 * @param forExpression
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
-	 * @param argumentCount
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createClassInstanceCreation(ForExpression forExpression, String type, int argumentCount) throws IllegalStateException;
-
-	/**
-	 * Create a new class instance expression (e.g. <code>new java.lang.Integer(5)</code>)
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	argumentCount times an: <code>CLASSINSTANCECREATION_ARGUMENT</code>
-	 * 
-	 * <p>
-	 * <b>Note:</b> This method can throw {@link org.eclipse.jem.internal.proxy.common.UnresolvedCompilationError} while processing
-	 * and can be caught by an Expression try/catch. This is not thrown such that it can be caught by a real java try/catch.
-	 * 
-	 * @param forExpression
-	 * @param type This is the type.
-	 * @param argumentCount
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createClassInstanceCreation(ForExpression forExpression, IProxyBeanType type, int argumentCount) throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * Create a conditional expression (e.g. <code>x != 3 ? 4 : 5</code>)
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	<code>CONDITIONAL_CONDITION</code>
-	 * 	<code>CONDITIONAL_TRUE</code>
-	 * 	<code>CONDITIONAL_FALSE</code>	
-	 * 
-	 * @param forExpression
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createConditionalExpression(ForExpression forExpression) throws IllegalStateException;
-	
-	/**
-	 * Create a field access (e.g. <code>java.awt.Color.red</code>)
-	 * <p>
-	 * Note: At this time we require a receiver. In the future it may be possible to not have one, but
-	 * for that we need a <code>this</code> object to know who the receiver implicitly is.
-	 * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	<code>FIELD_RECEIVER</code> if hasReceiver is <code>true</code>
-	 * 
-	 * @param forExpression
-	 * @param fieldName The name of the field.
-	 * @param hasReceiver Has a receiver flag. Currently this must always be true. This is because can't tell what class to look into for the field without a receiver.
-	 * @throws IllegalArgumentException
-	 * @throws IllegalStateException
-	 * 
-	 * @see IExpression#createTypeReceiver(String)
-	 * @since 1.0.0
-	 */
-	public void createFieldAccess(ForExpression forExpression, String fieldName, boolean hasReceiver) throws IllegalArgumentException, IllegalStateException;
-
-	/**
-	 * Create a field access (e.g. <code>java.awt.Color.red</code>)
-	 * <p>
-	 * Note: At this time we require a receiver for non-static access. In the future it may be possible to not have one, but
-	 * for that we need a <code>this</code> object to know who the receiver implicitly is.
-	 * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * <pre>
-	 * 	<code>FIELD_RECEIVER</code> if hasReceiver is <code>true</code>
-	 * </pre>
-	 * 
-	 * @param forExpression
-	 * @param fieldProxy The field proxy for the field.
-	 * @param hasReceiver Has a receiver flag.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @see IExpression#createTypeReceiver(String)
-	 * @since 1.0.0
-	 */
-	public void createFieldAccess(ForExpression forExpression, IProxyField fieldProxy, boolean hasReceiver) throws IllegalStateException, IllegalArgumentException;
-
-	/**
-	 * Create an if/else stmt. Since this is a statment, there is no ForExpression. ROOT_EXPRESSION must be the next expression type.
-	 * <p<
-	 * This must be followed by createExpressions for:
-	 * <pre>
-	 *   <code>IF_CONDITION</code> The if test, must return boolean.
-	 *   <code>IF_TRUE</code> The if condition is true clause. The clause may be an expression, or a block.
-	 *   <code>IF_ELSE</code>  if hasElseClause is <code>true</code>. The else clause. The clause may be an expression, or a block.
-	 * </pre>
-	 * 
-	 * @param hasElseClause
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createIfElse(boolean hasElseClause) throws IllegalStateException;
-	
-	/**
-	 * Create an infix expression (e.g. <code>3 + 4</code> or <code>3 + 4 + 5</code>).
-	 * <p>
-	 * If there are more than 2 operands (all with the same operator) then for convienence all of
-	 * the expression can be done in one expression than requiring several, one for each operator.
-	 * If they are different operators, then different expressions will be required.
-	 * <p>
-	 * <pre>
-	 * This must be followed by createExpressions for:
-	 * 	<code>INFIX_LEFT</code>
-	 * 	<code>INFIX_RIGHT</code>
-	 * 	extendedOperandCount times an: <code>INFIX_EXTENDED</code>
-	 * </pre>
-	 * 
-	 * @param forExpression
-	 * @param operator The operator.
-	 * @param extendedOperandCount The number of extended operands. May be zero.
-	 * @throws IllegalStateException
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.common.IExpressionConstants#IN_AND
-	 * @since 1.0.0
-	 */
-	public void createInfixExpression(ForExpression forExpression, InfixOperator operator, int extendedOperandCount) throws IllegalStateException;
-	
-	/**
-	 * Create an instanceof expression (e.g. <code>x instanceof java.lang.String</code>
-	 * <p>
-	 * This must be followed by createExpression for:
-	 * 	<code>INSTANCEOF_VALUE</code>
-	 * @param forExpression
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createInstanceofExpression(ForExpression forExpression, String type) throws IllegalStateException;
-	
-	/**
-	 * Create an instanceof expression (e.g. <code>x instanceof java.lang.String</code>
-	 * <p>
-	 * This must be followed by createExpression for:
-	 * 	<code>INSTANCEOF_VALUE</code>
-	 * @param forExpression
-	 * @param type This is the type.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createInstanceofExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * Create a method invocation expression (e.g. <code>java.lang.String.valueOf(10)</code>).
-	 * When using a string the method invoked will be the one most compatible with the arguments sent. 
-	 * This allows overloading a method to occur when coming in from a parse tree, since the parse tree
-	 * doesn't know the exact method to use.
-	 * <p>
-	 * Note: At this time we require a receiver. In the future it may be possible to not have one, but
-	 * for that we need a <code>this</code> object to know who the receiver implicitly is.
-	 * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
-	 * <p>
-	 * This must be followed by createExpression for:
-	 * 	<code>METHOD_RECEIVER</code>
-	 * 	argumentCounts times expressions for: <code>METHOD_ARGUMENT</code>
-	 * 
-	 * @param forExpression
-	 * @param name The name of the method
-	 * @param hasReceiver Has a receiver flag. Currently this must always be true.
-	 * @param argumentCount Count of number of arguments. May be zero.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @see IExpression#createTypeReceiver(String)
-	 * @since 1.0.0
-	 */
-	public void createMethodInvocation(ForExpression forExpression, String name, boolean hasReceiver, int argumentCount) throws IllegalStateException, IllegalArgumentException;
-
-	/**
-	 * Create a method invocation expression (e.g. <code>java.lang.String.valueOf(10)</code>)
-	 * <p>
-	 * Note: At this time we require a receiver. In the future it may be possible to not have one, but
-	 * for that we need a <code>this</code> object to know who the receiver implicitly is.
-	 * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
-	 * <p>
-	 * This must be followed by createExpression for:
-	 * 	<code>METHOD_RECEIVER</code>
-	 * 	argumentCounts times expressions for: <code>METHOD_ARGUMENT</code>
-	 * 
-	 * @param forExpression
-	 * @param methodProxy The proxy of the method
-	 * @param hasReceiver Has a receiver flag. Currently this must always be true.
-	 * @param argumentCount Count of number of arguments. May be zero.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @see IExpression#createTypeReceiver(String)
-	 * @since 1.0.0
-	 */
-	public void createMethodInvocation(ForExpression forExpression, IProxyMethod methodProxy, boolean hasReceiver, int argumentCount) throws IllegalStateException, IllegalArgumentException;
-
-	/**
-	 * Create a prefix expression (e.g. <code>!flag</code> or <code>-(3+4)</code>).
-	 * If you are just trying to create a signed numeric literal, just use the createPrimitiveLiteral passing in a
-	 * negative value. You don't need to use prefix expression for that.
-	 * <p>
-	 * <pre>
-	 * This must be followed by createExpressions for:
-	 * 	<code>PREFIX_OPERAND</code>
-	 * </pre>
-	 * @param forExpression
-	 * @param operator The operator. The values come from IExpressionConstants, the prefix constants.
-	 * @throws IllegalStateException
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.common.IExpressionConstants#PRE_PLUS
-	 * @since 1.0.0
-	 */
-	public void createPrefixExpression(ForExpression forExpression, PrefixOperator operator) throws IllegalStateException;
-	
-	/**
-	 * Create a reference to <code>null</code>.
-	 * 
-	 * @param forExpression
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createNull(ForExpression forExpression) throws IllegalStateException;
-	
-	/**
-	 * Create a type literal (e.g. <code>java.lang.String.class</code>). This is used when the type is being used as value itself, not
-	 * as a receiver for a field or method or constructor or instanceof. Like as an argument to a method.
-	 * <p>
-	 * Note: If you want a type literal to be an IProxyBeanType, just use {@link IExpression#createProxyExpression(ForExpression, IProxy)} and pass in the
-	 * IProxyBeanType.
-	 * 
-	 * @param forExpression
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createTypeLiteral(ForExpression forExpression, String type) throws IllegalStateException;
-	
-	/**
-	 * Create a type receiver. This is where a type is used as the receiver of a field access or a method invocation.
-	 * (e.g. <code>java.lang.String.valueOf(10)</code>). For this the "java.lang.String" IBeanTypeProxy is the type receiver.
-	 * <p>
-	 * This is unusual in that there is no forExpression. It isn't needed because these are only valid
-	 * in certain situations (method or field receiver) and if used anywhere else it is an error.
-	 * 
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createTypeReceiver(String type) throws IllegalStateException;
-
-	/**
-	 * Create a type receiver. This is where a type is used as the receiver of a field access or a method invocation.
-	 * (e.g. <code>java.lang.String.valueOf(10)</code>). For this the "java.lang.String" IProxyBeanType is the type receiver.
-	 * <p>
-	 * This is unusual in that there is no forExpression. It isn't needed because these are only valid
-	 * in certain situations (method or field receiver) and if used anywhere else it is an error.
-	 * 
-	 * @param type This is the type proxy.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createTypeReceiver(IProxyBeanType type) throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * Create a boolean primitive literal (e.g. <code>true</code>).
-	 * 
-	 * @param forExpression
-	 * @param value The boolean value for the literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, boolean value) throws IllegalStateException;
-	
-	/**
-	 * Create a character literal (e.g. <code>'a'</code> or <code>'\n'</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The character value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, char value) throws IllegalStateException;
-
-	/**
-	 * Create a byte literal (e.g. <code>(byte)10</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The byte value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, byte value) throws IllegalStateException;
-
-	/**
-	 * Create a double literal (e.g. <code>10d</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The double value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, double value) throws IllegalStateException;
-
-	/**
-	 * Create a float literal (e.g. <code>10f</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The float value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, float value) throws IllegalStateException;
-	
-	/**
-	 * Create a int literal (e.g. <code>100000</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The int value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, int value) throws IllegalStateException;
-	
-	/**
-	 * Create a long literal (e.g. <code>10l</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The long value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, long value) throws IllegalStateException;
-	
-	/**
-	 * Create a short literal (e.g. <code>(short)10</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The short value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, short value) throws IllegalStateException;
-	
-	/**
-	 * Create a string literal (e.g. <code>"asdf"</code>). The value is the actual string, with escapes already
-	 * translated into the true character values.
-	 *  
-	 * @param forExpression
-	 * @param value The string value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createStringLiteral(ForExpression forExpression, String value) throws IllegalStateException;
-	
-	/**
-	 * Create a subexpression.
-	 * <p>
-	 * A subexpression allows, at any time, to fork off the expression stack and do some other sets of expressions.
-	 * When the cooresponding {@link #createSubexpressionEnd()} is called, all of the expression results on the
-	 * stack that accumulated during the subexpression evaluation will be thrown away and the stack will be
-	 * what it was at the start of subexpression. Any ExpressionProxies that were resolved during the evaluation 
-	 * will not be thrown away and will still be valid.
-	 * <p>
-	 * This is useful if in the middle of an expression (such as method invocation and an argument is needed) to
-	 * go off and get the necessary value. This will allow expressions that require ROOTEXPRESSION state like a 
-	 * try/catch. If you know the expression doesn't need this, then it is more efficient to not use subexpression.
-	 * <p>
-	 * For example:
-	 * <pre><code>
-	 *   new XYZ(
-	 *     {(subexpression)
-	 *      try {
-	 *         x = 3*y.get();
-	 *      } catch (Exception e) {
-	 *         x =4;
-	 *      }
-	 *     (end subexpression)}
-	 *     x);
-	 * </code></pre>
-	 * 
-	 * In the above example, we needed to calculate "x" as the argument for XYZ, but it was too complicated and
-	 * could throw exceptions. So we used a subexpression instead. 
-	 * <p>
-	 * Of course the following would of been the better way to do it without subexpressions. But sometimes
-	 * your code is in a position that you don't know you need to do this until it is too late.
-	 *  <pre><code>
-	 *   try {
-	 *      x = 3*y.get();
-	 *   } catch (Exception e) {
-	 *      x =4;
-	 *   }
-	 *   new XYZ(x);
-	 * </code></pre>
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createSubexpression() throws IllegalStateException;
-	
-	public void createSubexpressionEnd() throws IllegalStateException;
-	
-	/**
-	 * Create an expression that has an existing bean proxy as its value.
-	 * 
-	 * @param forExpression This is for what expression this expression is being created.
-	 * @param proxy The proxy that should be used as a value, either a bean proxy or an expression proxy.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createProxyExpression(ForExpression forExpression, IProxy proxy) throws IllegalStateException, IllegalArgumentException;
-		
-	/**
-	 * Create an assignment expression between a VariableReference and an expression. The left operand must be a variable reference (e.g. FieldAccess or
-	 * ArrayAccess). The right operand may be any expression that results in a value.
-	 * <p>
-	 * <pre>
-	 * This must be followed by createExpressions for:
-	 *  <code>ASSIGNMENT_LEFT</code>
-	 * 	<code>ASSIGNMENT_RIGHT</code>
-	 * </pre>
-	 * @param forExpression
-	 * @throws ThrowableProxy
-	 * @throws IllegalStateException
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createAssignmentExpression(ForExpression forExpression) throws IllegalStateException;
-	
-	/**
-	 * Create an assignment expression (e.g. x = 3+4) where x will be assigned to the ExpressionProxy. 
-	 * It may be used later on as a value in {@link IExpression#createExpressionProxyExpression(int, ExpressionProxy)}.
-	 * Or if callbacks were added, the callbacks would be called to return the true IBeanProxy value of the expression proxy when the complete
-	 * IExpression has been evaluated. The value of the assignment expression (e.g. x) will be passed on into the next expression.
-	 * <p>
-	 * <pre>
-	 * This must be followed by createExpressions for:
-	 * 	<code>ASSIGNMENT_RIGHT</code>
-	 * </pre>
-	 * <p>
-	 * <b>Note:</b> It is guarenteed as part of the contract that expression proxies will be notified through the listeners of the final state in the
-	 * order the expression proxies were created. 
-	 * @param forExpression This is for what expression this expression is being created.
-	 * @return a proxy to the expression value. 
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createProxyAssignmentExpression(ForExpression forExpression) throws IllegalStateException;
-	
-	/**
-	 * Create a reassignment expression. This is like the original proxy assignment except that instead of returning a new proxy, it
-	 * reassigns the new value to the existing proxy. This cannot be used on IBeanTypeExpressionProxy's. That is because
-	 * they are controlled by the registry and severe errors would occur if they were reassigned.
-	 * <p>
-	 * <pre>
-	 * This must be followed by createExpressions for:
-	 * 	<code>ASSIGNMENT_RIGHT</code>
-	 * </pre>
-	 * <p>
-	 * <b>Note:</b> Since we are not creating a new proxy, the notification on the callbacks will be in the original order of proxies. This
-	 * does not change the notification position of this proxy.
-	 * 
-	 * @param forExpression
-	 * @param proxy
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException if the expression proxy is for a BeanType instead of just a standard expression proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createProxyReassignmentExpression(ForExpression forExpression, ExpressionProxy proxy) throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * A simple method invocation. This is a helper to make it easier for a simple method invoke. It uses only the 
-	 * method proxy (not a string to look it up), it uses a IBeanProxy receiver (not a complicated expression), and the
-	 * arguments are a mixture of IBeanProxies and ExpressionProxies. Also it can be called only when the next
-	 * expression must be a RootExpression.
-	 * 
-	 * @param method methodproxy of the method
-	 * @param receiver the receiver proxy or <code>null</code> if a static method
-	 * @param arguments array of arguments, where each element can only be either <code>null</code> for a null argument, <code>IProxy</code>. The array can be <code>null</code> if no arguments.
-	 * @param wantResult <code>true</code> if you want an ExpressionProxy back, otherwise it will return <code>null</code>. For performance reasons, only use <code>true</code> if you really need the expression proxy.
-	 * @return expression proxy if "wantResult" was true, else <code>null</code>.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createSimpleMethodInvoke(IProxyMethod method, IProxy receiver, IProxy[] arguments, boolean wantResult) throws IllegalStateException, IllegalArgumentException;
-
-	/**
-	 * A simple field access. This is a helper to make it easier for a simple field access. It uses only the 
-	 * field proxy (not a string to look it up), and the bean proxy that is the receiver. Also it can be called only when the next
-	 * expression must be a RootExpression. It doesn't allow complicated field access, such as <code>fielda.fieldb.fieldc</code>.
-	 * Since this is a field access, it will always return an ExpressionProxy. It doesn't make sense to have a simple field access
-	 * that doesn't return one.
-	 * 
-	 * @param field field proxy of the field.
-	 * @param receiver the receiver proxy. It may be <code>null</code> for static fields.
-	 * @return expression proxy to the result of the access.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createSimpleFieldAccess(IProxyField field, IProxy receiver) throws IllegalStateException, IllegalArgumentException;
-
-	/**
-	 * A simple field set. This is a helper to make it easier for a simple field access. It uses only the 
-	 * field proxy (not a string to look it up), and the bean proxy that is the receiver. Also it can be called only when the next
-	 * expression must be a RootExpression. It doesn't allow complicated field access setting, such as <code>fielda.fieldb.fieldc = 3</code>.
-	 * 
-	 * @param field field proxy of the field.
-	 * @param receiver the receiver proxy. It may be <code>null</code> if this is a static field.
-	 * @param value the value proxy to set it to or <code>null</code> if set to null value.
-	 * @param wantResult <code>true</code> if you want an ExpressionProxy back, otherwise it will return <code>null</code>. For performance reasons, only use <code>true</code> if you really need the expression proxy.
-	 * @return expression proxy if "wantResult" was true, else <code>null</code>.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createSimpleFieldSet(IProxyField field, IProxy receiver, IProxy value, boolean wantResult) throws IllegalStateException, IllegalArgumentException;
-
-	/**
-	 * Begin a block. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * <p>
-	 * Eventually {@link Expression#createBlockEnd()} must be called. You should use this pattern:
-	 * <pre><code>
-	 * exp.createBeginBlock();
-	 * try {
-	 *   exp.create something else.
-	 *   ...
-	 * } finally {
-	 *   exp.createEndBlock();
-	 * }
-	 * </code></pre>
-	 * 
-	 * @return blocknumber for the block just opened. Can be used in {@link Expression#createBlockBreak(int)}.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public int createBlockBegin() throws IllegalStateException;
-	
-	/**
-	 * Does a break for the specified block number. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * @param blockNumber
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createBlockBreak(int blockNumber) throws IllegalStateException;
-
-	/**
-	 * End a block. It will always end the inner most block that currently is on the stack. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * @throws IllegalStateException
-	 * 
-	 * @see Expression#createBlockBegin()
-	 * @since 1.1.0
-	 */
-	public void createBlockEnd() throws IllegalStateException;
-	
-	/**
-	 * Create a try/catch statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * There must be at least one catch or finally clause before try end or this is invalid.
-	 * <p>
-	 * This should be executed in the following way:
-	 * <pre><code>
-	 * exp.createTry();
-	 * try {
-	 *   ... create other exceptions ...
-	 *   ... create catch/finally clauses as needed.
-	 * } finally {
-	 *   if (exp.isValid())
-	 *     exp.createTryEnd();
-	 * }
-	 * </code></pre>
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createTry() throws IllegalStateException;
-	
-
-	/**
-	 * Create a catch clause for the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * <p>
-	 * Using this you can get just the exception as a proxy and/or execute some expressions as part of the catch clause.
-	 * <p>
-	 * This can be followed by RootExpressions, or another catch, or a finally, or a try end.
-	 *  
-	 * @param exceptionType the type of the exception to catch on.
-	 * @param wantExceptionReturned <code>true</code> if you want an expression proxy for the exception.
-	 * @return the ExpressionProxy for the exception if <code>wantExceptionReturned</code> is <code>true</code>, <code>null</code> otherwise.
-	 * 
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createTryCatchClause(IProxyBeanType exceptionType, boolean wantExceptionReturned) throws IllegalStateException, IllegalArgumentException;
-
-	/**
-	 * Create a catch clause for the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * <p>
-	 * Using this you can get just the exception as a proxy and/or execute some expressions as part of the catch clause.
-	 * <p>
-	 * This can be followed by RootExpressions, or another catch, or a finally, or a try end.
-	 *  
-	 * @param exceptionType the type of the exception to catch on.
-	 * @param wantExceptionReturned <code>true</code> if you want an expression proxy for the exception.
-	 * @return the ExpressionProxy for the exception if <code>wantExceptionReturned</code> is <code>true</code>, <code>null</code> otherwise.
-	 * 
-	 * @throws IllegalStateException
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createTryCatchClause(String exceptionType, boolean wantExceptionReturned) throws IllegalStateException;;
-
-	/**
-	 * Create a finally clause for the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * There must be no more catch clauses for the try statement after this finally clause.
-	 * 
-	 * @throws IllegalStateException
-	 * @since 1.1.0
-	 */
-	public void createTryFinallyClause() throws IllegalStateException;;
-	
-	/**
-	 * Create the end of the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * There must be no more catch/finally clauses after this except if a new try statement is started.
-	 * 
-	 * @throws IllegalStateException
-	 * @since 1.1.0
-	 */
-	public void createTryEnd() throws IllegalStateException;;
-	
-	/**
-	 * Create a throw. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * The next expression is the exception to be thrown.
-	 * <p>
-	 * This must be followed by createExpression for:
-	 * 	<code>THROW_OPERAND</code>
-	 *  
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createThrow() throws IllegalStateException;
-	
-	/**
-	 * Create a rethrow. This must be within a catch clause or there is an error.
-	 * <p> 
-	 * This is a shortcut for:
-	 * <pre><code>
-	 * try {
-	 *   .. do something ..
-	 * } catch (AnException e) {
-	 *   .. do something ..
-	 *   throw e;
-	 * }
-	 * </code></pre>
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createRethrow() throws IllegalStateException;
-
-	
-	/**
-	 * Mark the expression stack so that if there are IllegalStateExceptions errors that would make the
-	 * expression invalid, you can restore back to this mark point and the expression will now be valid
-	 * again and at the state it was when mark was created. All marks must be ended, and at the same nesting
-	 * level.
-	 * <p>
-	 * No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * <p>
-	 * It must be used in conjunction with endMark. You must use <code>mark;try/finally{endMark;}</code> because
-	 * the mark/endMark must match up. 
-	 * <pre><code>
-	 * int mark = expression.mark();
-	 * try {
-	 *   expression.create ...
-	 * } catch (IllegalStateException e) {
-	 *   process the error.
-	 * } finally {
-	 *   expression.endMark(mark); // After this, the expression will be valid again.
-	 * }
-	 * </code></pre>
-	 * <p>
-	 * However, the following code would be invalid nesting, and will throw an IllegalStateException on the createTryEnd. This is because
-	 * we tried to end the Try statement within the mark. This is invalid because if we let it go through it would
-	 * of popped the stack and when we got to the endMark the stack would of been popped past it and it could not
-	 * be restored to the same state as it was at the time of the mark. The try would of already been ended.
-	 * <pre><code>
-	 * expression.createTry();
-	 * int mark = expression.mark();
-	 * try {
-	 *   expression.create ...
-	 *   expression.createTryEnd();
-	 * } catch (IllegalStateException e) {
-	 *   process the error. The expression is now invalid.
-	 * } finally {
-	 *   expression.endMark(mark); // After this, the expression will be valid again, if it had gone invalid.
-	 * }
-	 * </code></pre>
-	 * <p>
-	 * If not at RootExpression at time of mark() request, an IllegalStateException will be thrown.
-	 * @return mark number, this number will be used in the cooresponding endMark.
-	 * @throws IllegalStateException
-	 * 
-	 * @see IExpression#endMark(int)
-	 * @since 1.1.0
-	 */
-	public int mark() throws IllegalStateException;
-	
-	/**
-	 * The end mark for a mark. 
-	 * <p>
-	 * No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * @param markNumber
-	 * @throws IllegalStateException
-	 * 
-	 * @see IExpression#mark()
-	 * @since 1.1.0
-	 */
-	public void endMark(int markNumber) throws IllegalStateException;
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExtensionRegistration.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExtensionRegistration.java
deleted file mode 100644
index f3ebe3822..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExtensionRegistration.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
- 
-
-/**
- * Extensions point ("extensions" elements of the "org.eclipse.jem.proxy.contributors" extension point).
- * <p>
- * Implementers of this interface are called when the appropriate registry type for a given classPath/plugin is present.
- * It is used to register the registry type specific extensions.
- * @since 1.1.0
- */
-public interface IExtensionRegistration {
-	
-	/**
-	 * This will be called before any contributeToRegistry's have been called. Typically all that
-	 * should be done in here is to register extension factories or constants. It is best if no
-	 * actual proxy calls are made. This is because the registry does not yet have all of the 
-	 * appropriate extensions registered and it would be possible to accidently reference a bean type
-	 * that has not yet had its appropriate factory registered.
-	 * <p>
-	 * <b>Note:</b> This may be called more than once if used in more than one extension or if used in a plugin and a container path and both are found.
-	 * Should take this into account and not register twice.
-	 * @param baseRegistry
-	 * 
-	 * @since 1.1.0
-	 */
-	public void register(BaseProxyFactoryRegistry baseRegistry);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IFieldProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IFieldProxy.java
deleted file mode 100644
index b79db1b40..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IFieldProxy.java
+++ /dev/null
@@ -1,45 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * A Proxy to a field that allows the field value to be retrieved and set
- * This allows target VM proxying of the field and is analagous to the java.lang.Reflect.Field
- * in the same way IMethodProxy is analagous to java.lang.Reflect.Method
- * Creation date: (1/17/00 12:17:52 PM)
- * @author: Joe Winchester
- */
-public interface IFieldProxy extends IAccessibleObjectProxy, IProxyField {
-/**
- * Return the type of the field.
- */
-IBeanTypeProxy getFieldType();
-
-/**
- * Return the value of us on the subject argument.
- * If the field is a primitive type, the return proxy
- * will be of the primitive type too.  
- * Creation date: (1/17/00 12:28:48 PM)
- */
-IBeanProxy get(IBeanProxy aSubject) throws ThrowableProxy;
-
-/**
- * Set the argument as the field value on the subject
- * Creation date: (1/17/00 12:28:48 PM)
- */
-void set(IBeanProxy aSubject, IBeanProxy argument) throws ThrowableProxy;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IIntegerBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IIntegerBeanProxy.java
deleted file mode 100644
index a8dd2b48d..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IIntegerBeanProxy.java
+++ /dev/null
@@ -1,29 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Interface to an integer bean proxy.
- * We originally had only an Integer proxy,
- * so the use of it was throughout the system.
- * We are now supporting Number instead, but
- * because there were so many places using int,
- * we've left it in.
- * Creation date: (2/6/00 8:52:42 AM)
- * @author: Joe Winchester
- */
-public interface IIntegerBeanProxy extends INumberBeanProxy {
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IInvokable.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IInvokable.java
deleted file mode 100644
index c55167500..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IInvokable.java
+++ /dev/null
@@ -1,83 +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.proxy.core;
- 
-
-/**
- * Interface for invoking method calls on the vm.
- * IMethodProxy implements it for when you have a method proxy available,
- * but you can also get a straight invokable which will get the
- * proxy on the vm at the time of execution.
- * <p>
- * The method proxy factory can be used to return either method
- * proxies when the invokable will be used over and over, and
- * it can return IInvokable's when it is one shot deal. Though even
- * when one-shot deal it can be used over and over. There is just overhead because the 
- * method is looked up each time. So a reasonable compromise would be if
- * using it infrequently or use closely together once or twice it is better
- * to use a Invokable instead of a method proxy.
- * @since 1.0.0
- */
-public interface IInvokable {
-
-	/**
-	 * Invoke us on the subject
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invoke(IBeanProxy subject) throws ThrowableProxy;
-
-	/**
-	 * Invoke us on the subject with the specified argument
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invoke(IBeanProxy subject, IBeanProxy argument) throws ThrowableProxy;
-
-	/**
-	 * Invoke us on the subject with the specified arguments
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invoke(IBeanProxy subject, IBeanProxy[] arguments) throws ThrowableProxy;
-
-	/**
-	 * Invoke us on the subject, however catch all exceptions
-	 * Only to be used when you don't want ThrowableExceptions. This should
-	 * not be the normal way to invoke.
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject);
-
-	/**
-	 * Invoke us on the subject with the specified argument, however catch all exceptions
-	 * Only to be used when you don't want ThrowableExceptions. This should
-	 * not be the normal way to invoke.
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy argument);
-
-	/**
-	 * Invoke us on the subject with the specified arguments, however catch all exceptions
-	 * Only to be used when you don't want ThrowableExceptions. This should
-	 * not be the normal way to invoke.
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy[] arguments);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxy.java
deleted file mode 100644
index e04442c40..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxy.java
+++ /dev/null
@@ -1,52 +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.proxy.core;
-
-/**
- * Interface for Method Proxies Creation date: (12/3/99 11:36:29 AM)
- * 
- * @author: Joe Winchester
- */
-public interface IMethodProxy extends IAccessibleObjectProxy, IInvokable, IProxyMethod {
-
-	/**
-	 * Answer the class the method is defined in. Creation date: (12/3/99 11:37:12 AM)
-	 * 
-	 * @author Joe Winchester
-	 */
-	IBeanTypeProxy getClassType();
-
-	/**
-	 * Answer the name of the method Creation date: (12/3/99 11:37:12 AM)
-	 * 
-	 * @author Joe Winchester
-	 */
-	String getName();
-
-	/**
-	 * Answer the parameter types of the method Creation date: (12/3/99 11:37:12 AM)
-	 * 
-	 * @author Joe Winchester
-	 */
-	IBeanTypeProxy[] getParameterTypes();
-
-	/**
-	 * Answer the return type of the method Creation date: (12/3/99 11:37:12 AM)
-	 * 
-	 * @author Joe Winchester
-	 */
-	IBeanTypeProxy getReturnType();
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxyFactory.java
deleted file mode 100644
index 216cdcc1a..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxyFactory.java
+++ /dev/null
@@ -1,83 +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.proxy.core;
-
-/**
- * Factory for creating method proxies.
- * 
- * The factory exists for use, but generally it is better to go through the bean type proxy to get a method proxy. This is useful for setting up a
- * bunch of method proxies in initialization routines so you don't need to have a bean type proxy for each.
- * 
- * Creation date: (12/3/99 6:21:52 PM)
- * 
- * @author: Joe Winchester
- */
-public interface IMethodProxyFactory extends IBeanProxyFactory {
-
-	/**
-	 * Return a method proxy for the specified name, arguments from the class.
-	 * 
-	 * @param className
-	 * @param methodName
-	 * @param parameterTypes
-	 *            parameter type names or <code>null</code> for parameterTypes means no parameters.
-	 * @return a method proxy or null if can't be found. 
-	 * @since 1.0.0
-	 */
-	IMethodProxy getMethodProxy(String className, String methodName, String[] parameterTypes);
-	
-	/**
-	 * Return an IProxyMethod for the specified name, arguments from the given class.
-	 * @param expression
-	 * @param className
-	 * @param methodName
-	 * @param parameterTypes
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	IProxyMethod getMethodProxy(IExpression expression, String className, String methodName, String[] parameterTypes);
-
-	/**
-	 * Return an IProxyField for the specified name, arguments from the given class.
-	 * @param expression
-	 * @param className
-	 * @param fieldName
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	IProxyField getFieldProxy(IExpression expression, String className, String fieldName);
-
-	
-	/**
-	 * Return an invokable for the specified name, arguments from the class. The method proxy is not retrieved. Instead the method will be looked up
-	 * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
-	 * be retrieved instead.
-	 * <p>
-	 * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
-	 * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
-	 * <p>
-	 * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
-	 * 
-	 * @param className
-	 * @param methodName
-	 * @param parameterTypes
-	 *            parameter type names or <code>null</code> for parameterTypes means no parameters.
-	 * @return an invokable 
-	 * @since 1.0.0
-	 */
-	IInvokable getInvokable(String className, String methodName, String[] parameterTypes);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/INumberBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/INumberBeanProxy.java
deleted file mode 100644
index efe7a4297..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/INumberBeanProxy.java
+++ /dev/null
@@ -1,59 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Interface to an integer bean proxy.
- * Creation date: (2/6/00 8:52:42 AM)
- * @author: Joe Winchester
- */
-public interface INumberBeanProxy extends IBeanProxy {
-/**
- * Return the primitive byte value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-byte byteValue();
-/**
- * Return the primitive double value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-double doubleValue();
-/**
- * Return the primitive float value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-float floatValue();
-/**
- * Return the primitive int value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-int intValue();
-/**
- * Return the primitive long value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-long longValue();
-/**
- * Return the value as a Number.
- * Creation date: (2/6/00 8:52:59 AM)
- */
-Number numberValue();
-/**
- * Return the primitive short value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-short shortValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPDEContributeClasspath.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPDEContributeClasspath.java
deleted file mode 100644
index 6c1687066..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPDEContributeClasspath.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
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.core.runtime.CoreException;
-
-
-/**
- * Contribute to classpath PDE entries that are needed for a launch.
- * <p> 
- * Use the <code>INSTANCE()</code> to access the contributor. If the value
- * is <code>null</code>, then PDE is not available.
- * 
- * @since 1.0.2
- */
-public interface IPDEContributeClasspath {
-	
-	public static IPDEContributeClasspath INSTANCE = PDEContributeClasspathInstance.getInstance();
-
-	/**
-	 * Return the classpath contributions for the plugins in the given project.
-	 * <p>
-	 * This will add in the libraries from any fragments of any plugin that this
-	 * project references, either directly or indirectly through other plugins.
-	 * <p>
-	 * It is used by launches to get the fragment libraries since these are not
-	 * added by default to the classpath for a project by PDE. That is because they
-	 * aren't needed for compilation purposes, but they are needed for running.
-	 * 
-	 * @param controller the controller to contribute to.
-	 * @param info configuration info for the project
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.2
-	 */
-	public abstract void getPDEContributions(IConfigurationContributionController controller, IConfigurationContributionInfo info) throws CoreException;
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPointBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPointBeanProxy.java
deleted file mode 100644
index a41a51aa5..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPointBeanProxy.java
+++ /dev/null
@@ -1,33 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Interface to a Point bean proxy.
- * <p>
- * These are common for different windowing systems, e.g. AWT and SWT. So this here
- * is common interface for them.
- * Creation date: (4/7/00 3:46:39 PM)
- * @author: Administrator
- */
-public interface IPointBeanProxy extends IBeanProxy {
-	public int getX();
-	public int getY();
-	public void setX(int x);
-	public void setY(int y);
-	public void setLocation(int x, int y);
-	public void setLocation(IPointBeanProxy point);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxy.java
deleted file mode 100644
index dfaf838a6..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxy.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
- 
-
-/**
- * A common interface for proxies. It is used by the expression processor to easily distinquish between
- * a proxy and an Expression proxy. 
- * @since 1.1.0
- */
-public interface IProxy {
-
-	/**
-	 * Return the registry this proxy was created with.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public ProxyFactoryRegistry getProxyFactoryRegistry();
-	
-	/**
-	 * Is this a bean proxy (including all of the subinterfaces of it, like IMethodProxy).
-	 * @return <code>true</code> if this is a bean proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isBeanProxy();
-
-	/**
-	 * Is this an expression proxy.
-	 * @return <code>true</code> if this is an expression proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isExpressionProxy();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyBeanType.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyBeanType.java
deleted file mode 100644
index 59635a732..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyBeanType.java
+++ /dev/null
@@ -1,85 +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.proxy.core;
- 
-
-/**
- * This interface is for IBeanTypeProxy's and BeanTypeExpressionProxy's so that we can lazily
- * get the beantype proxy and have the expression process it when needed.
- * 
- * @since 1.1.0
- */
-public interface IProxyBeanType extends IProxy {
-
-	/**
-	 * Answer the name of the type we are proxying This is the fully qualified name. For arrays it will return the format: [Lclassname; 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public String getTypeName();
-	
-	/**
-	 * Get the IProxyMethod for the method from this beantype. It may be either a resolved method proxy (if already resolved) or
-	 * it may be an ExpressionProxy if not yet resolved.
-	 * 
-	 * @param expression
-	 * @param methodName
-	 * @param parameterTypes array of parameter types or <code>null</code> if no parameters.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes);
-	
-	/**
-	 * Get the IProxyMethod for the method from this beantype where the method has no arguments. It may be either a resolved method proxy (if already resolved) or
-	 * it may be an ExpressionProxy if not yet resolved.
-	 * <p>
-	 * This is a shortcut for getMethodProxy() that takes arguments names where the names have been sent as null.
-	 * 
-	 * @param expression
-	 * @param methodName
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName);
-	
-	/**
-	 * Get the IProxyMethod for the method from this beantype. It may be either a resolved method proxy (if already resolved) or
-	 * it may be an ExpressionProxy if not yet resolved.
-	 * 
-	 * @param expression
-	 * @param methodName
-	 * @param parameterTypes array of parameter types or <code>null</code> if no parameters.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes);
-	
-	/**
-	 * Get the IProxyyField for the field from this beantype. It may be either a resolved field proxy (if already resolved) or
-	 * it may be an ExpressionProxy if not yet resolved.
-	 * 
-	 * @param expression
-	 * @param fieldName
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyField getFieldProxy(IExpression expression, String fieldName);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java
deleted file mode 100644
index 0d819f3f6..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java
+++ /dev/null
@@ -1,69 +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.proxy.core;
- 
-/**
- * Constants used with the plugin xml.
- * 
- * @since 1.0.0
- */
-public interface IProxyConstants {
-	
-	/**
-	 * Launch group id for proxy launch configurations.
-	 */	
-	public static final String ID_PROXY_LAUNCH_GROUP = "org.eclipse.jem.proxy"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration type for local proxy. It is local in that it is on the same machine, but a different
-	 * VM then the one running the IDE. 
-	 * 
-	 * It here because this is the default config type when no launch config specified for a project.
-	 */
-	public static final String LOCAL_LAUNCH_TYPE = "org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"; //$NON-NLS-1$
-	
-	/**
-	 * Attribute on Proxy Launch Configuration:
-	 * 
-	 * Key used in Launch Configuration for attaching AWT/Swing to the registry. This means simply
-	 * that AWT/Swing should be treated as being in the registry or not. It doesn't actually prevent
-	 * them from being there.
-	 *
-	 * The default value for this attribute is "true", so it should be set only to "false".
-	 */
-	public static final String ATTRIBUTE_AWT_SWING = "org.eclipse.jem.proxy.AWT/Swing"; //$NON-NLS-1$
-	
-	/**
-	 * Attribute on Proxy Launch Configuration:
-	 * 
-	 * Key used in Launch Configuration for the contributors and returning the registry. After retrieving key,
-	 * go back to ProxyLaunchSupport to retrieve the contributors. And it uses it to return the registry.
-	 * 
-	 * Not to be set by contributors. This will be set only by the ProxyLaunchSupport start implementation methods.
-	 * It is here only because external developer's launch configurations will need to be able to access this.
-	 */
-	public static final String ATTRIBUTE_LAUNCH_KEY = "org.eclipse.jem.proxy.LaunchKey"; //$NON-NLS-1$
-	
-	/**
-	 * Attribute on Proxy Launch Configuration:
-	 *  
-	 * VM title used for the launch registry.
-	 * 
-	 * Not to be set by contributors. This will be set only by the ProxyLaunchSupport start implementation methods.
-	 * It is here only because external developer's launch configurations will need to be able to access this.
-	 */
-	public static final String ATTRIBUTE_VM_TITLE = "org.eclipse.jem.proxy.vmtitle"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyField.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyField.java
deleted file mode 100644
index 1f2e1da3a..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyField.java
+++ /dev/null
@@ -1,25 +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.proxy.core;
- 
-
-/**
- * This interface is for IFieldProxy's and FieldExpressionProxy's so that we can lazily
- * get the field proxy and have the expression process it when needed.
- * @since 1.1.0
- */
-public interface IProxyField extends IProxy {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyMethod.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyMethod.java
deleted file mode 100644
index f260a234f..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyMethod.java
+++ /dev/null
@@ -1,26 +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.proxy.core;
- 
-
-/**
- * This interface is for IMethodProxy's and MethodExpressionProxy's so that we can lazily
- * get the method proxy and have the expression process it when needed.
- * 
- * @since 1.1.0
- */
-public interface IProxyMethod extends IProxy {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IRectangleBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IRectangleBeanProxy.java
deleted file mode 100644
index f38660d37..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IRectangleBeanProxy.java
+++ /dev/null
@@ -1,43 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Interface to a Rectangle bean proxy.
- * <p>
- * These are common for different windowing systems, e.g. AWT and SWT. So this here
- * is common interface for them.
- * Creation date: (4/7/00 3:46:39 PM)
- * @author: Administrator
- */
-public interface IRectangleBeanProxy extends IBeanProxy {
-	public int getX();
-	public int getY();
-	public void setX(int x);
-	public void setY(int y);
-	public void setLocation(int x, int y);
-	public void setLocation(IPointBeanProxy point);
-	
-	public int getHeight();
-	public int getWidth();
-	public void setHeight(int height);
-	public void setWidth(int width);
-	public void setSize(int width, int height);
-	public void setSize(IDimensionBeanProxy dim);
-	
-	public void setBounds(int x, int y, int width, int height);
-	public void setBounds(IRectangleBeanProxy rect);	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanProxyFactory.java
deleted file mode 100644
index 4353e522c..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanProxyFactory.java
+++ /dev/null
@@ -1,202 +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.proxy.core;
-
-
-/*
-
-
- */
-
-
-/**
- * The Standard base bean proxy factory.
- * This is the Interface that the desktop will talk
- * to.
- * Creation date: (12/3/99 11:52:09 AM)
- * @author: Joe Winchester
- */
-public interface IStandardBeanProxyFactory extends IBeanProxyFactory {
-	
-/**
- * Get the {@link org.eclipse.jem.internal.proxy.common.IVMServer} proxy for the
- * this registry. This is only needed if you need to give the IVMserver to a proxy so that
- * it can access it.
- * <p>
- * <b>Note:</b> Does not need to be given to callback proxies because they are given
- * an {@link org.eclipse.jem.internal.proxy.common.IVMCallbackServer} on initialization, and
- * that interface implements the IVMServer interface too.
- * 
- * @return
- * 
- * @since 1.1.0
- */
-public IBeanProxy getIVMServerProxy();
-/**
- * Return a new bean proxy for the primitive integer argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IIntegerBeanProxy createBeanProxyWith(int aPrimitiveInteger);
-/**
- * Return a new bean proxy for the primitive character argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public ICharacterBeanProxy createBeanProxyWith(char aPrimitiveCharacter);
-/**
- * Return a new bean proxy for the primitive byte argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(byte aPrimitiveByte);
-/**
- * Return a new bean proxy for the primitive short argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(short aPrimitiveShort);
-/**
- * Return a new bean proxy for the primitive long argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(long aPrimitiveLong);
-/**
- * Return a new bean proxy for the primitive float argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(float aPrimitiveFloat);
-/**
- * Return a new bean proxy for the primitive double argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(double aPrimitiveDouble);
-/**
- * Return a new bean proxy for the Boolean argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IBooleanBeanProxy createBeanProxyWith(Boolean aBoolean);
-/**
- * Return a new bean proxy for the Integer argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IIntegerBeanProxy createBeanProxyWith(Integer anInteger);
-/**
- * Return a new bean proxy for the Character argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public ICharacterBeanProxy createBeanProxyWith(Character aCharacter);
-/**
- * Return a new bean proxy for the Number argument, can handle any of the numbers.
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(Number aNumber);
-/**
- * Return a new bean proxy for the string argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IStringBeanProxy createBeanProxyWith(String aString);
-
-/**
- * Convert the non-primitive proxy to a primitive proxy, if it
- * of one of the wrapper types. If not, then just return the proxy as is.
- * <p>
- * I.E. BooleanClassProxy will convert to BooleanTypeProxy, but ObjectClassProxy will just return unchanged.
- * @param nonPrimitiveProxy
- * @return either the primitive proxy that nonPrimitive wrappers, or the non-primitive if not a wrapper type.
- * 
- * @since 1.0.0
- */
-public IBeanProxy convertToPrimitiveBeanProxy(IBeanProxy nonPrimitiveProxy);
-/**
- * Return a new bean proxy for the boolean argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IBooleanBeanProxy createBeanProxyWith(boolean aBoolean);
-/**
- * Create an array bean proxy.
- *
- *   - (int, new int[2] {3, 4}) will create:
- *      int [3] [4]
- *
- *   - (int[], new int[1] {1})
- *      int [1]
- *
- *   - (int[], new int[2] {2,3})
- *      int [2] [3]
- * 
- *
- *   - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0])
- *      int [0]...
- *     or
- *     (int[][]..., null) or (int[][]..., new int[0])
- *      int[0][]...
- *     This is because an array instance with no specified dimensions is not valid. 
- *
- *   - (int[][], new int[1] {3})
- *      int[3][]
- */
-public IArrayBeanProxy  createBeanProxyWith(IBeanTypeProxy type, int[] dimensions) throws ThrowableProxy;
-/**
- * Create a one-dimensional array. 
- * The result will be the same as calling 
- *   createBeanProxyWith(IBeanTypeProxy type, new int[1] {x})
- * where 'x' is the value passed in as the dimension.
- */
-public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int dimension) throws ThrowableProxy;
-
-/**
- * Create a bean proxy from an initialization string. 
- * <p>
- * It is not recommended that this method be commonly used. That is because no type checking will be performed
- * on the result. Whatever it evaluates to be will be what it is. It is useful for the rare cases where the desired
- * result type is not known.
- * <p>
- * It is recommended instead to use the newInstance(initString) method on the appropriate IBeanTypeProxy so that the
- * result can be type-checked to make sure the string evaluates to something of that type.
- * 
- * @param initializationString
- * @return
- * @throws ThrowableProxy
- * @throws InstantiationException
- * @throws ClassCastException
- * 
- * @since 1.0.0
- */
-public IBeanProxy createBeanProxyFrom(String initializationString) throws ThrowableProxy, InstantiationException, ClassCastException;
-
-/**
- * Release the proxy. In the case of Remote VM, this means
- * it will remove the proxy on the client side, and remove
- * the reference to the real object on the server side. On the server
- * side the real object may not go away because something else could
- * be holding onto it, but it won't be held simply because the client
- * is holding onto it.
- */
-public void releaseProxy(IBeanProxy proxy);
-
-/**
- * Create an expression.
- * @return The expression.
- * 
- * @since 1.0.0
- */
-public IExpression createExpression();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanTypeProxyFactory.java
deleted file mode 100644
index 77df7e9de..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,168 +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.proxy.core;
-/*
-
-
- */
-
-import java.util.Set;
-/**
- * The standard bean type proxy factory.
- * This is the Interface that the desktop will talk
- * to, the one that is returned when getCurrent() is called.
- * Creation date: (3/10/00 11:00:50 AM)
- * @author: Richard Lee Kulp
- */
-public interface IStandardBeanTypeProxyFactory extends IBeanProxyFactory {
-	
-/**
- * Used by other registered bean type proxy factories to
- * register their bean type proxies with the standard factory
- * so that it will be cached there. 
- * <p><b>Note:</b> This is not meant to be called by customers. It is here for the usage
- * of registry extensions.
- * @param aBeanTypeProxy
- * @param permanent indicates that beantype will never be released,
- * not even if explicit request is made.
- * 
- * @since 1.1.0
- */
-void registerBeanTypeProxy(IBeanTypeProxy aBeanTypeProxy, boolean permanent);
-
-/**
- * Used by other registered bean type proxy factories to
- * register their proxy bean type with the standard factory
- * so that it will be cached there. 
- * <p><b>Note:</b> This is not meant to be called by customers. It is here for the usage
- * of registry extensions.
- * @param aBeanTypeProxy
- * @param permanent indicates that beantype will never be released,
- * not even if explicit request is made.
- * 
- * @since 1.1.0
- */
-void registerBeanTypeProxy(IProxyBeanType aBeanTypeProxy, boolean permanent);
-
-/**
- * Return the beanType proxy for the given class name.
- * It must be fully qualified. And for arrays it can handle
- * either the jni type ([Ljava.lang.Object;) or the Java EMF Model
- * formal type (java.lang.Object[]).
- */
-IBeanTypeProxy getBeanTypeProxy(String className);
-
-/**
- * Get the beantype proxy suitable for an expression.
- * 
- * @param expression
- * @param typeName
- * @return
- * 
- * @since 1.1.0
- */
-IProxyBeanType getBeanTypeProxy(IExpression expression, String typeName);
-
-/**
- * Return an Array type proxy for the given class name of
- * the specified dimensions. This is a helper method. The
- * same result can be gotton from getBeanTypeProxy.
- * e.g.
- *      getBeanTypeProxy("java.lang.Object", 3)
- *    is the same as:
- *      getBeanTypeProxy("[[[Ljava.lang.Object;")
- *
- *    They both result in a type of:
- *      Object [][][]
- * 
- *    or if using the JNI format (proxy format)
- *      getBeanTypeProxy("[Ljava.langObject;", 3)
- *    becomes
- *      Object [][][][] 
- * 
- *    or if using the standard java format (as in actual code)
- *      getBeanTypeProxy("java.langObject[];", 3)
- *    becomes
- *      Object [][][][]
- */
-IBeanTypeProxy getBeanTypeProxy(String componentClassName, int dimensions);
-
-/**
- * Return an Array type proxy for the given class name of
- * the specified dimensions. This is a helper method. The
- * same result can be gotton from getBeanTypeProxy.
- * e.g.
- *      getBeanTypeProxy("java.lang.Object", 3)
- *    is the same as:
- *      getBeanTypeProxy("[[[Ljava.lang.Object;")
- *
- *    They both result in a type of:
- *      Object [][][]
- * 
- *    or if using the JNI format (proxy format)
- *      getBeanTypeProxy("[Ljava.langObject;", 3)
- *    becomes
- *      Object [][][][] 
- * 
- *    or if using the standard java format (as in actual code)
- *      getBeanTypeProxy("java.langObject[];", 3)
- *    becomes
- *      Object [][][][]
- * 
- * @param expression
- * @param componentClassName
- * @param dimensions
- * @return
- * 
- * @since 1.1.0
- */
-IProxyBeanType getBeanTypeProxy(IExpression expression, String componentClassName, int dimensions);
-
-/**
- * Test if a specific bean type has been registered. Don't access and create
- * if it isn't currently registered.
- */
-boolean isBeanTypeRegistered(String className);
-
-/**
- * Registered types. Return a set of strings that are the registered classes.
- * This Set isn't synchronized, there may be changes while accessing it.
- */
-Set registeredTypes();
-
-/**
- * Maintain list of not found types. This list is types that were requested,
- * but didn't exist. This method sets whether list should be maintained or not.
- * If set to false, the list will be empty. The default is false.
- * 
- * @param maintain
- */
-void setMaintainNotFoundTypes(boolean maintain);
-
-/**
- * Maintain list of not found types. This list is types that were requested,
- * but didn't exist. This method returns whether list should be maintained or not.
- * If false, the list will be empty. The default is false.
- * 
- * @return maintaining not found types.
- */
-boolean isMaintainNotFoundTypes();
-
-/**
- * Maintain list of not found types. This list is types that were requested,
- * but didn't exist. 
- *
- * @param className Classname to search for to see if ever not found.
- * @return true if the bean type had been searched for but was not found. If not maintaining, then result will be false.
- */
-boolean isBeanTypeNotFound(String className);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStringBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStringBeanProxy.java
deleted file mode 100644
index 2078fad25..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStringBeanProxy.java
+++ /dev/null
@@ -1,30 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Optimized implementation that should be used for string proxies that
- * allows the IDE VM to get the string value easily
- * Creation date: (2/6/00 8:58:22 AM)
- * @author: Joe Winchester
- */
-public interface IStringBeanProxy extends IBeanProxy {
-/**
- * Return the proxied string as a string that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-String stringValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IUIRunner.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IUIRunner.java
deleted file mode 100644
index 9356c2d2f..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IUIRunner.java
+++ /dev/null
@@ -1,40 +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.proxy.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
- 
-
-/**
- * Interface that doesn't require UI. The implementation will. This will
- * only be used if within UI environment.
- * 
- * <package-protected> because should only be used within here.
- * 
- * @since 1.0.0
- */
-interface IUIRunner {
-	/**
-	 * Handle the build. If not in UI thread, just call back to ProxyLaunchSupport
-	 * to handle the build. If on UI thread, then use the IProgressService to do it.
-	 * This will keep the UI from "locking", though it will be disabled it won't deadlock.
-	 * 
-	 * @param pm
-	 * 
-	 * @since 1.0.0
-	 */
-	public void handleBuild(IProgressMonitor pm) throws CoreException;
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IteratorBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IteratorBeanProxyWrapper.java
deleted file mode 100644
index 43f64fc98..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IteratorBeanProxyWrapper.java
+++ /dev/null
@@ -1,84 +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.proxy.core;
-/*
-
-
- */
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.Iterator proxy.
- * It provides the iterator methods to interface to
- * the proxy.
- */
-
-public class IteratorBeanProxyWrapper {
-	protected final IBeanProxy fIterator;
-	protected final JavaStandardBeanProxyConstants fConstants;
-	
-	/**
-	 * Construct with the collection.
-	 */
-	public IteratorBeanProxyWrapper(IBeanProxy anIteratorProxy) {
-		if (!anIteratorProxy.getTypeProxy().isKindOf(anIteratorProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.Iterator"))) //$NON-NLS-1$
-			throw new ClassCastException(MessageFormat.format(ProxyMessages.ClassCast_EXC__IncorrectType, new Object[] {anIteratorProxy.getTypeProxy().getTypeName(), "java.util.Iterator"}));  //$NON-NLS-1$
-		else
-			fIterator = anIteratorProxy;
-			
-		fConstants = JavaStandardBeanProxyConstants.getConstants(anIteratorProxy.getProxyFactoryRegistry());
-	}
-	
-	/**
-	 * Answer the iterator proxy that this is wrappering.
-	 */
-	public IBeanProxy getBeanProxy() {
-		return fIterator;
-	}
-
-	/**
-	 * equals - Pass it on to the proxy to handle this.
-	 */
-	public boolean equals(Object object) {
-		return fIterator.equals(object);
-	}
-	
-	/**
-	 * hashCode - Pass it on to the proxy to handle this.
-	 */
-	public int hashCode() {
-		return fIterator.hashCode();
-	}
-	
-	/**
-	 * Iterator accessors
-	 */
-	public boolean hasNext() {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getIteratorHasNext().invoke(fIterator)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return false;
-		}			
-	}
-	public IBeanProxy next() throws ThrowableProxy {
-		return fConstants.getIteratorNext().invoke(fIterator);
-	}	
-	public void remove() throws ThrowableProxy {
-		fConstants.getIteratorRemove().invoke(fIterator);
-	}	
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/JavaStandardBeanProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/JavaStandardBeanProxyConstants.java
deleted file mode 100644
index df46f1607..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/JavaStandardBeanProxyConstants.java
+++ /dev/null
@@ -1,347 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Standard Proxy constants.
- *
- * Use the static accessor method (getConstants()) to get the appropriate 
- * constants instance for the registry. This is done so that until the
- * the constants are needed, they aren't registered.
- *
- * There are some standard utility functions too.
- *
- * NOTE: Since everything in here just proxies, there is
- *       no need to have them separated by VM. That is why
- *       this in the Proxy package.
- *
- * This is final because this can't be extended. This specific one
- * will be registered with the factory for this key. Any extensions
- * must be done in their own constants and registry key.
- *
- * Creation date: (4/7/00 4:47:48 PM)
- * @author: Administrator
- */
-public final class JavaStandardBeanProxyConstants {
-	public static final Object REGISTRY_KEY = new Object();
-		
-	final IBeanTypeProxy fCollectionType;
-	final IBeanTypeProxy fListType;
-	final IBeanTypeProxy fIteratorType;
-	final IBeanTypeProxy fListIteratorType;
-	final IBeanTypeProxy fEnumerationType;	
-	final IBeanTypeProxy fSystemType;
-	final IBeanTypeProxy fStringType;
-	
-	IMethodProxy fCollectionAdd, fCollectionAddAll, fCollectionClear, fCollectionContains,
-		fCollectionContainsAll, fCollectionIsEmpty, fCollectionIterator, fCollectionRemove,
-		fCollectionRemoveAll, fCollectionRetainAll, fCollectionSize, fCollectionToArray,
-		fCollectionToArrayWithArray;
-		
-	IMethodProxy fListAddWithInt, fListAddAllWithInt, fListGet, fListIndexOf, fListLastIndexOf,
-		fListListIterator, fListListIteratorWithInt, fListRemoveInt, 
-		fListSet, fListSubList;
-		
-	IMethodProxy fIteratorHasNext, fIteratorNext, fIteratorRemove;
-
-	IMethodProxy fListIteratorAdd, fListIteratorHasPrevious, fListIteratorNextIndex, fListIteratorPrevious,
-		fListIteratorPreviousIndex, fListIteratorRemove, fListIteratorSet;
-		
-	IMethodProxy fEnumerationHasMoreElements, fEnumerationNextElement;
-	
-	IMethodProxy fSystemArraycopy;
-
-/**
- * Get the constants instance for the specified registry.
- */
-public static JavaStandardBeanProxyConstants getConstants(ProxyFactoryRegistry registry) {
-	JavaStandardBeanProxyConstants constants = (JavaStandardBeanProxyConstants) registry.getConstants(REGISTRY_KEY);
-	if (constants == null)
-		registry.registerConstants(REGISTRY_KEY, constants = new JavaStandardBeanProxyConstants(registry));	
-	return constants;
-}
-
-
-/**
- * IDEJavaBeanConstants constructor comment.
- */
-private JavaStandardBeanProxyConstants(ProxyFactoryRegistry registry) {
-	super();
-	
-	IStandardBeanTypeProxyFactory typeFactory = registry.getBeanTypeProxyFactory();
-	fCollectionType = typeFactory.getBeanTypeProxy("java.util.Collection");//$NON-NLS-1$
-	fListType = typeFactory.getBeanTypeProxy("java.util.List"); //$NON-NLS-1$
-	fIteratorType = typeFactory.getBeanTypeProxy("java.util.Iterator"); //$NON-NLS-1$
-	fListIteratorType = typeFactory.getBeanTypeProxy("java.util.ListIterator"); //$NON-NLS-1$
-	fEnumerationType = typeFactory.getBeanTypeProxy("java.util.Enumeration");	 //$NON-NLS-1$
-	fSystemType = typeFactory.getBeanTypeProxy("java.lang.System"); //$NON-NLS-1$
-	fStringType = typeFactory.getBeanTypeProxy("java.lang.String"); //$NON-NLS-1$
-}
-
-public IBeanTypeProxy getStringType() {
-	return fStringType;
-}
-
-/**
- * Collection method accessors
- */
-public IMethodProxy getCollectionAdd() {
-	if (fCollectionAdd == null)
-		fCollectionAdd = fCollectionType.getMethodProxy("add", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionAdd;
-}
-	
-public IMethodProxy getCollectionAddAll(){
-	if (fCollectionAddAll == null)
-		fCollectionAddAll = fCollectionType.getMethodProxy("addAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionAddAll;
-}
-
-public IMethodProxy getCollectionClear() {
-	if (fCollectionClear == null)
-		fCollectionClear = fCollectionType.getMethodProxy("clear"); //$NON-NLS-1$
-	return fCollectionClear;
-}
-
-public IMethodProxy getCollectionContains() {
-	if (fCollectionContains == null)
-		fCollectionContains = fCollectionType.getMethodProxy("contains", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionContains;
-}
-	
-public IMethodProxy getCollectionContainsAll() {
-	if (fCollectionContainsAll == null)
-		fCollectionContainsAll = fCollectionType.getMethodProxy("containsAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionContainsAll;
-}
-
-public IMethodProxy getCollectionIsEmpty() {
-	if (fCollectionIsEmpty == null)
-		fCollectionIsEmpty = fCollectionType.getMethodProxy("isEmpty"); //$NON-NLS-1$
-	return fCollectionIsEmpty;
-}
-
-public IMethodProxy getCollectionIterator() {
-	if (fCollectionIterator == null)
-		fCollectionIterator = fCollectionType.getMethodProxy("iterator"); //$NON-NLS-1$
-	return fCollectionIterator;
-}
-
-public IMethodProxy getCollectionRemove() {
-	if (fCollectionRemove == null)
-		fCollectionRemove = fCollectionType.getMethodProxy("remove", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionRemove;
-}
-
-public IMethodProxy getCollectionRemoveAll() {
-	if (fCollectionRemoveAll == null)
-		fCollectionRemoveAll = fCollectionType.getMethodProxy("removeAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionRemoveAll;
-}
-
-public IMethodProxy getCollectionRetainAll() {
-	if (fCollectionRetainAll == null)
-		fCollectionRetainAll = fCollectionType.getMethodProxy("retainAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionRetainAll;
-}
-
-public IMethodProxy getCollectionSize()  {
-	if (fCollectionSize == null)
-		fCollectionSize = fCollectionType.getMethodProxy("size"); //$NON-NLS-1$
-	return fCollectionSize;
-}
-
-public IMethodProxy getCollectionToArray() {
-	if (fCollectionToArray == null)
-		fCollectionToArray = fCollectionType.getMethodProxy("toArray"); //$NON-NLS-1$
-	return fCollectionToArray;
-}
-
-public IMethodProxy getCollectionToArrayWithArray() {
-	if (fCollectionToArrayWithArray == null)
-		fCollectionToArrayWithArray = fCollectionType.getMethodProxy("toArray", "[Ljava.lang.Object;"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionToArrayWithArray;
-}
-
-/**
- * Iterator accessors
- */
-
-public IMethodProxy getIteratorHasNext() {
-	if (fIteratorHasNext == null)
-		fIteratorHasNext = fIteratorType.getMethodProxy("hasNext"); //$NON-NLS-1$
-	return fIteratorHasNext;
-}
-
-public IMethodProxy getIteratorNext() {
-	if (fIteratorNext == null)
-		fIteratorNext = fIteratorType.getMethodProxy("next"); //$NON-NLS-1$
-	return fIteratorNext;
-}
-
-public IMethodProxy getIteratorRemove() {
-	if (fIteratorRemove == null)
-		fIteratorRemove = fIteratorType.getMethodProxy("remove"); //$NON-NLS-1$
-	return fIteratorRemove;
-}
-
-/**
- * Listaccessors
- */
-
-public IMethodProxy getListAddWithInt() {
-	if (fListAddWithInt == null)
-		fListAddWithInt = fListType.getMethodProxy("add", new String[] {"int", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fListAddWithInt;
-}
-
-public IMethodProxy getListAddAllWithInt() {
-	if (fListAddAllWithInt == null)
-		fListAddAllWithInt = fListType.getMethodProxy("addAll", new String[] {"int", "java.util.Collection"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fListAddAllWithInt;
-}
-
-public IMethodProxy getListGet() {
-	if (fListGet == null)
-		fListGet = fListType.getMethodProxy("get", "int"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListGet;
-}
-
-public IMethodProxy getListIndexOf() {
-	if (fListIndexOf == null)
-		fListIndexOf = fListType.getMethodProxy("indexOf", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListIndexOf;
-}
-
-public IMethodProxy getListLastIndexOf() {
-	if (fListLastIndexOf == null)
-		fListLastIndexOf = fListType.getMethodProxy("lastIndexOf", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListLastIndexOf;
-}
-
-public IMethodProxy getListListIterator() {
-	if (fListListIterator == null)
-		fListListIterator = fListType.getMethodProxy("listIterator"); //$NON-NLS-1$
-	return fListListIterator;
-}
-
-public IMethodProxy getListListIteratorWithInt() {
-	if (fListListIteratorWithInt == null)
-		fListListIteratorWithInt = fListType.getMethodProxy("listIterator", "int"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListListIteratorWithInt;
-}
-
-public IMethodProxy getListRemoveInt() {
-	if (fListRemoveInt == null)
-		fListRemoveInt = fListType.getMethodProxy("remove", "int"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListRemoveInt;
-}
-
-public IMethodProxy getListSet() {
-	if (fListSet == null)
-		fListSet = fListType.getMethodProxy("set", new String[] {"int", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fListSet;
-}
-
-public IMethodProxy getListSubList() {
-	if (fListSubList == null)
-		fListSubList = fListType.getMethodProxy("subList", new String[] {"int", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fListSubList;
-}
-
-/**
- * ListIterator accessors
- */
- 
-public IMethodProxy getListIteratorAdd() {
-	if (fListIteratorAdd == null)
-		fListIteratorAdd = fListIteratorType.getMethodProxy("add", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListIteratorAdd;
-}
-
-public IMethodProxy getListIteratorHasPrevious() {
-	if (fListIteratorHasPrevious == null)
-		fListIteratorHasPrevious = fListIteratorType.getMethodProxy("hasPrevious"); //$NON-NLS-1$
-	return fListIteratorHasPrevious;
-}
-
-public IMethodProxy getListIteratorNextIndex() {
-	if (fListIteratorNextIndex == null)
-		fListIteratorNextIndex = fListIteratorType.getMethodProxy("nextIndex"); //$NON-NLS-1$
-	return fListIteratorNextIndex;
-}
-
-public IMethodProxy getListIteratorPrevious() {
-	if (fListIteratorPrevious == null)
-		fListIteratorPrevious = fListIteratorType.getMethodProxy("previous"); //$NON-NLS-1$
-	return fListIteratorPrevious;
-}
-
-public IMethodProxy getListIteratorPreviousIndex() {
-	if (fListIteratorPreviousIndex == null)
-		fListIteratorPreviousIndex = fListIteratorType.getMethodProxy("previousIndex"); //$NON-NLS-1$
-	return fListIteratorPreviousIndex;
-}
-
-public IMethodProxy getListIteratorSet() {
-	if (fListIteratorSet == null)
-		fListIteratorSet = fListIteratorType.getMethodProxy("set", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListIteratorSet;
-}
-
-public IMethodProxy getListIteratorRemove() {
-	if (fListIteratorRemove == null)
-		fListIteratorRemove = fListIteratorType.getMethodProxy("remove"); //$NON-NLS-1$
-	return fListIteratorRemove;
-}
-
-protected IMethodProxy getSystemArraycopy() {
-	if (fSystemArraycopy == null)
-		fSystemArraycopy = fSystemType.getMethodProxy("arraycopy", new String[] {"java.lang.Object", "int", "java.lang.Object", "int", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-	return fSystemArraycopy;
-}
-
-/**
- * Enumeration accessors
- */
-public IMethodProxy getEnumerationHasMoreElements() {
-	if (fEnumerationHasMoreElements == null)
-		fEnumerationHasMoreElements = fEnumerationType.getMethodProxy("hasMoreElements"); //$NON-NLS-1$
-	return fEnumerationHasMoreElements;
-}
-
-public IMethodProxy getEnumerationNextElement() {
-	if (fEnumerationNextElement == null)
-		fEnumerationNextElement = fEnumerationType.getMethodProxy("nextElement"); //$NON-NLS-1$
-	return fEnumerationNextElement;
-}
-
-/**
- * Utility function to copy an array.
- */
-public void arraycopy(IBeanProxy src, int srcPosition, IBeanProxy dest, int destPosition, int length) throws ThrowableProxy {
-	IStandardBeanProxyFactory factory = src.getProxyFactoryRegistry().getBeanProxyFactory();
-	IBeanProxy[] args = new IBeanProxy[] {
-		src,
-		factory.createBeanProxyWith(srcPosition),
-		dest,
-		factory.createBeanProxyWith(destPosition),
-		factory.createBeanProxyWith(length)		
-	};
-	
-	getSystemArraycopy().invoke(null, args);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListBeanProxyWrapper.java
deleted file mode 100644
index a47278327..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListBeanProxyWrapper.java
+++ /dev/null
@@ -1,111 +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.proxy.core;
-/*
-
-
- */
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.Collection proxy.
- * It provides the collection methods to interface to
- * the proxy.
- */
-
-public class ListBeanProxyWrapper extends CollectionBeanProxyWrapper {
-	/**
-	 * Construct with the List.
-	 */
-	public ListBeanProxyWrapper(IBeanProxy aListProxy) {
-		super(aListProxy);
-		
-		if (!aListProxy.getTypeProxy().isKindOf(aListProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.List"))) //$NON-NLS-1$
-			throw new ClassCastException(MessageFormat.format(ProxyMessages.ClassCast_EXC__IncorrectType, new Object[] {aListProxy.getTypeProxy().getTypeName(), "java.util.List"}));  //$NON-NLS-1$
-	}
-	
-	
-	/**
-	 * List accessors
-	 */
-	public void add(int index, IBeanProxy object) throws ThrowableProxy {
-		fConstants.getListAddWithInt().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index), object});
-	}
-	public boolean addAll(int index, IBeanProxy aCollection) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getListAddAllWithInt().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index), aCollection})).booleanValue();
-	}
-	public IBeanProxy get(int index) throws ThrowableProxy {
-		return fConstants.getListGet().invoke(fCollection, fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index));
-	}
-	public int indexOf(IBeanProxy object) {
-		try {
-			return ((IIntegerBeanProxy) fConstants.getListIndexOf().invoke(fCollection, object)).intValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return -1;
-		}			
-	}
-	public int lastIndexOf(IBeanProxy object) {
-		try {
-			return ((IIntegerBeanProxy) fConstants.getListLastIndexOf().invoke(fCollection, object)).intValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return -1;
-		}			
-	}
-	public ListIteratorBeanProxyWrapper listIterator() {
-		try {
-			IBeanProxy itr = fConstants.getListListIterator().invoke(fCollection);
-			if (itr != null)
-				return new ListIteratorBeanProxyWrapper(itr);
-			else
-				return null;
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return null;
-		}			
-	}
-	public ListIteratorBeanProxyWrapper listIterator(int index) {
-		try {
-			IBeanProxy itr = fConstants.getListListIteratorWithInt().invoke(fCollection, fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index));
-			if (itr != null)
-				return new ListIteratorBeanProxyWrapper(itr);
-			else
-				return null;
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return null;
-		}			
-	}
-	public IBeanProxy remove(int index, IBeanProxy object) throws ThrowableProxy {
-		return fConstants.getListSet().invoke(fCollection, fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index));
-	}
-	public IBeanProxy set(int index, IBeanProxy object) throws ThrowableProxy {
-		return fConstants.getListRemoveInt().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index), object});
-	}											
-	public ListBeanProxyWrapper subList(int fromIndex, int toIndex) throws ThrowableProxy {
-		IBeanProxy list = fConstants.getListSubList().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(fromIndex), fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(toIndex)});
-		if (list != null)
-			return new ListBeanProxyWrapper(list);
-		else
-			return null;		
-	}
-												
-		
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListIteratorBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListIteratorBeanProxyWrapper.java
deleted file mode 100644
index e19802886..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListIteratorBeanProxyWrapper.java
+++ /dev/null
@@ -1,84 +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.proxy.core;
-/*
-
-
- */
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.ListIterator proxy.
- * It provides the ListIterator methods to interface to
- * the proxy.
- */
-
-public class ListIteratorBeanProxyWrapper extends IteratorBeanProxyWrapper {
-
-	/**
-	 * Construct with the ListIterator.
-	 */
-	public ListIteratorBeanProxyWrapper(IBeanProxy anIteratorProxy) {
-		super(anIteratorProxy);
-		
-		if (!anIteratorProxy.getTypeProxy().isKindOf(anIteratorProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.ListIterator"))) //$NON-NLS-1$
-			throw new ClassCastException(MessageFormat.format(ProxyMessages.ClassCast_EXC__IncorrectType, new Object[] {anIteratorProxy.getTypeProxy().getTypeName(), "java.util.ListIterator"}));  //$NON-NLS-1$
-	}
-	
-	
-	/**
-	 * ListIterator accessors
-	 */
-	public void add(IBeanProxy object) throws ThrowableProxy {
-		fConstants.getListIteratorAdd().invoke(fIterator, object);
-	}
-	public boolean hasPrevious() {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getListIteratorHasPrevious().invoke(fIterator)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return false;
-		}			
-	}
-	public int nextIndex() {
-		try {
-			return ((IIntegerBeanProxy) fConstants.getListIteratorNextIndex().invoke(fIterator)).intValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return -1;
-		}			
-	}			
-	public IBeanProxy previous() throws ThrowableProxy {
-		return fConstants.getListIteratorPrevious().invoke(fIterator);
-	}
-	public int previousIndex() {
-		try {
-			return ((IIntegerBeanProxy) fConstants.getListIteratorPreviousIndex().invoke(fIterator)).intValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e)); 
-			return -1;
-		}
-	}
-	public void remove() throws ThrowableProxy {
-		fConstants.getListIteratorRemove().invoke(fIterator);
-	}
-	public void set(IBeanProxy object) throws ThrowableProxy {
-		fConstants.getListIteratorSet().invoke(fIterator, object);
-	}				
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListenerList.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListenerList.java
deleted file mode 100644
index d4b47e99c..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListenerList.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-/**
- * This class is used to maintain a list of listeners, and
- * is used in the implementations of several classes within jem
- * which allow you to register listeners of various kinds.
- * It is a fairly lightweight object, occupying minimal space when
- * no listeners are registered.
- * <p>
- * Note that the <code>add</code> method checks for and eliminates 
- * duplicates based on identity (not equality).  Likewise, the
- * <code>remove</code> method compares based on identity.
- * </p>
- * <p>
- * Use the <code>getListeners</code> method when notifying listeners.
- * Note that no garbage is created if no listeners are registered.
- * The recommended code sequence for notifying all registered listeners
- * of say, <code>FooListener.eventHappened</code>, is:
- * <pre>
- * Object[] listeners = myListenerList.getListeners();
- * for (int i = 0; i < listeners.length; ++i) {
- *    ((FooListener) listeners[i]).eventHappened(event);
- * }
- * </pre>
- * </p>
- */
-
-public class ListenerList {
-
-	/**
-	 * The initial capacity of the list. Always >= 1.
-	 */
-	private int capacity;
-
-	/**
-	 * The current number of listeners.
-	 * Maintains invariant: 0 <= size <= listeners.length.
-	 */
-	private int size;
-
-	/**
-	 * The list of listeners.  Initially <code>null</code> but initialized
-	 * to an array of size capacity the first time a listener is added.
-	 * Maintains invariant: listeners != null IFF size != 0
-	 */
-	private Object[] listeners = null;
-
-	/**
-	 * The empty array singleton instance, returned by getListeners()
-	 * when size == 0.
-	 */
-	private static final Object[] EmptyArray = new Object[0];
-
-	/**
-	 * Creates a listener list with an initial capacity of 1.
-	 */
-	public ListenerList() {
-		this(1);
-	}
-
-	/**
-	 * Creates a listener list with the given initial capacity.
-	 *
-	 * @param capacity the number of listeners which this list can initially accept 
-	 *    without growing its internal representation; must be at least 1
-	 */
-	public ListenerList(int capacity) {
-		if (!(capacity >= 1))
-			throw new IllegalArgumentException();
-		this.capacity = capacity;
-	}
-
-	/**
-	 * Adds the given listener to this list. Has no effect if an identical listener
-	 * is already registered.
-	 *
-	 * @param listener the listener
-	 */
-	public void add(Object listener) {
-		if (listener == null)
-			throw new IllegalArgumentException();
-		if (size == 0) {
-			listeners = new Object[capacity];
-		} else {
-			// check for duplicates using identity
-			for (int i = 0; i < size; ++i) {
-				if (listeners[i] == listener) {
-					return;
-				}
-			}
-			// grow array if necessary
-			if (size == listeners.length) {
-				System.arraycopy(
-					listeners,
-					0,
-					listeners = new Object[size * 2 + 1],
-					0,
-					size);
-			}
-		}
-		listeners[size++] = listener;
-	}
-
-	/**
-	 * Removes all listeners from this list.
-	 */
-	public void clear() {
-		size = 0;
-		listeners = null;
-	}
-
-	/**
-	 * Returns an array containing all the registered listeners,
-	 * in the order in which they were added.
-	 * <p>
-	 * The resulting array is unaffected by subsequent adds or removes.
-	 * If there are no listeners registered, the result is an empty array
-	 * singleton instance (no garbage is created).
-	 * Use this method when notifying listeners, so that any modifications
-	 * to the listener list during the notification will have no effect on the
-	 * notification itself.
-	 * </p>
-	 *
-	 * @return the list of registered listeners
-	 */
-	public Object[] getListeners() {
-		if (size == 0)
-			return EmptyArray;
-		Object[] result = new Object[size];
-		System.arraycopy(listeners, 0, result, 0, size);
-		return result;
-	}
-
-	/**
-	 * Returns whether this listener list is empty.
-	 *
-	 * @return <code>true</code> if there are no registered listeners, and
-	 *   <code>false</code> otherwise
-	 */
-	public boolean isEmpty() {
-		return size == 0;
-	}
-
-	/**
-	 * Removes the given listener from this list. Has no effect if an identical
-	 * listener was not already registered.
-	 *
-	 * @param listener the listener
-	 */
-	public void remove(Object listener) {
-		if (listener == null)
-			throw new IllegalArgumentException();
-		for (int i = 0; i < size; ++i) {
-			if (listeners[i] == listener) {
-				if (size == 1) {
-					listeners = null;
-					size = 0;
-				} else {
-					System.arraycopy(
-						listeners,
-						i + 1,
-						listeners,
-						i,
-						--size - i);
-					listeners[size] = null;
-				}
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Returns the number of registered listeners.
-	 *
-	 * @return the number of registered listeners
-	 */
-	public int size() {
-		return size;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/MapJNITypes.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/MapJNITypes.java
deleted file mode 100644
index 7ed975fa2..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/MapJNITypes.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
- 
-
-/**
- * This is a public class to map between JNI and normal format (e.g. "[Ljava.lang.String;" to "java.lang.String[]") and back again.
- * This is for arrays, non-arrays will be left alone since they are already correct.
- * @since 1.1.0
- */
-public class MapJNITypes {
-
-	/**
-	 * Convert the formal type name to the JNI format.
-	 * @param formalTypeName
-	 * @return JNI format
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String getJNITypeName(String formalTypeName) {
-		return MapTypes.getJNIFormatName(formalTypeName);
-	}
-	
-	/**
-	 * Convert the JNI format to the formal type name.
-	 * @param jniTypeName
-	 * @return formal type name or "" if not valid.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String getFormalTypeName(String jniTypeName) {
-		return MapTypes.getFormalTypeName(jniTypeName);
-	}
-	
-	/**
-	 * Return whether the formal type name is for a primitive or not.
-	 * @param formalType
-	 * @return <code>true</code> if for a primitive.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static boolean isFormalTypePrimitive(String formalType) {
-		return MapTypes.MAP_TYPENAME_TO_SHORTSIG.get(formalType) != null;
-	}
-	
-	/**
-	 * Convert the formal type name, with the given number of dimensions,
-	 * to an array JNI type.
-	 * @param finalComponent final component name, should not be an array type.
-	 * @param dimensions number of dimensions for the array.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String getJNITypeName(String finalComponent, int dimensions) {
-		return MapTypes.getJNITypeName(finalComponent, dimensions);
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspath.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspath.java
deleted file mode 100644
index ba030614f..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspath.java
+++ /dev/null
@@ -1,126 +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.proxy.core;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.pde.core.plugin.*;
-
-/**
- * Contribute to classpath PDE entries that are needed for a launch.
- * <p>
- * This is a special class that should not be referenced directly from code. Reference it through the interface that it implements.
- * 
- * @see org.eclipse.jem.internal.proxy.core.IPDEContributeClasspath
- * @since 1.0.2
- */
-class PDEContributeClasspath implements IPDEContributeClasspath {
-
-	public void getPDEContributions(IConfigurationContributionController controller, IConfigurationContributionInfo info) throws CoreException {
-		if (!info.getPluginIds().isEmpty()) {
-			Collection pluginIds = info.getPluginIds().keySet();
-
-			IPluginModelBase[] allModels = PluginRegistry.getAllModels();
-			List fragments = new ArrayList();
-			for (int i = 0; i < allModels.length; i++) {
-				if (allModels[i].isFragmentModel()) {
-					fragments.add(allModels[i]);
-				}
-			}
-
-			for (Iterator itr = fragments.iterator(); itr.hasNext();) {
-				IFragmentModel fragmentModel = (IFragmentModel) itr.next();
-				IFragment fragment = fragmentModel.getFragment();
-				if (pluginIds.contains(fragment.getPluginId())) {
-					// We'll do a cheat for now and assume fragment is for same version of plugin. PDECore actually
-					// checks the version of the fragment against the version of the plugin to see they are for each
-					// other, but we'll just assume they are for now. Change this later if we actually do run into this case.
-					IResource resource = fragment.getModel().getUnderlyingResource();
-					if (resource != null) {
-						IProject fragProject = resource.getProject();
-						if (fragProject.hasNature(JavaCore.NATURE_ID)) {
-							controller.contributeProject(fragProject);
-						}
-						continue;
-					}
-
-					IPluginLibrary[] libraries = fragment.getLibraries();
-					for (int j = 0; j < libraries.length; j++) {
-						IPluginLibrary library = libraries[j];
-						String name = library.getName();
-						String expandedName = expandLibraryName(name);
-
-						IPluginModelBase model = library.getPluginModel();
-						URL url = getPath(model, expandedName);
-						if (url != null)
-							controller.contributeClasspath(url, IConfigurationContributionController.APPEND_USER_CLASSPATH);
-					}
-				}
-			}
-		}
-
-		return;
-	}
-
-	private URL getPath(IPluginModelBase model, String libraryName) {
-		try {
-			IResource resource = model.getUnderlyingResource();
-			if (resource != null) {
-				IResource jarFile = resource.getProject().findMember(libraryName);
-				if (jarFile != null)
-					return jarFile.getFullPath().toFile().toURL();
-			} else {
-				File file = new File(model.getInstallLocation(), libraryName);
-				if (file.exists())
-					return file.toURL();
-			}
-		} catch (MalformedURLException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-		}
-		return null;
-	}
-
-	/**
-	 * This utility method was originally copied from method of same name, in org.eclipse.pde.internal.core.ClasspathUtilCore. It was not API, and
-	 * seems safe enough to copy here. But, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=182555 
-	 * in case there is ever an API method provided to codify these Eclipse rules. 
-	 */
-	private static String expandLibraryName(String source) {
-		if (source == null || source.length() == 0)
-			return ""; //$NON-NLS-1$
-		if (source.indexOf("$ws$") != -1) //$NON-NLS-1$
-			source = source.replaceAll("\\$ws\\$", //$NON-NLS-1$
-					"ws" + IPath.SEPARATOR + TargetPlatform.getWS()); //$NON-NLS-1$
-		if (source.indexOf("$os$") != -1) //$NON-NLS-1$
-			source = source.replaceAll("\\$os\\$", //$NON-NLS-1$
-					"os" + IPath.SEPARATOR + TargetPlatform.getOS()); //$NON-NLS-1$
-		if (source.indexOf("$nl$") != -1) //$NON-NLS-1$
-			source = source.replaceAll("\\$nl\\$", //$NON-NLS-1$
-					"nl" + IPath.SEPARATOR + TargetPlatform.getNL()); //$NON-NLS-1$
-		if (source.indexOf("$arch$") != -1) //$NON-NLS-1$
-			source = source.replaceAll("\\$arch\\$", //$NON-NLS-1$
-					"arch" + IPath.SEPARATOR + TargetPlatform.getOSArch()); //$NON-NLS-1$
-		return source;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java
deleted file mode 100644
index 90c7529e2..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java
+++ /dev/null
@@ -1,52 +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.proxy.core;
-
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.Platform;
-
- 
-
-/**
- * Accessor to the IPDEContributeClasspath instance to use.
- * <pacakge-protected> because only IPDEContributeClasspath should access it.
- * 
- * @since 1.0.2
- */
-class PDEContributeClasspathInstance {
-
-	/**
-	 * Get the instance to use. 
-	 * @return the instance to use or <code>null</code> if PDE not available.
-	 * 
-	 * @since 1.0.2
-	 */
-	public static IPDEContributeClasspath getInstance() {
-		if (Platform.getBundle("org.eclipse.pde.core") != null) { //$NON-NLS-1$
-			try {
-				Class pdeClass = Class.forName("org.eclipse.jem.internal.proxy.core.PDEContributeClasspath"); //$NON-NLS-1$
-				return (IPDEContributeClasspath) pdeClass.newInstance();
-			} catch (ClassNotFoundException e) {
-				// PDE not available, this is ok.
-			} catch (InstantiationException e) {
-				ProxyPlugin.getPlugin().getLogger().log(e.getCause(), Level.WARNING);
-			} catch (IllegalAccessException e) {
-				ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEProcessForPlugin.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEProcessForPlugin.java
deleted file mode 100644
index b77dc516a..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEProcessForPlugin.java
+++ /dev/null
@@ -1,72 +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.proxy.core;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.pde.core.plugin.*;
-
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin.FoundIDs;
- 
-
-/*
- * Used for PDE Processing for the Proxy Plugin class. It will be optionally loaded
- * if PDE plugin is installed. This allows usage in an installation that doesn't have
- * PDE installed.
- * 
- * @since 1.0.2
- */
-class PDEProcessForPlugin implements ProxyPlugin.IPDEProcessForPlugin {
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.ProxyPlugin.IPDEProcessForPlugin#processPlugin(org.eclipse.jdt.core.IJavaProject, java.util.Map, boolean, boolean)
-	 */
-	public void findPlugins(IJavaProject project, FoundIDs foundIds, boolean visible, boolean first) {
-		IPluginModelBase m = PluginRegistry.findModel(project.getProject());
-		if (m instanceof IPluginModel) {
-			// it is a plugin, process it.
-			IPlugin plugin = ((IPluginModel) m).getPlugin();
-			if (foundIds.pluginIds.containsKey(plugin.getId()))
-				return;	// already processed it
-			foundIds.pluginIds.put(plugin.getId(), first || visible ? Boolean.TRUE : Boolean.FALSE);			
-			expandPlugin(plugin, foundIds, visible, first);
-		}
-		return;
-	}
-	
-	private void expandPlugin(IPluginBase plugin, FoundIDs foundIds, boolean visible, boolean first) {
-		IPluginImport[] imports = plugin.getImports();
-		for (int i = 0; i < imports.length; i++) {
-			IPluginImport pi = imports[i];
-			Boolean piValue = (Boolean) foundIds.pluginIds.get(pi.getId());
-			boolean importVisible = first || (visible && pi.isReexported());
-			if (piValue != null && (!importVisible || piValue.booleanValue()))
-				continue;	// we already processed it, this time not visible, or this time visible and was previously visible.
-			// Now either first time, or it was there before, but now visible, but this time it is visible.
-			// We want it to become visible in that case. 
-			foundIds.pluginIds.put(pi.getId(), importVisible ? Boolean.TRUE : Boolean.FALSE);			
-
-			// Note: this search does not take into account the IPluginImport's version or match level
-			// but neither did the previous version
-			IPluginModelBase model = PluginRegistry.findModel(pi.getId());
-			if (model != null && model.isEnabled()) {
-				IPluginBase foundPlugin = model.getPluginBase();
-				if (foundPlugin != null) {
-					expandPlugin(foundPlugin, foundIds, importVisible, false);
-				}
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java
deleted file mode 100644
index c87f1910a..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java
+++ /dev/null
@@ -1,327 +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.proxy.core;
-/*
-
-
- */
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.jem.util.TimerTests;
-
-/**
- * Registry of proxy factories on a per-VM basis.
- * There can be multiple VM's, this would be required by the
- * desktop because more than one project could be open, and each
- * would require their own VM because the classpaths would be different.
- * This class may be subclassed to provide more factories for a particular
- * VM. 
- * Creation date: (3/13/00 10:48:10 AM)
- * @author: Richard Lee Kulp
- */
-public abstract class ProxyFactoryRegistry {
-	
-	protected boolean fIsValid = true;	// The registry is valid until terminated.
-	protected ListenerList registryListeners = new ListenerList();
-	
-	/**
-	 * IRegistryListener
-	 * Listen for the registry being terminated.
-	 */
-	public interface IRegistryListener {
-		/**
-		 * Method registryTerminated.
-		 * 
-		 * The registry has been terminated. When this is called the registry
-		 * is no longer valid. It should not be assumed any calls can be made
-		 * to the registry.
-		 * 
-		 * @param registry
-		 */
-		public void registryTerminated(ProxyFactoryRegistry registry);
-	}
-		
-
-	// Factory registration IS NOT a dynamic registration. Once registered for a VM or an instance
-	// they should not be changed. This is because references are cached in other objects.
-	// The VM associated with this Registry shouldn't exited and restarted because
-	// the cached object will then have invalid references to no longer existing objects.
-	// If the VM needs to be restarted, then all proxies need to be tossed.
-	
-	//
-	// Individual ProxyFactoryRegistry, applies to a particular VM.
-	//
-
-	// ***************************
-	//
-	// IBeanProxyFactory Registry
-	//
-	
-	// The standard bean  proxy factory, the one the desktop will use for packages that have not
-	// been extended and registered by customization developers.
-	protected IStandardBeanProxyFactory fCurrentStandardBeanProxyFactory;
-
-	// The directory of registered extension factories, typically registered by package.
-	final protected Hashtable fRegisteredExtensionBeanProxyFactories = new Hashtable();
-
-	// ***************************
-	//
-	// IBeanTypeProxyFactory Registry
-	//
-	
-	// The standard bean type proxy factory, the one the desktop will use for packages that have not
-	// been extended and registered by customization developers.
-	protected IStandardBeanTypeProxyFactory fCurrentStandardBeanTypeProxyFactory;
-
-	// The directory of registered extension factories, typically registered by package.
-	final protected Hashtable fRegisteredExtensionBeanTypeProxyFactories = new Hashtable();
-	
-
-	// ***************************
-	//
-	// Other factories
-	//
-		
-	protected IMethodProxyFactory fMethodProxyFactory = null;	// Method Proxy Factory
-
-	// ***************************
-	//
-	// Constants Registry. Different extensions can store
-	// objects by key as a registry of constants.
-	// For example, java.awt extension will store an object
-	// which has some pre-fetched method proxies stored in it so
-	// that they don't need to be continually recreated.
-	//
-	// This feature should be used with care, so that
-	// only proxies that really need to be cached should
-	// be cached.
-	//
-	// Don't store proxies to live beans in here because
-	// those will be created and destroyed over and over,
-	// and the instance in this cache will get stale.
-	// Should only store things like often used method
-	// proxies that once created are rarely changed.
-	//
-	// Since the proxies can be on any VM, you should have
-	// an interface defining what's available in your
-	// constants entry, and access it through that.
-
-	protected final Hashtable fRegisteredConstants = new Hashtable();		
-
-	/**
-	 * ProxyFactoryRegistry constructor comment.
-	 */
-	public ProxyFactoryRegistry() {
-		super();
-	}
-	
-	/**
-	 * Method addRegistryListener.
-	 * @param listener
-	 */
-	public void addRegistryListener(IRegistryListener listener) {
-		registryListeners.add(listener);
-	}
-	
-	/**
-	 * Method removeRegistryListener.
-	 * @param listener
-	 */
-	public void removeRegistryListener(IRegistryListener listener) {
-		registryListeners.remove(listener);
-	}
-	
-	protected void fireRegistryTerminated() {
-		if (!registryListeners.isEmpty()) {
-			Object[] list = registryListeners.getListeners();
-			for (int i = 0; i < list.length; i++) {
-				((IRegistryListener) list[i]).registryTerminated(this);
-			}
-		}
-	}
-	
-	/**
-	 Return the current factory to be used for creating IBeanProxy instances
-	 */
-	public IStandardBeanProxyFactory getBeanProxyFactory() {
-		if (fCurrentStandardBeanProxyFactory == null) {
-			throw new RuntimeException(ProxyMessages.ProxyFactory_EXC__NoBeanProxyFactory);
-		}
-		return fCurrentStandardBeanProxyFactory;
-	}
-	/**
-	 Return the current registered bean proxy factory to be used for creating IBeanProxy instances
-	 */
-	public IBeanProxyFactory getBeanProxyFactoryExtension(String packageName) {
-		return (IBeanProxyFactory)fRegisteredExtensionBeanProxyFactories.get(packageName);
-	}
-	
-	/**
-	 Return the current factory to be used for creating IBeanTypeProxy instances
-	 */
-	public IStandardBeanTypeProxyFactory getBeanTypeProxyFactory() {
-		if (fCurrentStandardBeanTypeProxyFactory == null) {
-			throw new RuntimeException(ProxyMessages.ProxyFactory_EXC__NoBeanTypeProxyFactory);
-		}
-		return fCurrentStandardBeanTypeProxyFactory;
-	}
-	/**
-	 Return the current registered bean type proxy factory to be used for creating IBeanTypeProxy instances
-	 */
-	public IBeanTypeProxyFactory getBeanTypeProxyFactoryExtension(String packageName) {
-		return (IBeanTypeProxyFactory)fRegisteredExtensionBeanTypeProxyFactories.get(packageName);
-	}
-	/**
-	 * Return the requested constants entry
-	 */
-	public Object getConstants(Object key) {
-		return fRegisteredConstants.get(key);
-	}
-	/**
-	 * Return the MethodProxyFactory for this VM.
-	 * Creation date: (3/13/00 10:54:59 AM)
-	 * @return org.eclipse.jem.internal.proxy.core.IMethodProxyFactory
-	 */
-	public IMethodProxyFactory getMethodProxyFactory() {
-		return fMethodProxyFactory;
-	}
-	
-	
-	/**
-	 * Set the requested constants entry for this VM.
-	 */
-	public void registerConstants(Object key, Object constant) {
-		fRegisteredConstants.put(key, constant);
-	}
-    
-    /**
-     * Remove the constants for the given key.
-     * @param key
-     * 
-     * @since 1.1.0
-     */
-    public void deregisterConstants(Object key) {
-        fRegisteredConstants.remove(key);
-    }
-	/**
-	 * Release the proxy, no longer needed.
-	 * This is a helper method to easily access the release from the bean proxy factory.
-	 */
-	public void releaseProxy(IBeanProxy proxy) {
-		// To simply things if release is called when the factory is down (invalid), then just
-		// go on because the proxy is already released.
-		if (fCurrentStandardBeanProxyFactory != null)
-			fCurrentStandardBeanProxyFactory.releaseProxy(proxy);
-	} 
-
-	/**
-	 * Is this a valid registry, i.e. is it not terminated.
-	 */
-	public boolean isValid() {
-		return fIsValid;
-	}
-	
-	/**
-	 * Terminate the registry without waiting.
-	 * <p>
-	 * Terminate the registry, but don't necessarily wait for it.
-	 *
-	 * @see #terminateRegistry(boolean)
-	 * @since 1.0.0
-	 */
-	public final void terminateRegistry() {
-		terminateRegistry(false);
-	}
-		
-	/**
-	 * Terminate the registry.
-	 * <p>
-	 * This will go through each factory and terminate it, and
-	 * let the subclass terminate. It will then remove all of the factories so that
-	 * if there are any proxies still hanging around they won't hold onto everything,
-	 * just the this registry will be held onto.
-	 *<p>
-	 * Note during termination, the factories should not reference any other factory.
-	 * It can assume that the factories will take care of themselves and they should
-	 * only release their resources.
-	 * <p>
-	 * The constants registry will not be terminated because they aren't factories.
-	 * However, they will be cleared (no longer referenced) from here so that they
-	 * can be GC'd.
-	 * 
-	 * @param wait <code>true</code> to wait for complete termination, <code>false</code> to kick off termination but return ASAP.
-	 * @since 1.0.2
-	 */
-	public final void terminateRegistry(boolean wait) {
-		if (!fIsValid)
-			return;	// Already or are already terminating. Don't do it again and don't notify again.
-		fIsValid = false;
-		if (fCurrentStandardBeanTypeProxyFactory != null) {
-//			TimerTests.basicTest.startStep("Terminate Bean Type Factory");
-			fCurrentStandardBeanTypeProxyFactory.terminateFactory(wait);
-//			TimerTests.basicTest.stopStep("Terminate Bean Type Factory");
-			fCurrentStandardBeanTypeProxyFactory = null;
-		}
-		if (fCurrentStandardBeanProxyFactory != null) {
-			fCurrentStandardBeanProxyFactory.terminateFactory(wait);
-			fCurrentStandardBeanProxyFactory = null;
-		}
-		if (fMethodProxyFactory != null) {
-			fMethodProxyFactory.terminateFactory(wait);
-			fMethodProxyFactory = null;
-		}
-		
-		Iterator itr = fRegisteredExtensionBeanTypeProxyFactories.values().iterator();
-		while (itr.hasNext()) {
-			((IBeanProxyFactory) itr.next()).terminateFactory(wait);
-		}
-		fRegisteredExtensionBeanTypeProxyFactories.clear();
-		
-		itr = fRegisteredExtensionBeanProxyFactories.values().iterator();
-		while (itr.hasNext()) {
-			((IBeanProxyFactory) itr.next()).terminateFactory(wait);
-		}
-		fRegisteredExtensionBeanProxyFactories.clear();
-		
-		fRegisteredConstants.clear();
-		
-		TimerTests.basicTest.startStep("Registry Terminated"); //$NON-NLS-1$
-		registryTerminated(wait);
-		TimerTests.basicTest.stopStep("Registry Terminated"); //$NON-NLS-1$
-		
-//		TimerTests.basicTest.startStep("Registry Terminated Notification");
-		fireRegistryTerminated();	// Let everyone know that we are gone. This is fired even if wait is false because at this point in time the registry is invalid.
-//		TimerTests.basicTest.stopStep("Registry Terminated Notification");
-	}
-	
-
-	/**
-	 * Terminate the Registry. 
-	 * <p>
-	 * It is up to each registry to determine what this means.
-	 * <p>
-	 * The wait parm is a suggestion if it is <code>false</code>, but it must be honoured if <code>true</code>
-	 * 
-	 * @param wait wait for registry to terminate flag.
-	 * 
-	 * @since 1.0.2
-	 */
-	protected abstract void registryTerminated(boolean wait);
-	
-	/**
-	 * Get the callback registry.
-	 */
-	public abstract ICallbackRegistry getCallbackRegistry();
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFindSupport.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFindSupport.java
deleted file mode 100644
index fe977cf87..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFindSupport.java
+++ /dev/null
@@ -1,209 +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.proxy.core;
-
-import java.io.*;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.*;
-import org.osgi.framework.Bundle;
- 
-
-/**
- * Utility to help finding files. It is used to find them within plugins of the current platform or to find them in the PDE target platform.
- * Also if in the current platform and the current platform is in development mode it will find the bin directories for the jars instead since
- * there are no jars in that case.
- * It can also extract non-local files (such as files within a jar) and make a cache of them so that are a local file and not extracted everytime
- * they are needed.
- *
- * TODO If we ever get back to continuing development we should add to this PDE Target support. And test the code here 
- * since it hasn't been tested yet. Also note that in configuration contributor,
- * when we add the library path we expect it to be a folder. This would be a problem with jarred plugins because the directory containing the
- * libraries may be the root of the plugin and localizing a directory would extract and cache the entire plugin. Need to change to figure out
- * how to only extract the dll/so needed instead. Also, none of these handle the case where the bundle is actually non-local (e.g. "http:/").
- * @since 1.2.0
- */
-public class ProxyFindSupport {
-
-	
-	/**
-	 * Find the filename relative to the platform bundle. It will search in the bundle and in all fragments for the file name.
-	 * It will return a URL for each found file.
-	 * <p>
-	 * This is useful for NLS purposes. In NLS situations the main bundle would contain the main non-library jar with the default properties files.
-	 * Then a fragment for each set of languages will be installed. Within each fragment will be a jar with the same filepath, and it will
-	 * contain the properties files for that language. This would be done only for plugin non-library jars. 
-	 * The NLS for library jars of a plugin (i.e. those jars that are the <runtime> jars for the plugin) are usually library jars themselves in
-	 * the fragment, and they usually have a different name than the main library jar. So this should not be used for library jars.
-	 * <p>
-	 * If in development mode, then if the jar is not found it will look in the plugin project's build.properties to find the output directory
-	 * of the jar. If not in the build.properties (meaning it isn't being built by PDE), it will look in the proxy.jars file (if there is one).
-	 * This file is used for jars that are built in a separate project from the plugin but will be found in the plugin at execution.
-	 * 
-	 * @param bundle bundle and its fragments to look in.
-	 * @param filenameWithinBundle path to filename within the bundle and fragments. <b>This must be a file, not a directory.</b> 
-	 *   For finding the bundle itself (only when the bundle is packaged as a jar), use <@link #platformFind(Bundle)>. This does not use
-	 *   the platform shortcuts like "$os$". It finds the files exactly as specified.
-	 * @param asLocal <code>true</code> if the urls need to point to local filesystem files. This may cause caching of files locally. This
-	 * could happen if the file is within a plugin that is jarred. <code>false</code> if the url can be a non-local filesystem url. 
-	 * @return array of URL's for found files. 
-	 * 
-	 * @since 1.2.0
-	 */
-	public static URL[] platformFindAll(Bundle bundle, IPath filenameWithinBundle, boolean asLocal) {
-		Bundle[] fragments = Platform.getFragments(bundle);
-		ArrayList urls = new ArrayList((fragments == null ? 0 : fragments.length) + 1);
-		String filename = filenameWithinBundle.toString();
-		URL url = internalFindFromBundleOnly(bundle, filename, asLocal);
-		if (url != null)
-			urls.add(url);
-		if (fragments != null) {
-			for (int i = 0; i < fragments.length; i++) {
-				Bundle fragment = fragments[i];
-				url = internalFindFromBundleOnly(fragment, filename, asLocal);
-				if (url != null)
-					urls.add(url);
-			}
-		}
-		return (URL[]) urls.toArray(new URL[urls.size()]);
-	}
-	
-	/**
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @param asLocal
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	private static URL internalFindFromBundleOnly(Bundle bundle, String filenameWithinBundle, boolean asLocal) {
-		try {
-			URL pvm = bundle.getEntry(filenameWithinBundle);
-			if (pvm != null)
-				return asLocal ? FileLocator.toFileURL(pvm) : pvm;
-		} catch (IOException e) {
-		}
-		if (ProxyPlugin.getPlugin().isDevMode()) {
-			return findDev(bundle, filenameWithinBundle, asLocal);
-		} else
-			return null;
-	}
-
-	/**
-	 * Find the filename relative to the platform bundle. It will search in the bundle and in all fragments for the file name. It will return
-	 * URL for the file if found.
-	 * <p>
-	 * If in development mode, then if the jar is not found it will look in the plugin project's build.properties to find the output directory
-	 * of the jar. If not in the build.properties (meaning it isn't being built by PDE), it will look in the proxy.jars file (if there is one).
-	 * This file is used for jars that are built in a separate project from the plugin but will be found in the plugin at execution.
-	 * 
-	 * @param bundle bundle and its fragments to look in.
-	 * @param filenameWithinBundle path to filename within the bundle and fragments. <b>This must be a file, not a directory.</b> 
-	 *   For finding the bundle itself (only when the bundle is packaged as a jar), use <@link #platformFind(Bundle)>.
-	 * @param asLocal <code>true</code> if the urls need to point to local filesystem files. This may cause caching of files locally. This
-	 * could happen if the file is within a plugin that is jarred. <code>false</code> if the url can be a non-local filesystem url.  
-	 * @return the found url or <code>null</code> if not found.
-	 * 
-	 * @since 1.2.0
-	 */
-	public static URL platformFind(Bundle bundle, IPath filenameWithinBundle, boolean asLocal) {
-		try {
-			URL pvm = FileLocator.find(bundle, filenameWithinBundle, null);
-			if (pvm != null)
-				return asLocal ? FileLocator.toFileURL(pvm) : pvm;
-		} catch (IOException e) {
-		}
-		if (ProxyPlugin.getPlugin().isDevMode()) {
-			return findDev(bundle, filenameWithinBundle.toString(), asLocal);
-		} else
-			return null;
-		
-	}
-	
-	private static final String BUILDPROPERTIES = "build.properties";	//$NON-NLS-1$
-	private static final String PROXYJARS = "proxy.jars";	//$NON-NLS-1$
-	
-	private static URL findDev(Bundle bundle, String filenameWithinBundle, boolean asLocal) {
-		// Got this far and in dev mode means it wasn't found, so we'll try for development style.
-		// It is assumed that in dev mode, we are running with the IDE as local and any 
-		// build outputs will be local so local file protocol will be returned
-		// from Platform.resolve(). We won't be running in dev mode with our entireplugin being in a jar,
-		// or on a separate system.
-		try {
-			URL bp = bundle.getEntry(BUILDPROPERTIES);
-			if (bp != null) {
-				InputStream ios = null;
-				try {
-					ios = bp.openStream();
-					Properties props = new Properties();
-					props.load(ios);
-					String pathString = props.getProperty("output."+filenameWithinBundle.toString()); //$NON-NLS-1$
-					if (pathString != null) {
-						URL pvm = bundle.getEntry(pathString);
-						if (pvm != null)
-							return asLocal ? FileLocator.toFileURL(pvm) : pvm;
-					}
-				} finally {
-					if (ios != null)
-						ios.close();
-				}
-			}
-		} catch (IOException e) {
-		}
-
-		try {
-			URL pvm = bundle.getEntry(PROXYJARS);
-			if (pvm != null) {
-				InputStream ios = null;
-				try {
-					ios = pvm.openStream();
-					Properties props = new Properties();
-					props.load(ios);
-					String pathString = props.getProperty(filenameWithinBundle.toString());
-					if (pathString != null) {
-						URL url = FileLocator.resolve(bundle.getEntry("/"));	// It is assumed that if in debug mode, then this plugin is an imported plugin within the developement workspace. //$NON-NLS-1$
-						if (url.getProtocol().equals("file")) { //$NON-NLS-1$
-							File file = new File(url.getFile()).getParentFile();	// This gets us to workspace root of development workspace.
-							file = new File(file, pathString);
-							return file.toURL();
-						}
-					}
-				} finally {
-					if (ios != null)
-						ios.close();
-				}
-			}
-		} catch (IOException e) {
-		}
-		return null;
-	}
-
-	
-	/**
-	 * Find the bundle and all active fragments libraries. This should normally be used only when the bundle is packaged as a jar and not as a directory. It will
-	 * return the urls to the jars of the bundle and fragments. If in development mode it will find the bundle's "." output directory.
-	 * @param bundle
-	 * @return array of URL's for the jarred bundle and fragments. If the bundle/fragments are not packaged as jars, then the array will be empty.
-	 * 
-	 * @since 1.2.0
-	 */
-	public static URL[] platformFind(Bundle bundle) {
-		return null;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java
deleted file mode 100644
index 4a18afbed..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java
+++ /dev/null
@@ -1,871 +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.proxy.core;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo.ContainerPaths;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin.FoundIDs;
-import org.eclipse.jem.util.PerformanceMonitorUtil;
-import org.eclipse.jem.util.TimerTests;
-
- 
-/**
- * This is the used to launch the proxy registries.
- * This is a static helper class, it is not meant to be instantiated.
- * 
- * @since 1.0.0
- */
-public class ProxyLaunchSupport {
-	
-	// The key for the persisten property is in ProxyPlugin so that it can set it on startup without
-	// causing this class to be initialized. We don't want this class initialized until the very last
-	// moment when needed. This is because it needs UI to be active when initialized to query some 
-	// values and if ProxyPlugin.start() causes this class to initialize, it may be too soon.
-	//
-	// If a project's persistent property is set with this value, that means there is at least one
-	// launch configuration with this project, but none are selected as the default. This is here
-	// so that we can check in the object contribution that if not set then don't show the menu
-	// item at all. This is to clean up the popup menu so not so cluttered.
-	// If the property is trully not set, then there is no default and there are no configurations for it.
-	public static final String NOT_SET = "...not..set..";	  //$NON-NLS-1$
-		
-	public static final String EXPRESSION_TRACING = "/debug/traceexpressions";	// Trace IExpressions. //$NON-NLS-1$
-	
-	/**
-	 * Timer threshold for indicating any expressions that took longer than this.
-	 * If not set, then threshold will default to 100ms.
-	 * It will only be used if traceexpressions is true.
-	 */
-	public static final String EXPRESSION_TRACEING_TIMER_THRESHOLD = "/debug/traceexpressionstimethreshold";	 //$NON-NLS-1$
-	
-	/*
-	 * Registry of launch key to LaunchInfo classes.
-	 */
-	private static Map LAUNCH_INFO = new HashMap(2);
-
-	/**
-	 * Public only for access by other launch delegates to set up if they go outside of ProxyLaunchSupport,
-	 * e.g. IDE proxy. Must not be used for any purpose.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static class LaunchSupportIConfigurationContributionInfo implements IConfigurationContributionInfo {
-		
-		/**
-		 * Construct with no settings. This is to be used by other launch delegates that
-		 * don't have a {@link FoundIDs} available to fill in the fields. Those 
-		 * delegates must fill the fields themselves.  
-		 * 
-		 * 
-		 * @since 1.2.0
-		 */
-		public LaunchSupportIConfigurationContributionInfo(IJavaProject javaProject) {
-			this.javaProject = javaProject;
-		}
-		
-		public LaunchSupportIConfigurationContributionInfo(IJavaProject javaProject, FoundIDs foundIDs) {
-			this(javaProject);
-			containerIds = foundIDs.containerIds;
-			containers = foundIDs.containers;
-			pluginIds = foundIDs.pluginIds;
-			projectPaths = foundIDs.projects;
-		}
-		
-		/* (non-Javadoc)
-		 * Map of containers (IClasspathContainer) found in classpath (including required projects).
-		 * This is for each project found. If there was a container in more than one project with the
-		 * id, this set will contain the container from each such project. They are not considered the
-		 * same because they come from a different project.
-		 * <p>
-		 * The key will be the containers, and the value will be a <code>Boolean</code>, where true means it
-		 * is visible to the top-level project.
-		 * <p>
-		 * This is used for determining if a project's container implements the desired contributor.
-		 * 
-		 * Will be empty if no project sent in to launch configuration.
-		 * 
-		 * @see org.eclipse.jdt.core.IClasspathContainer
-		 * 
-		 */
-		public Map containers = Collections.EMPTY_MAP;
-
-		
-		/* (non-Javadoc)
-		 * Map of unique container id strings found in classpath (including required projects).
-		 * If a container with the same id was found in more than one project, only one id will
-		 * be in this set since they are the same.
-		 * <p>
-		 * The key will be the container ids, and the value will be ContainerPaths
-		 * 
-		 * Will be empty if no project sent in to launch configuration.
-		 * 
-		 */
-		public Map containerIds = Collections.EMPTY_MAP;
-		
-		/* (non-Javadoc)
-		 * Set of unique plugin id strings found in classpath (including required projects).
-		 * If a required plugin with the same id was found in more than one project, only one id will
-		 * be in this set since they are the same.
-		 * <p>
-		 * The key will be the plugin ids, and the value will be a <code>Boolean</code>, where true means it
-		 * is visible to the top-level project.
-		 * 
-		 * Will be empty if no project sent in to launch configuration.
-		 */		
-		public Map pluginIds = Collections.EMPTY_MAP;;
-		
-		/* (non-Javadoc)
-		 * Map of unique projects found in classpath (including required projects), but not including top-level project.
-		 * <p>
-		 * The key will be the <code>IPath</code> for the project, and the value will be a <code>Boolean</code>, where true means it
-		 * is visible to the top-level project.
-		 * 
-		 * Will be <code>null</code> if no project sent in to launch configuration.
-		 */		
-		public Map projectPaths;
-		
-		/* (non-Javadoc)
-		 * Java project for this launch. <code>null</code> if not for a project.
-		 */
-		public IJavaProject javaProject;
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getContainerIds()
-		 */
-		public Map getContainerIds() {
-			return containerIds;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getContainers()
-		 */
-		public Map getContainers() {
-			return containers;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getJavaProject()
-		 */
-		public IJavaProject getJavaProject() {
-			return javaProject;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getPluginIds()
-		 */
-		public Map getPluginIds() {
-			return pluginIds;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getProjectPaths()
-		 */
-		public Map getProjectPaths() {
-			return projectPaths;
-		}
-		
-	}
-		
-	/**
-	 * LaunchInfo for a launch. Stored by key and retrievable by the key.
-	 * This is only passed to launch delegates. It should not be passed on to
-	 * others, though the IConfigurationContributionInfo may be.
-	 * 
-	 * <p>
-	 * This class is not intended to be subclassed by clients.
-	 * </p>
-	 * 
-	 * @see ProxyLaunchSupport#getInfo(String)
-	 * @see IConfigurationContributionInfo
-	 * @since 1.0.0
-	 */
-	public static class LaunchInfo {
-		/**
-		 * Contributors for this launch. It will never be <code>null</code>. It may be empty.
-		 */
-		public IConfigurationContributor[] contributors;
-		
-		/**
-		 * The registry returned from the launch. The launch needs to set this before it returns.
-		 */
-		public ProxyFactoryRegistry resultRegistry;
-		
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getJavaProject()
-		 */
-		public IJavaProject getJavaProject() {
-			return configInfo.getJavaProject();
-		}		
-		
-		/**
-		 * Return the IConfigurationContributionInfo for this launch.
-		 * @return
-		 * 
-		 * @since 1.0.0
-		 */
-		public IConfigurationContributionInfo getConfigInfo() {
-			return configInfo;
-		}
-		
-		protected IConfigurationContributionInfo configInfo;
-		
-	}
-	
-	/**
-	 * Start an implementation using the default config for the given project.
-	 * <p> 
-	 * This will wait for build. If you
-	 * know the build has been suspended by your thread, then you must use the other method that takes a waitForThread
-	 * boolean, and you must pass in false. Otherwise it will deadlock.
-	 * 
-	 * @param project The project. It must be a java project, and it cannot be <code>null</code>.
-	 * @param vmTitle title for VM. It may be <code>null</code>.
-	 * @param aContribs The contributions array. It may be <code>null</code>.
-	 * @param pm
-	 * @return The created registry.
-	 * @throws CoreException
-	 * 
-	 * @see ProxyLaunchSupport#startImplementation(IProject, String, IConfigurationContributor[], boolean, IProgressMonitor)
-	 * @since 1.0.0
-	 */
-	public static ProxyFactoryRegistry startImplementation(
-			IProject project,
-			String vmTitle,
-			IConfigurationContributor[] aContribs,
-			IProgressMonitor pm)
-				throws CoreException {
-		return startImplementation(project, vmTitle, aContribs, true, pm);
-	}
-	
-	/**
-	 * Start an implementation using the default config for the given project.
-	 * <p> 
-	 * If you know the build has been suspended by your thread, then you must use call this with false for waitForThread. Otherwise it will deadlock.
-	 * 
-	 * @param project The project. It must be a java project, and it cannot be <code>null</code>.
-	 * @param vmTitle title for VM. It may be <code>null</code>.
-	 * @param aContribs The contributions array. It may be <code>null</code>.
-	 * @param waitForBuild wait for the build. If caller knows that the build has been suspended by this thread, then it must call this with false. Otherwise a deadlock will occur.
-	 * @param pm
-	 * @return The created registry.
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static ProxyFactoryRegistry startImplementation(
-			IProject project,
-			String vmTitle,
-			IConfigurationContributor[] aContribs,
-			boolean waitForBuild, 
-			IProgressMonitor pm)
-				throws CoreException {
-		// First find the appropriate launch configuration to use for this project.
-		// The process is:
-		//	1) See if the project's persistent property has a setting for "proxyLaunchConfiguration", if it does,
-		//		get the configuration of that name and create a working copy of it.
-		//	2) If not, then get the "org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"
-		//		and create a new instance working copy.
-
-		IJavaProject javaProject = JavaCore.create(project);
-		if (javaProject == null) {
-			throw new CoreException(
-					new Status(
-							IStatus.WARNING,
-							ProxyPlugin.getPlugin().getBundle().getSymbolicName(),
-							0,
-							MessageFormat.format(
-									ProxyMessages.Not_Java_Project_WARN_, 
-									new Object[] { project.getName()}),
-							null));
-		}
-
-		// First if specific set.
-		String launchName = project.getPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION);
-		ILaunchConfiguration config = null;		
-		if (launchName != null && !NOT_SET.equals(launchName)) {
-			ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations();
-			for (int i = 0; i < configs.length; i++) {
-				if (configs[i].getName().equals(launchName)) {
-					config = configs[i];
-					break;
-				}
-			}
-			if (config == null || !config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "").equals(project.getName())) { //$NON-NLS-1$
-				project.setPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION, (String) null);	// Config not found, or for a different project, so no longer the default.
-				config = null;
-			}
-		}
-		
-		if (config == null) {
-			ILaunchConfigurationWorkingCopy configwc = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(IProxyConstants.LOCAL_LAUNCH_TYPE).newInstance(null, DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom("LocalProxy_"+project.getName())); //$NON-NLS-1$
-			configwc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, project.getName()); 
-			config = configwc;
-		}
-		
-		return startImplementation(config, vmTitle, aContribs, waitForBuild, pm);
-	}
-	
-	/**
-	 * Launch a registry using the given configuration.
-	 * <p> 
-	 * This will wait for build. If you
-	 * know the build has been suspended by your thread, then you must use the other method that takes a waitForThread
-	 * boolean, and you must pass in false. Otherwise it will deadlock.
-	 *
-	 * @param config 
-	 * @param vmTitle title for VM. It may be <code>null</code>.
-	 * @param aContribs The contributions array. It may be <code>null</code>.
-	 * @param pm
-	 * @return The registry from this configuration.
-	 * @throws CoreException
-	 * 
-	 * @see ProxyLaunchSupport#startImplementation(ILaunchConfiguration, String, IConfigurationContributor[], boolean, IProgressMonitor)
-	 * @since 1.0.0
-	 */
-	public static ProxyFactoryRegistry startImplementation(
-			ILaunchConfiguration config,
-			String vmTitle,
-			IConfigurationContributor[] aContribs,
-			IProgressMonitor pm)
-			throws CoreException {
-		return startImplementation(config, vmTitle, aContribs, true, pm);
-	}
-
-	/**
-	 * Launch a registry using the given configuration.
-	 * <p> 
-	 * If you know the build has been suspended by your thread, then you must use you must pass in false for waitForThread. Otherwise it will deadlock.
-	 *
-	 * @param config
-	 * @param vmTitle title for VM. It may be <code>null</code>.
-	 * @param aContribs The contributions array. It may be <code>null</code>.
-	 * @param waitForBuild wait for the build. If caller knows that the build has been suspended by this thread, then it must call this with false. Otherwise a deadlock will occur.
-	 * @param pm
-	 * @return The registry from this configuration.
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static ProxyFactoryRegistry startImplementation(
-				ILaunchConfiguration config,
-				String vmTitle,
-				IConfigurationContributor[] aContribs,
-				boolean waitForBuild,
-				IProgressMonitor pm)
-				throws CoreException {
-
-		if (pm == null)
-			pm = new NullProgressMonitor();
-		String stepId = "Pre-launch VM ( " + vmTitle + " )"; //$NON-NLS-1$ //$NON-NLS-2$
-		TimerTests.basicTest.startStep(stepId);
-		if (vmTitle.equals("Beaninfo")) //$NON-NLS-1$
-			PerformanceMonitorUtil.getMonitor().snapshot(125);
-		final ILaunchConfigurationWorkingCopy configwc = config.getWorkingCopy();
-		
-		pm.beginTask("", 400); //$NON-NLS-1$
-		pm.subTask(ProxyMessages.ProxyLaunch);	
-		if (waitForBuild) {
-			// See if build needed or waiting or inprogress, if so, wait for it to complete. We've
-			// decided too difficult to determine if build would affect us or not, so just wait.		
-			if (UI_RUNNER != null)
-				UI_RUNNER.handleBuild(new SubProgressMonitor(pm, 100));
-			else
-				runBuild(new SubProgressMonitor(pm, 100));
-			
-			if (pm.isCanceled())
-				return null;
-		}
-				
-		if (aContribs != null) {
-			IConfigurationContributor[] newContribs = new IConfigurationContributor[aContribs.length+1];
-			System.arraycopy(aContribs, 0, newContribs, 1, aContribs.length);
-			newContribs[0] = new ProxyContributor();
-			aContribs = newContribs;
-		} else
-			aContribs = new IConfigurationContributor[] {new ProxyContributor()};
-
-		String launchKey = String.valueOf(System.currentTimeMillis());
-		LaunchInfo launchInfo = new LaunchInfo();
-		synchronized (ProxyLaunchSupport.class) {
-			while (LAUNCH_INFO.containsKey(launchKey)) {
-				launchKey += 'a'; // Just add something on to make it unique.
-			}
-			LAUNCH_INFO.put(launchKey, launchInfo);
-		}
-		
-		String projectName = configwc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null);
-		aContribs = fillInLaunchInfo(aContribs, launchInfo, projectName);
-		
-		try {		
-			configwc.setAttribute(IProxyConstants.ATTRIBUTE_LAUNCH_KEY, launchKey);
-			if (vmTitle != null && vmTitle.length()>0)
-				configwc.setAttribute(IProxyConstants.ATTRIBUTE_VM_TITLE, vmTitle);
-			
-			if (ATTR_PRIVATE != null)
-				configwc.setAttribute(ATTR_PRIVATE, true);			
-			
-			// Let contributors modify the configuration.
-			final IConfigurationContributor[] contribs = aContribs;
-			final LaunchInfo linfo = launchInfo;
-			for (int i = 0; i < contribs.length; i++) {
-				// First run the initialize.
-				// Run in safe mode so that anything happens we don't go away.
-				final int ii = i;
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Don't need to do anything. Platform.run logs it for me.
-					}
-
-					public void run() throws Exception {
-						contribs[ii].initialize(linfo.getConfigInfo());
-					}
-				});
-
-				// Now run the contribute to configuration.
-				// Run in safe mode so that anything happens we don't go away.
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Don't need to do anything. Platform.run logs it for me.
-					}
-
-					public void run() throws Exception {
-						contribs[ii].contributeToConfiguration(configwc);
-					}
-				});
-			}
-			pm.worked(100);
-			
-			configwc.launch(ILaunchManager.RUN_MODE, new SubProgressMonitor(pm, 100));
-			
-			final ProxyFactoryRegistry reg = launchInfo.resultRegistry;
-			if (!pm.isCanceled() && reg == null)
-				throw new CoreException(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.ProxyLaunchSupport_RegistryCouldNotStartForSomeReason_WARN_, null)); 
-			if (pm.isCanceled()) {
-				if (reg != null)
-					reg.terminateRegistry();
-				return null;
-			}
-			
-			performExtensionRegistrations((BaseProxyFactoryRegistry) reg, launchInfo);
-			
-//			TimerTests.basicTest.startStep("contribute to registry");
-			for (int i = 0; i < contribs.length; i++) {
-				final int ii = i;
-				// Run in safe mode so that anything happens we don't go away.
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Don't need to do anything. Platform.run logs it for me.
-					}
-
-					public void run() throws Exception {
-//						String stepid = "contribute to registry for " + contribs[ii].getClass();
-//						TimerTests.basicTest.startStep(stepid);
-						contribs[ii].contributeToRegistry(reg);
-//						TimerTests.basicTest.stopStep(stepid);
-					}
-				});
-			}
-//			TimerTests.basicTest.stopStep("contribute to registry");
-		} finally {
-			// Clean up and return.
-			LAUNCH_INFO.remove(launchKey);
-		}	
-		
-		pm.done();
-		if (vmTitle.equals("Beaninfo")) //$NON-NLS-1$
-			PerformanceMonitorUtil.getMonitor().snapshot(126);
-		TimerTests.basicTest.stopStep(stepId);
-		return launchInfo.resultRegistry;
-	}
-	
-	/**
-	 * Create a default IConfigurationContributionInfo for the given project. This is useful info even when not launching a
-	 * vm.
-	 * 
-	 * @param javaProject
-	 * @return new contrib info.
-	 * @throws JavaModelException
-	 * 
-	 * @since 1.1.0
-	 */
-	public static IConfigurationContributionInfo createDefaultConfigurationContributionInfo(IJavaProject javaProject) throws JavaModelException {
-		LaunchSupportIConfigurationContributionInfo configInfo = new LaunchSupportIConfigurationContributionInfo(javaProject,
-				ProxyPlugin.getPlugin().getIDsFound(javaProject));
-		return configInfo;
-
-	}
-	
-	/**
-	 * Use in calling {@link ProxyLaunchSupport#fillInLaunchInfo(IConfigurationContributor[], LaunchInfo, String)} for the configuration
-	 * contributors array if there are no incoming contributors.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final IConfigurationContributor[] EMPTY_CONFIG_CONTRIBUTORS = new IConfigurationContributor[0];
-	/**
-	 * Fill in the launch info config info and contribs. The contribs sent in may be expanded due to extension
-	 * points and a new one created. Either the expanded copy or the original (if no change) will be stored in
-	 * the launchinfo and returned from this call.
-	 * 
-	 * @param aContribs this should never be <code>null</code>. Pass in {@link ProxyLaunchSupport#EMPTY_CONFIG_CONTRIBUTORS} in that case.
-	 * @param launchInfo
-	 * @param projectName
-	 * @return a modified aContribs if any change was made to it.  This will never be <code>null</code>. It will return an empty list if aContribs was null and no changes were made.
-	 * @throws JavaModelException
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static IConfigurationContributor[] fillInLaunchInfo(IConfigurationContributor[] aContribs, LaunchInfo launchInfo, String projectName) throws JavaModelException, CoreException {
-		if (projectName != null) {
-			projectName = projectName.trim();
-			if (projectName.length() > 0) {
-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-				IJavaProject javaProject = JavaCore.create(project);
-				if (javaProject != null && javaProject.exists()) {
-					launchInfo.configInfo = createDefaultConfigurationContributionInfo(javaProject);
-					if (!launchInfo.configInfo.getContainerIds().isEmpty() || !launchInfo.configInfo.getContainers().isEmpty() || !launchInfo.configInfo.getPluginIds().isEmpty()) {
-						List computedContributors = new ArrayList(launchInfo.configInfo.getContainerIds().size()+launchInfo.configInfo.getContainers().size()+launchInfo.configInfo.getPluginIds().size());
-						// Note: We don't care about the visibility business here. For contributors to proxy it means
-						// some classes in the projects/plugins/etc. need configuration whether they are visible or not.
-						// This is because even though not visible, some other visible class may instantiate it. So it
-						// needs the configuration.
-						// First handle explicit classpath containers that implement IConfigurationContributor
-						for (Iterator iter = launchInfo.configInfo.getContainers().keySet().iterator(); iter.hasNext();) {
-							IClasspathContainer container = (IClasspathContainer) iter.next();
-							if (container instanceof IConfigurationContributor)
-								computedContributors.add(container);
-						}
-						
-						// Second add in contributors that exist for a container id.
-						for (Iterator iter = launchInfo.configInfo.getContainerIds().values().iterator(); iter.hasNext();) {
-							ContainerPaths paths = (ContainerPaths) iter.next();
-							IConfigurationElement[] contributors = ProxyPlugin.getPlugin().getContainerConfigurations(paths.getContainerId(), paths.getAllPaths());
-							if (contributors != null)
-								for (int i = 0; i < contributors.length; i++) {
-									Object contributor = contributors[i].createExecutableExtension(ProxyPlugin.PI_CLASS);
-									if (contributor instanceof IConfigurationContributor)
-										computedContributors.add(contributor);
-								}
-						}
-						
-						// Finally add in contributors that exist for a plugin id.
-						for (Iterator iter = launchInfo.configInfo.getPluginIds().keySet().iterator(); iter.hasNext();) {
-							String pluginId = (String) iter.next();
-							IConfigurationElement[] contributors = ProxyPlugin.getPlugin().getPluginConfigurations(pluginId);
-							if (contributors != null)
-								for (int i = 0; i < contributors.length; i++) {
-									Object contributor = contributors[i].createExecutableExtension(ProxyPlugin.PI_CLASS);
-									if (contributor instanceof IConfigurationContributor)
-										computedContributors.add(contributor);
-								}
-						}
-						
-						// Now turn into array
-						if (!computedContributors.isEmpty()) {
-							IConfigurationContributor[] newContribs = new IConfigurationContributor[aContribs.length
-									+ computedContributors.size()];
-							System.arraycopy(aContribs, 0, newContribs, 0, aContribs.length);
-							IConfigurationContributor[] cContribs = (IConfigurationContributor[]) computedContributors
-									.toArray(new IConfigurationContributor[computedContributors.size()]);
-							System.arraycopy(cContribs, 0, newContribs, aContribs.length, cContribs.length);
-							aContribs = newContribs;
-						}
-					}
-				}
-			}
-		}
-		
-		launchInfo.contributors = aContribs;
-		return aContribs;
-	}
-	
-	/**
-	 * Execute the extension registrations that are valid for this type of registry and the launchinfo paths.
-	 * <p>
-	 * This is meant to be called only by registry implementations that do not launch through a launch configration after the registry is created but
-	 * before the {@link IConfigurationContributor#contributeToRegistry(ProxyFactoryRegistry)} is called. This will be called automatically
-	 * by registries that used a launch configuration to launch.
-	 * 
-	 * @param baseRegistry
-	 * @param launchInfo
-	 * @throws CoreException 
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void performExtensionRegistrations(final BaseProxyFactoryRegistry baseRegistry, LaunchInfo launchInfo) throws CoreException {
-		IConfigurationContributionInfo configInfo = launchInfo.configInfo;
-		if (configInfo != null && (!configInfo.getContainerIds().isEmpty() || !configInfo.getPluginIds().isEmpty())) {
-			String registryID = baseRegistry.getRegistryTypeID();
-			// Note: We don't care about the visibility business here. For contributors to proxy it means
-			// some classes in the projects/plugins/etc. need configuration whether they are visible or not.
-			// This is because even though not visible, some other visible class may instantiate it. So it
-			// needs the configuration.
-			
-			// First call registrations that exist for a container id.
-			for (Iterator iter = configInfo.getContainerIds().values().iterator(); iter.hasNext();) {
-				ContainerPaths paths = (ContainerPaths) iter.next();
-				IConfigurationElement[] contributors = ProxyPlugin.getPlugin().getContainerExtensions(paths.getContainerId(), paths.getAllPaths());
-				if (contributors != null)
-					for (int i = 0; i < contributors.length; i++) {
-						if (registryID.equals(contributors[i].getAttribute(ProxyPlugin.PI_REGISTRY_TYPE))) {
-							try {
-								final IExtensionRegistration contributor = (IExtensionRegistration) contributors[i].createExecutableExtension(ProxyPlugin.PI_CLASS);
-								SafeRunner.run(new ISafeRunnable() {
-								
-									public void run() throws Exception {
-										contributor.register(baseRegistry);
-									}
-								
-									public void handleException(Throwable exception) {
-										// Don't need to do anything, Platform logs it for me.
-									}
-								
-								});
-							} catch (ClassCastException e) {
-								// If not right class, just ignore it.
-							}
-						}
-					}
-			}
-			
-			// Finally add in contributors that exist for a plugin id.
-			for (Iterator iter = configInfo.getPluginIds().keySet().iterator(); iter.hasNext();) {
-				String pluginId = (String) iter.next();
-				IConfigurationElement[] contributors = ProxyPlugin.getPlugin().getPluginExtensions(pluginId);
-				if (contributors != null)
-					for (int i = 0; i < contributors.length; i++) {
-						if (registryID.equals(contributors[i].getAttribute(ProxyPlugin.PI_REGISTRY_TYPE))) {
-							try {
-								final IExtensionRegistration contributor = (IExtensionRegistration) contributors[i].createExecutableExtension(ProxyPlugin.PI_CLASS);
-								SafeRunner.run(new ISafeRunnable() {
-								
-									public void run() throws Exception {
-										contributor.register(baseRegistry);
-									}
-								
-									public void handleException(Throwable exception) {
-										// Don't need to do anything, Platform logs it for me.
-									}
-								
-								});
-							} catch (ClassCastException e) {
-								// If not right class, just ignore it.
-							}
-						}
-					}
-			}
-	}
-}
-
-
-	/*
-	 * Run the build. If the original launch was in the UI thread, this will
-	 * be called under control of an IProgressService so that it is in a separate
-	 * thread and the UI will remain responsive (in that either a busy cursor comes
-	 * up or eventually a progress dialog).
-	 * If the pm is canceled, this will just return, but the caller must check if the pm is canceled.
-	 * 
-	 * <package-protected> so that only the UI handler will access it.
-	 */
-	static void runBuild(IProgressMonitor pm) throws CoreException {
-		boolean autobuilding = ResourcesPlugin.getWorkspace().isAutoBuilding();
-		if (!autobuilding) {
-			try {
-				// We are not autobuilding. So kick off a build right here and
-				// wait for it. (If we already within a build on this thread, then this
-				// will return immediately without building. We will take that risk. If
-				// some other thread is building, we will wait for it finish before we
-				// can get it and do our build.
-				ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, pm); 
-			} catch (OperationCanceledException e) {
-				// The pm is already marked canceled, so caller can check that instead.
-			} 
-		} else {
-			pm.beginTask("", 200); //$NON-NLS-1$
-			IJobManager jobManager = Job.getJobManager();
-			Job currentJob = jobManager.currentJob();
-			if (currentJob == null || (!currentJob.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD) && !currentJob.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD))) { 
-				if (jobManager.find(ResourcesPlugin.FAMILY_AUTO_BUILD).length > 0 || jobManager.find(ResourcesPlugin.FAMILY_MANUAL_BUILD).length >0) {
-					// We are not within a build job. If we were, then we don't do the build. We will take
-					// that risk. The problem is that if within the build, we can't wait for it to finish because
-					// we would stop the thread and so the build would not complete.
-					pm.subTask(ProxyMessages.ProxyWaitForBuild); 
-					try {
-						while (true) {
-							try {
-								jobManager.join(ResourcesPlugin.FAMILY_AUTO_BUILD, new SubProgressMonitor(pm, 100));
-								jobManager.join(ResourcesPlugin.FAMILY_MANUAL_BUILD, new SubProgressMonitor(pm, 100));
-								break;
-							} catch (InterruptedException e) {
-							}
-						}
-					} catch (OperationCanceledException e) {
-					}
-				}
-			} 
-			pm.done();
-		}
-	}
-	
-	
-	/*
-	 * This prevents the launch from being shown. However these constants are in UI component, and we don't
-	 * want to pre-req that. So we will get them reflectively instead.
-	 * public but only so that launch delegate can get to it.
-	 */
-	public static String ATTR_PRIVATE;
-	private static IUIRunner UI_RUNNER = null;
-
-	static {
-		ATTR_PRIVATE = null;
-		try {
-			// See if we have a UI bundle and it is active. If it exists but is not active,
-			// then we won't do anything. If we were running a UI application, it should already
-			// of been active before we got here.
-			Bundle uiBundle = Platform.getBundle("org.eclipse.ui");	//$NON-NLS-1$
-			if (uiBundle != null && uiBundle.getState() == Bundle.ACTIVE) {
-				try {
-					// We have a UI bundle, so we can load our UIRunner class and it will load fine.
-					UI_RUNNER = (IUIRunner) Class.forName("org.eclipse.jem.internal.proxy.core.UIRunner").newInstance(); //$NON-NLS-1$
-				} catch (InstantiationException e1) {
-					ProxyPlugin.getPlugin().getLogger().log(e1, Level.WARNING);
-				}
-				
-				// So that we can run headless (w/o ui), need to do class forName for debugui contants
-				Bundle debuguiBundle = Platform.getBundle("org.eclipse.debug.ui"); //$NON-NLS-1$
-				if (debuguiBundle != null && debuguiBundle.getState() == Bundle.ACTIVE) {
-					Class debugUIConstants = debuguiBundle.loadClass("org.eclipse.debug.ui.IDebugUIConstants"); //$NON-NLS-1$
-					ATTR_PRIVATE = (String) debugUIConstants.getField("ATTR_PRIVATE").get(null); //$NON-NLS-1$
-				}
-			}			
-		} catch (SecurityException e) {
-		} catch (ClassNotFoundException e) {
-		} catch (NoSuchFieldException e) {
-		} catch (IllegalArgumentException e) {
-		} catch (IllegalAccessException e) {
-		}
-	}	
-
-	/* (non-Javadoc)
-	 * Only referenced by launch delegates. public because they are in other packages,
-	 * or even external developers packages. Not meant to be generally available.
-	 * 
-	 * This is needed because we can't pass the generic info into a launch configuration
-	 * because a launch configuration can't take objects. Only can take strings and numbers.  
-	 */
-	public static synchronized LaunchInfo getInfo(String key) {
-		return (LaunchInfo) LAUNCH_INFO.get(key);
-	}
-	
-	/**
-	 * Convert the string path into a valid url.
-	 * @param path
-	 * @return the url or <code>null</code> if not convertable (i.e. not well-formed).
-	 * 
-	 * @since 1.0.0
-	 */
-	public static URL convertStringPathToURL(String path) {
-		try {
-			return path != null ? new File(path).toURL() : null;
-		} catch (MalformedURLException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Convert the string paths into a valid urls.
-	 * 
-	 * @param paths
-	 * @return the urls or <code>null</code> if paths is null. Any path not convertable (i.e. not well-formed) will not be in the final list.
-	 * So this means the result length may be smaller than the paths length.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static URL[] convertStringPathsToURL(String[] paths) {
-		if (paths != null) {
-			URL[] result = new URL[paths.length];
-			int nextURL = 0;
-			for (int i = 0; i < paths.length; i++) {
-				URL url = convertStringPathToURL(paths[i]);
-				if (url != null)
-					result[nextURL++] = url;   
-			}
-			if (nextURL == 0)
-				return null;	// None were found.
-			
-			if (nextURL != result.length) {
-				URL[] nr = new URL[nextURL];
-				System.arraycopy(result, 0, nr, 0, nr.length);
-				result = nr;
-			}
-			return result;
-		} else
-			return null;
-	}
-
-	/**
-	 * Convert the urls to string array. It is assumed the urls are in file protocol. It handles platform and JDK reqts. too.
-	 * @param urls
-	 * @return string paths or <code>null</code> if urls is <code>null</code>. Any <code>null</code> entry of urls will result in 
-	 * a corresponding <code>null</code> in the strings.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static String[] convertURLsToStrings(URL[] urls) {
-		if (urls != null) {
-			String[] strings = new String[urls.length];
-			for (int i = 0; i < urls.length; i++) {
-				// [132378] There is a problem with IBM JDK's. They can't handle the getFile() from a URL in the java lib path on Windows.
-				// That is because the normalized format of a file url on windows is "file:/D:/asdfasf". But IBM JDKs can't handle the
-				// leading slash. Sun JDKs do.
-				URL url = urls[i];
-				if (url != null) {
-					strings[i] = url.getFile();
-					if(strings[i].startsWith("/") && Platform.getOS().equals(Platform.OS_WIN32)) //$NON-NLS-1$
-						strings[i] = strings[i].substring(1);
-				}
-			}
-			return strings;
-		} else
-			return null;
-	}
-
-	/* (non-Javadoc)
-	 * Local contributor used to make sure that certain jars are in the path.
-	 * 
-	 * @since 1.0.0
-	 */
-	static class ProxyContributor extends ConfigurationContributorAdapter {
-		public void contributeClasspaths(IConfigurationContributionController controller) {
-			// Add the required jars to the end of the classpath. (We want proxyCommon and initParser (+ initParser NLS), but they are in the runtime of the proxy bundle (which is jarred up), so we contribute the bundle instead.
-			controller.contributeClasspath(ProxyPlugin.getPlugin().getBundle(), (IPath) null, IConfigurationContributionController.APPEND_USER_CLASSPATH, true);	//$NON-NLS-1$
-		}
-	}
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyMessages.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyMessages.java
deleted file mode 100644
index 81786529f..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyMessages.java
+++ /dev/null
@@ -1,48 +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.proxy.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ProxyMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.core.messages";//$NON-NLS-1$
-
-	private ProxyMessages() {
-		// Do not instantiate
-	}
-
-	public static String UnexpectedException_EXC_;
-	public static String ClassCast_EXC__IncorrectType;
-	public static String ProxyFactory_EXC__NoBeanProxyFactory;
-	public static String ProxyFactory_EXC__NoBeanTypeProxyFactory;
-	public static String Not_Java_Project_WARN_;
-	public static String No_VM_WARN_;
-	public static String No_Implementation_WARN_;
-	public static String ProxyLaunch;
-	public static String ProxyWaitForBuild;
-	public static String Expression_InInvalidStateDueTo_EXC_;
-	public static String Expression_InInvalidState_EXC_;
-	public static String Expression_TypeSentInInvalidOrder_EXC_;
-	public static String Expression_ArrayTypeNotAnArray_EXC_;
-	public static String Expression_CannotHandleNoReceiveOnFieldAccess_EXC_;
-	public static String Expression_MethodsNeedReceiver_EXC_;
-	public static String Expression_InvalidMarkNesting;
-	public static String ProxyPlugin_CleanupDefaultProxyLaunchConfigurations;
-	public static String ProxyLaunchSupport_RegistryCouldNotStartForSomeReason_WARN_;
-	public static String Expression_CreateProxyReassignmentExpression_InvalidForReassignment_EXC_;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ProxyMessages.class);
-	}
-
-	public static String Expression_InvalidProxy;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java
deleted file mode 100644
index dfd3fd5e3..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java
+++ /dev/null
@@ -1,1371 +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.proxy.core;
-/*
-
-
- */
-
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.osgi.service.resolver.BundleSpecification;
-import org.eclipse.osgi.util.ManifestElement;
-import org.osgi.framework.*;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo.ContainerPaths;
-
-/**
- * The plugin class for the org.eclipse.jem.internal.proxy.core plugin.
- */
-
-public class ProxyPlugin extends Plugin {
-	
-	/**
-	 * This interface is for a listener that needs to know if this plugin (ProxyPlugin) is being shutdown. 
-	 * It is needed because there are some extensions that get added dynamically that need to know when the
-	 * plugin is being shutdown. Can't use new bundle listener for this because it notifies AFTER shutdown.
-	 * 
-	 * @since 1.0.0
-	 */
-	public interface IProxyPluginShutdownListener {
-		/**
-		 * ProxyPlugin is in shutdown.
-		 * 
-		 * @since 1.0.0
-		 */
-		public void shutdown();
-	}
-	
-	private static ProxyPlugin PROXY_PLUGIN = null;
-	public static final String PREFERENCES_VM_NOVERIFY_KEY = "JEM_PREFERENCES_VM_NOVERIFY_KEY"; // Key for NOVERIFY option of VM //$NON-NLS-1$
-	public static final String PDE_NATURE_ID = "org.eclipse.pde.PluginNature" ; //$NON-NLS-1$
-		
-	// If this is set to true, then in development mode and it will try for proxy jars in directories.
-	private boolean devMode;
-	
-	private ListenerList shutdownListeners;
-
-	public ProxyPlugin() {
-		super();
-		PROXY_PLUGIN = this;
-		devMode = Platform.inDevelopmentMode();  	
-	}
-	
-	public boolean isDevMode() {
-		return devMode;
-	}
-
-	/**
-	 * Access the singleton
-	 * @return the singleton plugin
-	 * 
-	 * @since 1.0.0
-	 */
-	public static ProxyPlugin getPlugin() {
-		return PROXY_PLUGIN;
-	}
-	
-	private Logger logger;
-	public Logger getLogger() {
-		if (logger == null)
-			logger = EclipseLogger.getEclipseLogger(this);
-		return logger;
-	}	
-
-	/**
-	 * This will take the bundle and file name and make it local and return that
-	 * fully qualified. It will look in fragments, but only returns first found. If there can be multiples use
-	 * the one for bundles and it fragments.
-	 * <p>
-	 * If we are in development and it will pick it up from the path
-	 * that is listed in the proxy.jars file located in the bundle passed in. This allows development code to be
-	 * used in place of the actual runtime jars. If the runtime jars are found,
-	 * they will be used.
-	 * <p>
-	 * For example if looking for file runtime/xyz.jar in bundle abc, then in bundle directory for abc,
-	 * there should be a file called proxy.jars. This should only be in development, this file should not
-	 * be distributed for production. It would be distributed in the SDK environment when testing is desired.
-	 * <p>
-	 * The format of the file is:
-	 * 	runtimefile=/projectname/builddirectory
-	 * <p>
-	 * For this to work when the actual jar is not found, the Eclipse must of been started in 
-	 * dev mode (i.e. the bundle location will be a project within the developer Eclipse. That way
-	 * we can go up one level for the current install location and assume the above projectname
-	 * will be found relative to the directory.
-	 * <p>
-	 * For the above example:
-	 * 	runtime/xyz.jar=/xyzproject/bin
-	 * <p>
-	 * It will return "." if file can't be found. It means nothing but it won't cause jvm to crash.
-	 * 
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @return the path to the file or <code>"."</code> if not found.
-	 * 
-	 * @since 1.0.0
-	 */
-	public String localizeFromBundleOnly(Bundle bundle, String filenameWithinBundle) {
-		URL url = urlLocalizeFromBundleOnly(bundle, filenameWithinBundle);
-		return url != null ? getFileFromURL(url) : "."; //$NON-NLS-1$
-	}
-	public String localizeFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
-		URL url = urlLocalizeFromBundleAndFragments(bundle, filenameWithinBundle);
-		return url != null ? getFileFromURL(url) : "."; //$NON-NLS-1$
-	}
-	
-	/**
-	 * Just like localizeFromBundle except it will return an array of Strings. It will look for the filename
-	 * within the bundle and any fragments of the bundle. If none are found, an empty array will be returned.
-	 * <p>
-	 * To find the files in the fragments that are in the runtime path (i.e. libraries), it will need to use a suffix,
-	 * This is because the JDT will get confused if a runtime jar in a fragment has the same name
-	 * as a runtime jar in the main bundle.
-	 * NOTE: This is obsolete. JDT no longer has this problem. So we can find libraries in fragments that have the
-	 * same file path. 
-	 * <p>
-	 * So we will use the following search pattern:
-	 * <ol>
-	 * <li>Find in all of the fragments those that match the name exactly in the same paths if paths are supplied.</li>
-	 * <li>Find in all of the fragments, in their runtime path (library stmt), those that match the name 
-	 *    but have a suffix the same as the uniqueid of the fragment (preceeded by a period). This is so that it can be easily
-	 *    found but yet be unique in the entire list of fragments. For example if looking for "runtime/xyz.jar"
-	 *    and we have fragment "a.b.c.d.frag", then in the runtime path we will look for the file
-	 *    "runtime/xyz.a.b.c.d.frag.jar". Note: This is obsolete. Still here only for possible old code. Will go 
-	 *    away in future.</li>
-	 * <p>
-	 * If the files in the fragments are not in the fragments library path then it can have the same name. NOTE: Obsolete,
-	 * JDT can now handle same name.
-	 * <p>
-	 * This is useful for nls where the nls for the filename will be in one or more of the fragments of the plugin.
-	 * 
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public String[] localizeAllFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
-		URL[] urls = urlLocalizeAllFromBundleAndFragments(bundle, filenameWithinBundle);
-		String[] result = new String[urls.length];
-		for (int i = 0; i < urls.length; i++) {
-			result[i] = getFileFromURL(urls[i]);
-		}
-		return result;
-	}
-	
-	public static String getFileFromURL(URL url) {
-		// We need to do this in a device independent way. The URL will always put a leading '/' in the
-		// file part of the URL, but on Windows we need to have this '/' removed. Some JRE's don't understand it.
-		return new File(url.getFile()).getAbsolutePath();
-
-	}
-
-	public URL urlLocalizeFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
-		return urlLocalizeFromBundleAndFragments(bundle, new Path(filenameWithinBundle));
-	}
-	public URL urlLocalizeFromBundleAndFragments(Bundle bundle, IPath filenameWithinBundle) {
-		try {
-			URL pvm = FileLocator.find(bundle, filenameWithinBundle, null);
-			if (pvm != null)
-				return FileLocator.toFileURL(pvm);
-		} catch (IOException e) {
-		}
-		if (devMode) {
-			URL[] urls = findDevAllFromBundleAndFragments(bundle, filenameWithinBundle.toString());
-			if (urls.length > 0)
-				return urls[0];
-			else
-				return null;
-		} else
-			return null;
-	}
-	
-	/**
-	 * Like <code>localizeFromBundleAndFragments</code> except it returns URL's instead.
-	 * 
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @return
-	 * 
-	 * @see ProxyPlugin#localizeFromBundleAndFragments(Bundle, String)
-	 * @since 1.0.0
-	 */
-	public URL[] urlLocalizeAllFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
-		return urlLocalizeAllBundleAndFragments(bundle, Platform.getFragments(bundle), filenameWithinBundle);
-	}
-	public URL[] urlLocalizeAllFromBundleAndFragments(Bundle bundle, IPath filenameWithinBundle) {
-		return urlLocalizeAllBundleAndFragments(bundle, Platform.getFragments(bundle), filenameWithinBundle.toString());
-	}
-	
-	/**
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @param fragments
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	private URL[] urlLocalizeAllBundleAndFragments(Bundle bundle, Bundle[] fragments, String filenameWithinBundle) {
-
-		ArrayList urls = new ArrayList((fragments == null ? 0 : fragments.length) + 1);
-		URL url = internalUrlLocalizeFromBundleOnly(bundle, filenameWithinBundle);
-		if (url != null)
-			urls.add(url);
-		if (fragments != null) {
-			for (int i = 0; i < fragments.length; i++) {
-				Bundle fragment = fragments[i];
-				url = internalUrlLocalizeFromBundleOnly(fragment, filenameWithinBundle);
-				if (url != null)
-					urls.add(url);
-			}
-		}
-		return (URL[]) urls.toArray(new URL[urls.size()]);
-	}
-
-	private static final String PROXYJARS = "proxy.jars";	//$NON-NLS-1$
-	
-	/**
-	 * @see ProxyPlugin#localizeFromBundle(Bundle, String)
-	 * 
-	 * This is just a helper to return a url instead.
-	 * 
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public URL urlLocalizeFromBundleOnly(Bundle bundle, String filenameWithinBundle) {
-		// If the filenameWithinBundle begins with one of these special characters,
-		// it might be in a fragment.
-		if (filenameWithinBundle.charAt(0) == '$'
-				&& (filenameWithinBundle.regionMatches(true, 0, "$nl$", 0, "$nl$".length()) //$NON-NLS-1$ //$NON-NLS-2$
-						|| filenameWithinBundle.regionMatches(true, 0, "$os$", 0, "$os$".length()) || filenameWithinBundle.regionMatches(true, 0, //$NON-NLS-1$ //$NON-NLS-2$
-						"$ws$", 0, "$ws$".length()))) //$NON-NLS-1$ //$NON-NLS-2$
-			return urlLocalizeFromBundleAndFragments(bundle, filenameWithinBundle);
-		try {
-			URL pvm = new URL(bundle.getEntry("/"), filenameWithinBundle); //$NON-NLS-1$
-			pvm = verifyFound(FileLocator.toFileURL(pvm));
-			if (pvm != null)
-				return pvm;
-		} catch (IOException e) {
-		}
-		return findDev(bundle, filenameWithinBundle);
-
-	}
-	
-	protected URL internalUrlLocalizeFromBundleOnly(Bundle bundle, String filenameWithinBundle) {
-		try {
-			URL pvm = bundle.getEntry(filenameWithinBundle);
-			if (pvm != null)
-				return FileLocator.toFileURL(pvm);
-		} catch (IOException e) {
-		}
-		return findDev(bundle, filenameWithinBundle);		
-		
-	}	
-	
-	private URL verifyFound(URL pvm) throws IOException {
-		if (devMode) {
-			// Need to test if found in devmode. Otherwise we will just assume it is found. If not found on remote and moved to cache, an IOException would be thrown.
-			if (pvm != null) {
-				InputStream ios = null;
-				try {
-					ios = pvm.openStream();
-					if (ios != null)
-						return pvm; // Found it, so return it.
-				} finally {
-					if (ios != null)
-						ios.close();
-				}
-			}
-		} else
-			return pvm;
-		return null;
-	}
-
-	/**
-	 * @see ProxyPlugin#localizeFromBundle(bundle, String)
-	 * 
-	 * This is just a helper to return a url instead.
-	 * 
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public URL urlLocalizeFromBundleOnly(Bundle bundle, IPath filenameWithinBundle) {					
-		return urlLocalizeFromBundleOnly(bundle, filenameWithinBundle.toString());
-	}
-	
-	private URL findDev(Bundle bundle, String filenameWithinBundle) {
-		if (devMode) {
-			// Got this far and in dev mode means it wasn't found, so we'll try for development style.
-			// It is assumed that in dev mode, we are running with the IDE as local and any 
-			// build outputs will be local so local file protocol will be returned
-			// from Platform.resolve(). We won't be running in dev mode with our entireplugin being in a jar,
-			// or on a separate system.
-			try {
-				URL pvm = bundle.getEntry(PROXYJARS);
-				if (pvm != null) {
-					InputStream ios = null;
-					try {
-						ios = pvm.openStream();
-						Properties props = new Properties();
-						props.load(ios);
-						String pathString = props.getProperty(filenameWithinBundle.toString());
-						if (pathString != null) {
-							URL url = FileLocator.resolve(bundle.getEntry("/"));	// It is assumed that if in debug mode, then this plugin is an imported plugin within the developement workspace. //$NON-NLS-1$
-							if (url.getProtocol().equals("file")) { //$NON-NLS-1$
-								File file = new File(url.getFile()).getParentFile();	// This gets us to workspace root of development workspace.
-								file = new File(file, pathString);
-								return file.toURL();
-							}
-						}
-					} finally {
-						if (ios != null)
-							ios.close();
-					}
-				}
-			} catch (IOException e) {
-			}
-		}
-		
-		return null;
-
-	}
-	private URL[] findDevAllFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
-		Bundle [] fragments = Platform.getFragments(bundle);
-		ArrayList urls = new ArrayList((fragments == null ? 0 : fragments.length) + 1);
-		URL url = findDev(bundle, filenameWithinBundle);
-		if (url != null)
-			urls.add(url);
-		if (fragments != null) {
-			for (int i = 0; i < fragments.length; i++) {
-				Bundle fragment = fragments[i];
-				url = findDev(fragment, filenameWithinBundle);
-				if (url != null)
-					urls.add(url);
-			}
-		}
-		return (URL[]) urls.toArray(new URL[urls.size()]);
-	}
-	
-	/**
-	 * Get the urls for the bundle and all fragments. This is used when bundles/fragments are jarred. It won't work correctly if not 
-	 * a jarred bundle and fragments. This would most likely be used for NLS
-	 * purposes to bring in the bundle and all of the nls. If a specific fragment was wanted use {@link #urlLocalizeBundle(Bundle)} instead.
-	 * 
-	 * @param bundle
-	 * @return urls for bundle and all fragments.
-	 * 
-	 * @since 1.2.0
-	 */
-	public URL[] urlLocalizeBundleAndFragments(Bundle bundle) {
-		Bundle[] fragments = Platform.getFragments(bundle);
-		List urls = new ArrayList((fragments == null ? 0 : fragments.length) + 1);
-		URL[] burls = urlLocalizeBundle(bundle);
-		if (burls != null) {
-			urls.addAll(Arrays.asList(burls));
-		}
-		if (fragments != null) {
-			for (int i = 0; i < fragments.length; i++) {
-				burls = urlLocalizeBundle(fragments[i]);
-				if (burls != null)
-					urls.addAll(Arrays.asList(burls));
-			}
-		}
-
-		return (URL[]) urls.toArray(new URL[urls.size()]);
-
-	}
-	
-	/**
-	 * Get the urls for the bundle libraries only. If a fragment is wanted, then pass in the fragment instead.
-	 * If bundle and all fragments are wanted use {@link #urlLocalizeBundleAndFragments(Bundle)} instead.
-	 * <p>
-	 * If in dev mode, it will use the binary output directory for the plugin libraries from the build.properties file. 
-	 * 
-	 * @param bundle
-	 * @return URL array of local library references for the bundle or null if can't resolve to local.
-	 * 
-	 * @since 1.2.0
-	 */
-	public URL[] urlLocalizeBundle(Bundle bundle) {
-		URL[] pvms;
-		try {
-			pvms = new URL[] {FileLocator.resolve(bundle.getEntry("/"))}; //$NON-NLS-1$
-			if (pvms[0].getProtocol().equals("jar")) { //$NON-NLS-1$
-				// The bundle is a jar, so use as is. 
-				pvms[0] = getFilePath(pvms[0]);
-				return pvms;
-			}
-		} catch (IOException e) {
-			pvms = null;
-		}
-		try {
-			// It is a directory. We could be in either development mode or not. Walk the manifest classpath and find the libraries.
-			Properties buildProps = null;
-			String libraries = (String) bundle.getHeaders().get(Constants.BUNDLE_CLASSPATH);
-			ManifestElement[] elements = ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, libraries);
-			List urls = new ArrayList();
-			if (elements != null) {
-				for (int i = 0; i < elements.length; i++) {
-					try {
-						URL pvm = bundle.getEntry(elements[i].getValue());
-						if (pvm != null) {
-							urls.add(FileLocator.toFileURL(pvm));
-							continue;
-						}
-					} catch (IOException e) {
-					}				
-					if (devMode) {
-						// Not found as a jar, so see if can be found in devmode.
-						if (buildProps == null) {
-							buildProps = new Properties();
-							try {
-								URL bp = bundle.getEntry("build.properties"); //$NON-NLS-1$
-								if (bp != null) {
-									InputStream ios = null;
-									try {
-										ios = bp.openStream();
-										buildProps.load(ios);
-									} finally {
-										if (ios != null)
-											ios.close();
-									}
-								}
-							} catch (IOException e) {
-							}
-						}
-						String pathString = buildProps.getProperty("output."+elements[i].getValue()); //$NON-NLS-1$
-						if (pathString != null) {
-							try {
-								urls.add(FileLocator.toFileURL(bundle.getEntry(pathString)));
-							} catch (IOException e) {
-							}
-						}
-					}
-				}
-				return (URL[]) urls.toArray(new URL[urls.size()]);
-			} else if (devMode) {
-				// If dev mode then we would look in the build.properties to find the output.. entry. This tells where the binaries are 
-				// for project. If there is no "output.." entry then either it is not a runnable plugin or the rare case is it is only
-				// classfiles in a folder. In that case see if there is a "source.." entry and use that.
-				try {
-					URL bp = bundle.getEntry("build.properties"); //$NON-NLS-1$
-					if (bp != null) {
-						InputStream ios = null;
-						try {
-							ios = bp.openStream();
-							Properties props = new Properties();
-							props.load(ios);
-							String pathString = props.getProperty("output.."); //$NON-NLS-1$
-							if (pathString != null) {
-								return new URL[] {FileLocator.resolve(bundle.getEntry(pathString))};
-							} else if ((pathString = props.getProperty("source..")) != null) { //$NON-NLS-1$
-								// Probably a class folder, so use the source instead.
-								return new URL[] {FileLocator.resolve(bundle.getEntry(pathString))};
-							} else
-								return pvms;	// Try the root of the plugin.
-						} finally {
-							if (ios != null)
-								ios.close();
-						}
-					}
-				} catch (IOException e) {
-				}
-				
-			}
-		} catch (BundleException e) {
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns a url as file url if it can. If it is already a file url, it will just return it.
-	 * If it is "jar:file:...." type protocol, then it will strip it down to the file part, which is
-	 * the jar itself, and not the file within the jar. 
-	 * @param l
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public static URL getFilePath(URL l) {
-		if (l != null) {
-			if (l.getProtocol().equals("file")) //$NON-NLS-1$
-			     return l;
-			else if (l.getProtocol().equals("jar")) { //$NON-NLS-1$
-				String f = l.getFile();
-				int idx = f.lastIndexOf('!');
-				if (idx>=0)
-					f = f.substring(0,idx);
-				try {
-					return getFilePath(new URL(f));
-				} catch (MalformedURLException e) {}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * A helper to order the plugins into pre-req order. 
-	 * If A eventually depends on B, then B will be ahead of A in the
-	 * list of plugins. (I.e. B is a pre-req somewhere of A).
-	 *  
-	 * @param bundlesToOrder - Bundles of interest. The results will have these in thiee correct order.
-	 * @return An array of the Bundlers in there order from no prereqs in set to the leaves.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static Bundle[] orderPlugins(final Set bundlesToOrder) {
-		Map prereqsMap = new HashMap(bundlesToOrder.size()*3);
-		int ndx = bundlesToOrder.size();
-		Bundle[] result = new Bundle[ndx];
-		Map dependents = getDependentCounts(false, bundlesToOrder, prereqsMap);	// We want the inactive ones too. That way have complete order. They can be ignored later if necessary.
-		// keep iterating until all have been visited. This will actually find them in reverse order from what we
-		// want, i.e. it will find the leaves first. So we will build result array in reverse order.
-		while (!dependents.isEmpty()) {
-			// loop over the dependents list.  For each entry, if there are no dependents, visit
-			// the bundle and remove it from the list.  Make a copy of the keys so we don't end up
-			// with concurrent accesses (since we are deleting the values as we go)
-			Iterator ib = dependents.entrySet().iterator();
-			while (ib.hasNext()) {
-				Map.Entry entry = (Map.Entry) ib.next();
-				Bundle bundle = (Bundle) entry.getKey() ;
-				int[] count = (int[]) entry.getValue();
-				if (count != null && count[0] <= 0) {
-					if (bundlesToOrder.contains(bundle)) {
-						result[--ndx] = bundle;
-						if (ndx == 0)
-							return result;	// We've ordered all that we care about. Anything left over is unimportant.
-					}
-					ib.remove();
-					// decrement the dependent count for all of the prerequisites.
-					Bundle[] requires = getPrereqs(bundle, prereqsMap);
-					for (int j = 0; j < requires.length; j++) {
-						Bundle prereq = requires[j];
-						int[] countPrereq = (int[]) dependents.get(prereq);
-						if (countPrereq != null)
-							--countPrereq[0];
-					}
-				}
-			}
-		}		
-		return result;
-	}
-	
-	/**
-	 * Get all of the prereqs for this bundle, all of the way down to the root.
-	 * They will be in top-down depth-first order. There won't be duplicates. They will show up
-	 * only once the first time they are found.
-	 * 
-	 * @param bundle
-	 * @return list of all pre-reqs.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static List getAllPrereqs(Bundle bundle) {
-		List prereqs = new ArrayList();
-		getAllPrereqs(bundle, prereqs, new HashMap());
-		return prereqs;
-	}
-	
-	private static void getAllPrereqs(Bundle bundle, List prereqs, Map prereqsMap) {
-		Bundle[] prs = getPrereqs(bundle, prereqsMap);
-		for (int i = 0; i < prs.length; i++) {
-			Bundle pre = prs[i];
-			if (prereqsMap.containsKey(pre))
-				continue;	// Already processed this one once.
-			prereqs.add(pre);	// Add to the list of pre-reqs accumulated so far.
-			getAllPrereqs(pre, prereqs, prereqsMap);
-		}
-	}
-	
-	private static Bundle[] getPrereqs(Bundle bundle, Map prereqsMap) {
-		Bundle[] prereqs = (Bundle[]) prereqsMap.get(bundle);
-		if (prereqs == null) {
-			prereqs = getPrereqs(bundle);
-			prereqsMap.put(bundle, prereqs);
-		}
-		return prereqs;
-	}
-	
-	public static Bundle[] getPrereqs(Bundle bundle) {
-		Bundle[] l = (Bundle[]) pluginRequiredMap.get(bundle.getSymbolicName());
-		if (l == null) {
-			BundleSpecification specs[] = Platform.getPlatformAdmin().getState(false).getBundle(bundle.getBundleId()).getRequiredBundles();
-			ArrayList bundles = new ArrayList(specs.length);
-			for (int i = 0; i < specs.length; i++) {
-				Bundle b = Platform.getBundle(specs[i].getName());
-				if (b != null)
-					bundles.add(b);
-			}
-			l = (Bundle[]) bundles.toArray(new Bundle[bundles.size()]);
-			pluginRequiredMap.put(bundle.getSymbolicName(), l);
-		}
-		return l;
-	}
-	
-	private static Map getDependentCounts(boolean activeOnly, Set startingSet, Map prereqsMap) {
-		// Try to maintain independents in order from the starting set (which happens to be ordered, and hopefully reversed.).
-		// Trying to have leaves show up in same order they are found in the Eclipse extensions, so we should
-		// have the starting set be in reverse order from that. The actual process
-		// builds them in reverse order from the starting set, so we expect the startingSet to be in  reverse order so they will be in forward order
-		// hopefully. This is just a heuristic. There is no guarentee it will actually produce the 
-		// desired output.
-		Map dependents = new LinkedHashMap(startingSet.size());	
-		// build a table of all dependent counts.  The table is keyed by descriptor and
-		// the value the integer number of dependent plugins.
-		List processNow = new ArrayList(startingSet);
-		List processNext = new ArrayList(processNow.size());
-		if (!processNow.isEmpty()) {
-			// Go through the first time from the starting set to get an entry into the list.
-			// If there is an entry, then it won't be marked for processNext. Only new entries
-			// are added to processNext in the following loop.
-			int pnSize = processNow.size();
-			for (int i = 0; i < pnSize; i++) {
-				Bundle bundle = (Bundle) processNow.get(i);
-				if (activeOnly && bundle.getState() != Bundle.ACTIVE)
-					continue;
-				// ensure there is an entry for this descriptor (otherwise it will not be visited)
-				int[] entry = (int[]) dependents.get(bundle);
-				if (entry == null)
-					dependents.put(bundle, new int[1]);
-			}
-		}
-		
-		// Now process the processNow to find the requireds, increment them, and add to processNext if never found before.
-		while (!processNow.isEmpty()) {
-			processNext.clear();
-			int pnSize = processNow.size();
-			for (int i = 0; i < pnSize; i++) {
-				Bundle bundle = (Bundle) processNow.get(i);
-				if (activeOnly && bundle.getState() != Bundle.ACTIVE)
-					continue;			
-				Bundle[] requires = getPrereqs(bundle, prereqsMap);
-				for (int j = 0; j < requires.length; j++) {
-					Bundle prereq = requires[j];
-					if (prereq == null || activeOnly
-							&& bundle.getState() != Bundle.ACTIVE)
-						continue;
-					int[] entry = (int[]) dependents.get(prereq);
-					if (entry == null) {
-						dependents.put(prereq, new int[]{1});
-						processNext.add(prereq); // Never processed before, so we add it to the next process loop.
-					} else
-						++entry[0];
-				}
-			}
-			
-			// Now swap the lists so that we processNext will be now and visa-versa.
-			List t = processNext;
-			processNext = processNow;
-			processNow = t;
-		}
-		return dependents;
-	}
-		
-	/**
-	 * Add a shutdown listener
-	 * @param listener
-	 * 
-	 * @since 1.0.0
-	 */
-	public void addProxyShutdownListener(IProxyPluginShutdownListener listener) {
-		if (shutdownListeners == null)
-			shutdownListeners = new ListenerList();
-		shutdownListeners.add(listener);
-	}
-
-	/**
-	 * Remove a shutdown listener
-	 * @param listener
-	 * 
-	 * @since 1.0.0
-	 */
-	public void removeProxyShutdownListener(IProxyPluginShutdownListener listener) {
-		if (shutdownListeners != null)
-			shutdownListeners.remove(listener);
-	}
-	
-	private ILaunchConfigurationListener launchListener = new ILaunchConfigurationListener() {
-		public void launchConfigurationAdded(ILaunchConfiguration configuration) {
-			try {
-				if (!configuration.isWorkingCopy() && IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configuration.getCategory()))
-					startCleanupJob();
-			} catch (Exception e) {
-			}
-		}
-
-		public void launchConfigurationChanged(ILaunchConfiguration configuration) {
-			try {
-				if (!configuration.isWorkingCopy() && IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configuration.getCategory()))
-					startCleanupJob();
-			} catch (Exception e) {
-			}
-		}
-
-		public void launchConfigurationRemoved(ILaunchConfiguration configuration) {
-			try {
-				// On delete you can't tell the category or anything because all of that info has already removed.
-				if (!configuration.isWorkingCopy())
-					startCleanupJob();
-			} catch (Exception e) {
-			}
-		}
-	};
-	
-	private Job cleanupJob = new Job(ProxyMessages.ProxyPlugin_CleanupDefaultProxyLaunchConfigurations) { 
-		{
-			setSystem(true);	// So it doesn't show up in progress monitor. No need to interrupt user.
-			setPriority(Job.SHORT);	// A quick running job.
-		}
-		protected IStatus run(IProgressMonitor monitor) {
-			synchronized (this) {
-				if (monitor.isCanceled())
-					return Status.CANCEL_STATUS;
-			}
-			// all we want to do is find out if any launch configurations (from proxy launch group) exist for
-			// a project. If they don't, then unset the project's property. If they do, and the property is not
-			// set, then set it to NOT_SET to indicate not set, but there are some configs for it.
-			// We just gather the project names that have launch configurations.
-			try {
-				Set projectNames = new HashSet();
-				ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations();
-				for (int i = 0; i < configs.length; i++) {
-					if (IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configs[i].getCategory())
-						&& (ProxyLaunchSupport.ATTR_PRIVATE == null || !configs[i].getAttribute(ProxyLaunchSupport.ATTR_PRIVATE, false)))
-						projectNames.add(configs[i].getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "")); //$NON-NLS-1$
-				}
-
-				IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-				IJavaElement[] children = model.getChildren();
-				int cancelCount = 10;
-				for (int j = 0; j < children.length; j++) {
-					if (children[j].getElementType() == IJavaElement.JAVA_PROJECT) {
-						if (--cancelCount <= 0)
-							synchronized (this) {
-								cancelCount = 10;	// Rest for next set of ten.
-								// Checking on every 10 projects because they may be many projects, while only few configs.
-								// This way it will stop sooner.
-								if (monitor.isCanceled())
-									return Status.CANCEL_STATUS;
-							}						
-						IProject p = ((IJavaProject) children[j]).getProject();
-						if (projectNames.contains(p.getName())) {
-							// This project has a launch config. If it has a setting, then do nothing, else need to put on not set. 
-							if (p.getPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION) == null)
-								p.getProject().setPersistentProperty(
-									ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION,
-									ProxyLaunchSupport.NOT_SET);
-						} else {
-							// This project has no launch configs. Remove any setting if it exists.
-							p.setPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION, (String) null);
-						}
-					}
-				}
-				return Status.OK_STATUS;
-			} catch (CoreException e) {
-				return e.getStatus();
-			}
-		}
-	};
-	
-	private void startCleanupJob() {
-		cleanupJob.cancel();	// Stop what we are doing.
-		cleanupJob.schedule(1000l);	// Schedule to start in one second.
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(final BundleContext context) throws Exception {
-		super.start(context);
-		DebugPlugin.getDefault().getLaunchManager().addLaunchConfigurationListener(launchListener);
-		context.addBundleListener(new BundleListener() {
-			public void bundleChanged(BundleEvent event) {
-				if (event.getBundle() != ProxyPlugin.this.getBundle())
-					return;	// Not of interest to us.
-				switch (event.getType()) {
-					case BundleEvent.STARTED:
-						context.removeBundleListener(this);	// Since we don't care anymore
-						startCleanupJob();
-						break;
-					case BundleEvent.STOPPED:
-					case BundleEvent.UNINSTALLED:
-					case BundleEvent.UNRESOLVED:
-						context.removeBundleListener(this);	// We stopped before we started, so remove ourselves.
-						break;
-				}
-			}
-		});
-		getPluginPreferences().setDefault(PREFERENCES_VM_NOVERIFY_KEY, true);
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		// Handle case where debug plugin shuts down before we do since order not guarenteed.
-		if (DebugPlugin.getDefault() != null)
-			DebugPlugin.getDefault().getLaunchManager().removeLaunchConfigurationListener(launchListener);
-		cleanupJob.cancel();	// Stop what we are doing.		
-		if (shutdownListeners != null) {
-			Object[] listeners = shutdownListeners.getListeners();
-			for (int i = 0; i < listeners.length; i++) {
-				((IProxyPluginShutdownListener) listeners[i]).shutdown();
-			}
-		}		
-		super.stop(context);
-	}
-	
-	public static final String PI_CONFIGURATION_CONTRIBUTION_EXTENSION_POINT = "org.eclipse.jem.proxy.contributors"; //$NON-NLS-1$
-	public static final String PI_EXTENSION_REGISTRATION_EXTENSION_POINT = "org.eclipse.jem.proxy.extensions"; //$NON-NLS-1$
-	public static final String PI_CONTAINER = "container"; //$NON-NLS-1$
-	public static final String PI_PLUGIN = "plugin"; //$NON-NLS-1$
-	public static final String PI_CLASS = "class"; //$NON-NLS-1$
-	public static final String PI_REGISTRY_TYPE = "registryType";	//$NON-NLS-1$
-	public static final Map pluginRequiredMap = new HashMap(50);
-	
-	/*
-	 * Processed extension point info for contributors.
-	 */
-	protected ContributorExtensionPointInfo contributions;
-		
-	/*
-	 * Processed extension point info for registry extensions.
-	 */
-	protected ContributorExtensionPointInfo extensions;
-
-
-	/**
-	 * These are public only so that jem.ui can access this constant. Not meant to be accessed by others.
-	 */
-	public static final QualifiedName PROPERTY_LAUNCH_CONFIGURATION = new QualifiedName("org.eclipse.jem.proxy", "proxyLaunchConfiguration"); //$NON-NLS-1$ //$NON-NLS-2$
-	
-	/**
-	 * Return the plugin ordered array of configuration elements for the given container, or <code>null</code> if not contributed.
-	 * 
-	 * @param containerid the first segment of all of the container paths is the container id.
-	 * @param containerPaths array of container paths to match against for contributions. The paths must all be of the same container id.
-	 * @return Array of configuration elements. 
-	 * 
-	 * @since 1.0.0
-	 */
-	public synchronized IConfigurationElement[] getContainerConfigurations(String containerid, String[] containerPaths) {
-		if (contributions == null)
-			processProxyContributionExtensionPoint();
-		return (IConfigurationElement[]) contributions.containerPathContributions.getContributors(containerid, containerPaths);
-	}
-
-	/**
-	 * Return the plugin ordered array of configuration elements for the given plugin, or <code>null</code> if not contributed.
-	 * 
-	 * @param pluginid
-	 * @return Array of configuration elements or <code>null</code> if this plugin has no contributions.
-	 * 
-	 * @since 1.0.0
-	 */
-	public synchronized IConfigurationElement[] getPluginConfigurations(String pluginid) {
-		if (contributions == null)
-			processProxyContributionExtensionPoint();
-		return (IConfigurationElement[]) contributions.pluginToContributions.get(pluginid);
-	}
-
-	/**
-	 * Return the plugin ordered array of configuration elements for the given container, or <code>null</code> if not contributed.
-	 * 
-	 * @param containerid the first segment of all of the container paths is the container id.
-	 * @param containerPaths array of container paths to match against for contributions. The paths must all be of the same container id.
-	 * @return Array of configuration elements.
-	 * 
-	 * @since 1.0.0
-	 */
-	public synchronized IConfigurationElement[] getContainerExtensions(String containerid, String[] containerPaths) {
-		if (extensions == null)
-			processProxyExtensionExtensionPoint();
-		return (IConfigurationElement[]) extensions.containerPathContributions.getContributors(containerid, containerPaths);
-	}
-
-	/**
-	 * Return the plugin ordered array of configuration elements for the given plugin, or <code>null</code> if not contributed.
-	 * 
-	 * @param pluginid
-	 * @return Array of configuration elements or <code>null</code> if this plugin has no contributions.
-	 * 
-	 * @since 1.0.0
-	 */
-	public synchronized IConfigurationElement[] getPluginExtensions(String pluginid) {
-		if (extensions == null)
-			processProxyExtensionExtensionPoint();
-		return (IConfigurationElement[]) extensions.pluginToContributions.get(pluginid);
-	}
-
-	protected synchronized void processProxyContributionExtensionPoint() {
-		contributions = processContributionExtensionPoint(PI_CONFIGURATION_CONTRIBUTION_EXTENSION_POINT);
-	}
-	
-	protected synchronized void processProxyExtensionExtensionPoint() {
-		extensions = processContributionExtensionPoint(PI_EXTENSION_REGISTRATION_EXTENSION_POINT);
-	}	
-	
-	/**
-	 * Process the extension point looking contributors. It will find entries that have the "container" or "plugin" attributes
-	 * set on them.
-	 * 
-	 * @param extensionPoint fully-qualified extension point id, including plugin id of the extension point.
-	 * @return the contributor info record.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static ContributorExtensionPointInfo processContributionExtensionPoint(String extensionPoint) {	
-		// We are processing this once because it is accessed often (once per vm per project).
-		// This can add up so we get it together once here.
-		IExtensionPoint extp = Platform.getExtensionRegistry().getExtensionPoint(extensionPoint);
-		ContributorExtensionPointInfo result = new ContributorExtensionPointInfo();
-		result.containerPathContributions = new ContainerPathContributionMapping(IConfigurationElement.class);
-		if (extp == null) {
-			result.pluginToContributions = Collections.EMPTY_MAP;
-			return result;
-		}
-		
-		IExtension[] extensions = extp.getExtensions();
-		if (extensions.length > 0) {
-			// Need to be in plugin order so that first ones processed have no dependencies on others.
-			// Gather in extension order.
-			// We want the list in reverse order of found extensions for a bundle. This is a heuristic to try
-			// to get leaves ordered in the order found from the extension list. Since the orderPlugins actually
-			// reverses the leaf order, hopefully this will set it back to what we want at the end.
-			HashMap bundlesToExtensions = new LinkedHashMap(extensions.length);
-			for (int i = extensions.length-1; i >= 0; i--) {
-				Bundle bundle = Platform.getBundle(extensions[i].getContributor().getName());
-				IExtension[] ext = (IExtension[]) bundlesToExtensions.get(bundle);
-				if (ext == null)
-					bundlesToExtensions.put(bundle, new IExtension[] { extensions[i]});
-				else {
-					// More than one extension defined in this plugin.
-					IExtension[] newExt = new IExtension[ext.length + 1];
-					System.arraycopy(ext, 0, newExt, 0, ext.length);
-					newExt[newExt.length - 1] = extensions[i];
-					bundlesToExtensions.put(bundle, newExt);
-				}
-			}
-
-			// Now order them so we process in required order.
-			Bundle[] ordered = ProxyPlugin.orderPlugins(bundlesToExtensions.keySet());
-			Map patternStringToID_Pattern = new HashMap(); // Map of string patterns to the {container id, compiled pattern}. This so that we use the same compiled pattern everywhere.
-			result.pluginToContributions = new HashMap(ordered.length);
-			for (int i = 0; i < ordered.length; i++) {
-				IExtension[] exts = (IExtension[]) bundlesToExtensions.get(ordered[i]);
-				for (int j = 0; j < exts.length; j++) {
-					IConfigurationElement[] configs = exts[j].getConfigurationElements();
-					// Technically we expect the config elements to have a name of "contributor", but since that
-					// is all that can be there, we will ignore it. The content is what is important.
-					for (int k = 0; k < configs.length; k++) {
-						String containerPattern = configs[k].getAttribute(PI_CONTAINER);
-						if (containerPattern != null) {
-							Object[] id_Pattern = (Object[]) patternStringToID_Pattern.get(containerPattern);
-							if (id_Pattern == null) {
-								int slash = containerPattern.indexOf('/');
-								String containerID = slash != -1 ? containerPattern.substring(0, slash) : containerPattern;
-								// The pattern becomes for the containerPattern "SWT_CONTAINER" becomes "SWT_CONTAINER(/.*)*". This
-								// means to match the string must start with "SWT_CONTAINER" and it must have either nothing after this
-								// or it must have a "/" and any characters after that. So this means it will not match "SWT_CONTAINERXZ"
-								// but it will match "SWT_CONTAINER/XYZ".
-								id_Pattern = new Object[] { containerID, Pattern.compile(containerPattern + "(/.*)*")}; //$NON-NLS-1$
-								patternStringToID_Pattern.put(containerPattern, id_Pattern);
-							}
-							result.containerPathContributions.addContribution((String) id_Pattern[0], (Pattern) id_Pattern[1], configs[k]);
-						}
-
-						String plugin = configs[k].getAttribute(PI_PLUGIN);
-						if (plugin != null) {
-							List contributions = (List) result.pluginToContributions.get(plugin);
-							if (contributions == null) {
-								contributions = new ArrayList(1);
-								result.pluginToContributions.put(plugin, contributions);
-							}
-							contributions.add(configs[k]);
-						}
-					}
-				}
-			}
-
-			// Finalize the mappings for both container paths and plugins.
-			result.containerPathContributions.finalizeMapping();
-			for (Iterator iter = result.pluginToContributions.entrySet().iterator(); iter.hasNext();) {
-				Map.Entry entry = (Map.Entry) iter.next();
-				entry.setValue(((List) entry.getValue()).toArray(new IConfigurationElement[((List) entry.getValue()).size()]));
-			}
-		} else
-			result.pluginToContributions = Collections.EMPTY_MAP;
-		return result;
-	}
-	
-	/**
-	 * The result of the {@link ProxyPlugin#getIDsFound(IJavaProject)}.
-	 * 
-	 * @since 1.2.0
-	 */
-	public static class FoundIDs {
-		
-		/**
-		 * Map of (containerIds(String)->{@link ContainerPaths}) of containers classpaths found in the project's classpath.
-		 * 
-		 */
-		public Map containerIds = new HashMap(2);
-		
-		/**
-		 * Map of (containers({@link IClasspathContainer})->Boolean) of containers found in the project's classpath. The value will be <code>true</code> if the container is visible to the top-level project.
-		 */
-		public Map containers = new HashMap(2);
-		
-		/**
-		 * Map of (pluginIds(String)->Boolean) of plugin ids found in the project's classpath if the project is a plugin project. The value will be <code>true</code> if the plugin is visible to the top-level project.
-		 */
-		public Map pluginIds;
-		
-		/**
-		 * Map of (projects({@link IPath}->Boolean) of project found in the project's classpath. The value will be <code>true</code> if the project is visible to the top-level project.
-		 */
-		public Map projects = new HashMap(2);
-		
-		FoundIDs() {
-			// not meant to be instantiated or subclassed by clients.
-		}
-	}
-	
-	/**
-	 * For the given java project, return the maps of found ids.
-	 *
-	 * @param jproject
-	 * @return the found ids.
-	 * 
-	 * @since 1.0.0
-	 */
-	public FoundIDs getIDsFound(IJavaProject jproject) throws JavaModelException {		
-		IPath projectPath = jproject.getProject().getFullPath();
-		FoundIDs foundIDs = new FoundIDs();
-		foundIDs.projects.put(projectPath, Boolean.TRUE);		
-		expandProject(projectPath, foundIDs, true, true);
-		
-		// The containerIds values will actually be an Map[] {Map(visibleIPath->pathString), Map(hiddenIPath->pathString)}. Needs to be converted to a ContainerPaths now
-		// that we are done.
-		for (Iterator itr = foundIDs.containerIds.entrySet().iterator(); itr.hasNext();) {
-			Map.Entry entry = (Entry) itr.next();
-			Map[] value = (Map[]) entry.getValue();
-			entry.setValue(new ContainerPaths((String) entry.getKey(), (String[]) value[0].values().toArray(new String[value[0].size()]), (String[]) value[1].values().toArray(new String[value[1].size()])));
-		}
-		
-		if (foundIDs.pluginIds == null)
-			foundIDs.pluginIds = Collections.EMPTY_MAP;
-		
-		foundIDs.projects.remove(projectPath);	// Don't need to include itself now, was needed for testing so if ciruclar we don't get into a loop.
-		if (foundIDs.projects.isEmpty())
-			foundIDs.projects = Collections.EMPTY_MAP;
-		
-		return foundIDs;
-
-	}
-	
-	private static final IPath JRE_CONTAINER_PATH = new Path(JavaRuntime.JRE_CONTAINER);
-	
-	/*
-	 * The passed in visible flag tells if this project is visible and its contents are visible if they are exported.
-	 * Only exception is if first is true, then all contents are visible to the top level project.
-	 */
-	private void expandProject(IPath projectPath, FoundIDs foundIds, boolean visible, boolean first) throws JavaModelException {
-		IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(projectPath.lastSegment());
-		if (res == null)
-			return;	// Not exist so don't delve into it.
-		IJavaProject project = (IJavaProject)JavaCore.create(res);
-		if (project == null || !project.exists() || !project.getProject().isOpen())
-			return;	// Not exist as a java project or not open, so don't delve into it.
-
-		IClasspathEntry[] entries = project.getRawClasspath();
-		for (int i = 0; i < entries.length; i++) {
-			IClasspathEntry entry = entries[i];
-			Boolean currentFlag = null;	// Current setting value.
-			boolean newFlag;	// The new setting value. 
-			switch (entry.getEntryKind()) {
-				case IClasspathEntry.CPE_PROJECT:
-					// Force true if already true, or this is the first project, or this project is visible and the entry is exported. These override a previous false.
-					currentFlag = (Boolean) foundIds.projects.get(entry.getPath());
-					newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());
-					if (currentFlag == null || currentFlag.booleanValue() != newFlag)
-						foundIds.projects.put(entry.getPath(),  newFlag ? Boolean.TRUE : Boolean.FALSE );
-					if (currentFlag == null)
-						expandProject(entry.getPath(), foundIds, visible && entry.isExported(), false);
-					break;
-				case IClasspathEntry.CPE_CONTAINER:
-					if (!first && JavaRuntime.JRE_CONTAINER.equals(entry.getPath().segment(0))) //$NON-NLS-1$
-						break;	// The first project determines the JRE, so any subsequent ones can be ignored.
-					Map[] paths = (Map[]) foundIds.containerIds.get(entry.getPath().segment(0));
-					if (paths == null) {
-						paths = new Map[] {new HashMap(2), new HashMap(2)};
-						foundIds.containerIds.put(entry.getPath().segment(0), paths);
-					}
-					currentFlag = null;
-					if (paths[0].containsKey(entry.getPath()))
-						currentFlag = Boolean.TRUE;
-					else if (paths[1].containsKey(entry.getPath()))
-						currentFlag = Boolean.FALSE;
-					newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());					
-					if (currentFlag == null || currentFlag.booleanValue() != newFlag) {
-						if (newFlag) {
-							// It is visible, remove from hidden, if there, and add to visible.
-							paths[1].remove(entry.getPath());
-							paths[0].put(entry.getPath(), entry.getPath().toString());
-						} else {
-							// It is hidden, remove from visible, if there, and add to hidden.
-							paths[0].remove(entry.getPath());
-							paths[1].put(entry.getPath(), entry.getPath().toString());
-						}
-					}
-
-					IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);
-					// Force true if already true, or this is the first project, or this project is visible and the entry is exported. These override a previous false.
-					currentFlag = (Boolean) foundIds.containers.get(container);
-					newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());
-					if (currentFlag == null || currentFlag.booleanValue() != newFlag)					
-						foundIds.containers.put(container,  newFlag ? Boolean.TRUE : Boolean.FALSE );
-					break;
-				case IClasspathEntry.CPE_VARIABLE:
-					// We only care about JRE_LIB. If we have that, then we will treat it as JRE_CONTAINER. Only
-					// care about first project too, because the first project is the one that determines the JRE type.
-					if (first && JavaRuntime.JRELIB_VARIABLE.equals(entry.getPath().segment(0))) { //$NON-NLS-1$
-						paths = (Map[]) foundIds.containerIds.get(JavaRuntime.JRE_CONTAINER);
-						if (paths == null) {
-							paths = new Map[] {new HashMap(2), new HashMap(2)};
-							foundIds.containerIds.put(JavaRuntime.JRE_CONTAINER, paths);
-						}
-						currentFlag = null;
-						if (paths[0].containsKey(JRE_CONTAINER_PATH))
-							currentFlag = Boolean.TRUE;
-						else if (paths[1].containsKey(JRE_CONTAINER_PATH))
-							currentFlag = Boolean.FALSE;
-						newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());					
-						if (currentFlag == null || currentFlag.booleanValue() != newFlag) {
-							if (newFlag) {
-								// It is visible, remove from hidden, if there, and add to visible.
-								paths[1].remove(JRE_CONTAINER_PATH);
-								paths[0].put(JRE_CONTAINER_PATH, JavaRuntime.JRE_CONTAINER);
-							} else {
-								// It is hidden, remove from visible, if there, and add to hidden.
-								paths[0].remove(JRE_CONTAINER_PATH);
-								paths[1].put(JRE_CONTAINER_PATH, JavaRuntime.JRE_CONTAINER);
-							}
-						}
-					}
-					break;
-				default:
-					break;
-			}
-		}		
-		
-		findPlugins(foundIds, visible, first, project);
-	}
-	
-	/**
-	 * Find the plugins that the given project references, either directly or indirectly.
-	 * <p>
-	 * The map will be of plugin ids to a Boolean. If the boolean is <code>BooleanTRUE</code>,
-	 * then the plugin is visible to the given project. the visible and first flags
-	 * will modify this. If first is true, then all direct plugins will be visible,
-	 * else only exported plugins will be visible. If visible is false and first is false, then it doesn't matter, all of the
-	 * plugins will not be visible. 
-	 * <p>
-	 * Visible means that classes in the plugin can be referenced directly from code. Not visible
-	 * means that they can only be referenced from some other plugin in the list. In other words,
-	 * visible ones can be directly referenced, but invisible ones can only be referenced from
-	 * plugins that can see it.
-	 * <p>
-	 * For most uses, first and visible should be true. Then it will treat the project as the toplevel
-	 * project and will return true for those that are visible to it, either directly or indirectly.
-	 * These flags were added for more special cases where may be calling on a project that is deeper
-	 * down in the classpath were visibilty has already been decided.
-	 * <p>
-	 * Note: PDE must be installed for this to return anything, otherwise it will leave
-	 * the map alone.
-	 * 
-	 * @param foundIds foundIds structure to get plugin info from.
-	 * @param visible <code>true</code> means this project is visible, so any plugins visible to it will be visible, else none will be visible.
-	 * @param first <code>true</code> if this is the top project of interest. This means that all plugins within the project are visible. Else only exported projects will be visible.
-	 * @param project project to start looking from
-	 * 
-	 * @since 1.0.2
-	 */
-	public void findPlugins(FoundIDs foundIds, boolean visible, boolean first, IJavaProject project) {
-		try {
-			// To prevent unnecessary loading of the PDE plugin, find the plugins only if this project is a PDE plugin project.
-			if (isPDEProject(project)) {
-				IPDEProcessForPlugin pdeprocess = getPDEProcessForPlugin();
-				if (pdeprocess != null) {
-					if (foundIds.pluginIds == null)
-						foundIds.pluginIds = new HashMap();
-					pdeprocess.findPlugins(project, foundIds, visible, first); // expand the plugins for this project, if any.
-				}
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * 
-	 * @return true if this is a Plugin project or false if not
-	 * @throws CoreException
-	 * 
-	 * @since 1.1.0
-	 */
-	public static boolean isPDEProject(IJavaProject project) throws CoreException {
-		return project.getProject().hasNature(PDE_NATURE_ID);
-	}
-
-
-	/*
-	 * Interface for processing Plugins. Used when PDE plugin is present in the installation. 
-	 * 
-	 * @since 1.0.2
-	 */
-	interface IPDEProcessForPlugin {
-
-		/*
-		 * Go through the project and find all of the plugins it references, either directly or through
-		 * the referenced plugins, and mark them as visible or not.
-		 */
-		public abstract void findPlugins(IJavaProject project, FoundIDs foundIds, boolean visible, boolean first);
-	}
-	
-	/*
-	 * Try to get the pde process for plugin. If already tried once and not found, then forget it.
-	 * <package-protected> because PDEContributeClasspath needs it too.
-	 */
-	private IPDEProcessForPlugin pdeProcessForPlugin;
-	private boolean triedPDEProcess;
-	IPDEProcessForPlugin getPDEProcessForPlugin() {
-		if (!triedPDEProcess) {
-			triedPDEProcess = true;
-			if (Platform.getBundle("org.eclipse.pde.core") != null) { //$NON-NLS-1$
-				try {
-					Class classPDEProcess = Class.forName("org.eclipse.jem.internal.proxy.core.PDEProcessForPlugin"); //$NON-NLS-1$
-					pdeProcessForPlugin = (IPDEProcessForPlugin) classPDEProcess.newInstance();
-				} catch (ClassNotFoundException e) {
-					// Not found, do nothing.
-				} catch (InstantiationException e) {
-					getLogger().log(e, Level.WARNING);
-				} catch (IllegalAccessException e) {
-					getLogger().log(e, Level.WARNING);
-				}
-			}
-		}
-		return pdeProcessForPlugin;
-	}
-	
-	/**
-	 * This tries to find a jar in the bundle specified, and the attached source using the
-	 * PDE source location extension point. The jar must exist for source to be attachable.
-	 * The source must be in the standard PDE source plugin. I.e. it must be in a directory
-	 * of the name "bundlename_bundleversion", and in the same path from there as in the
-	 * jar, plus the name must be "jarnamesrc.zip".
-	 * <p>
-	 * The returned URL's will not be Platform.resolve(). They will be in form returned from
-	 * Platform.find().
-	 * 
-	 * @param bundle bundle to search, will search fragments too.
-	 * @param filepath filepath from the root of the bundle/fragment where the jar will be found. 
-	 * @return two URL's. [0] is the URL to the jar, <code>null</code> if not found, [2] is the URL to the source zip, <code>null</code> if not found.
-	 * 
-	 * @since 1.0.0
-	 */
-	public URL[] findPluginJarAndAttachedSource(Bundle bundle, IPath filepath) {
-		// This is a bit kludgy, but the algorithm is to find the file first, and then get the root url of the bundle/fragment
-		// that matches the found file. This will be used to calculate the name of the directory under the source. From there
-		// all of the source extensions will be searched for the source zip file.
-		// This is assuming that find returns a url where the file part of the url is a standard path and doesn't have
-		// things like special chars to indicate within a jar. That would appear when it is resolved, but I think that the
-		// unresolved ones from find are typically "jarbundle://nnn/path" or something like that. This is a gray area.
-		URL jarURL = FileLocator.find(bundle, filepath, null);
-		if (jarURL == null)
-			return new URL[2];
-		
-		// Found it, so let's try to find which bundle/fragment it was found in.
-		String jarString = jarURL.toExternalForm();
-		// First the bundle itself.
-		String installLoc = bundle.getEntry("/").toExternalForm(); //$NON-NLS-1$
-		URL sourceURL = null;
-		if (jarString.startsWith(installLoc))
-			sourceURL = getSrcFrom(bundle, installLoc, jarString);
-		else {
-			// Now look in the fragments.
-			Bundle[] frags = Platform.getFragments(bundle);
-			for (int i = 0; i < frags.length; i++) {
-				installLoc = frags[i].getEntry("/").toExternalForm(); //$NON-NLS-1$
-				if (jarString.startsWith(installLoc)) {
-					sourceURL = getSrcFrom(frags[i], installLoc, jarString);
-					break;
-				}
-			}
-		}
-		return new URL[] {jarURL, sourceURL};
-	}
-	
-	private URL getSrcFrom(Bundle bundle, String installLoc, String jarString) {
-		// format of path in a PDE source plugin is (under the "src" directory from the extension point),
-		// "bundlename_bundleversion/pathOfJar/jarnamesrc.zip". However there is no way to know
-		// which extension has the source in it, so we need to search them all.
-		
-		IPath srcPath = new Path(bundle.getSymbolicName()+"_"+ (String) bundle.getHeaders("").get(Constants.BUNDLE_VERSION)); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
-		srcPath = srcPath.append(new Path(jarString.substring(installLoc.length())));
-		if (srcPath.segmentCount() < 2)
-			return null;	// Something is not right. No jar name.
-		srcPath = srcPath.removeFileExtension();	// Remove the .jar.
-		String jarName = srcPath.lastSegment();	// This should be the jar name.
-		srcPath = srcPath.removeLastSegments(1).append(jarName+"src.zip"); //$NON-NLS-1$
-		
-		// Now look through all of the src extensions. Can't tell if the extension is from a fragment or a bundle, so we need to
-		// use Platform.find() to look in the bundle and fragment. So we may get a dup search if there is a fragment source 
-		// (for example platform source and win32 platform source (which is a fragment of platform source).
-		IConfigurationElement[] ces = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.pde.core.source"); //$NON-NLS-1$
-		for (int i = 0; i < ces.length; i++) {
-			IPath srcsrch = new Path(ces[i].getAttribute("path")).append(srcPath); //$NON-NLS-1$
-			Bundle srcBundle = Platform.getBundle(ces[i].getDeclaringExtension().getContributor().getName());
-			URL srcUrl = FileLocator.find(srcBundle, srcsrch, null);
-			if (srcUrl != null) {
-				return srcUrl;
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ThrowableProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ThrowableProxy.java
deleted file mode 100644
index dd8014fcf..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ThrowableProxy.java
+++ /dev/null
@@ -1,73 +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.proxy.core;
-/*
-
-
- */
-
-
-/**
- * This is a proxy wrapper for an exception being thrown on the
- * remove VM. The standard exception methods refer to this proxy.
- * To refer to the proxied exception itself, the methods defined
- * in here would be used.
- */
-public abstract class ThrowableProxy extends java.lang.Exception implements IBeanProxy {
-   /**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-/**
-    * Constructs an <code>Exception</code> with no specified detail message. 
-    */
-   public ThrowableProxy() {
-		super();
-   }
-
-	/**
-	 * @param message
-	 * @param cause
-	 * 
-	 * @since 1.1.0
-	 */
-	protected ThrowableProxy(String message, Throwable cause) {
-		super(message, cause);
-	}
-	/**
-	 * @param cause
-	 * 
-	 * @since 1.1.0
-	 */
-	protected ThrowableProxy(Throwable cause) {
-		super(cause);
-	}
-   /**
-    * Constructs an <code>Exception</code> with the specified detail message. 
-    *
-    * @param   s   the detail message.
-    */
-   public ThrowableProxy(String s) {
-		super(s);
-   }
-	
-	
-	public abstract String getProxyLocalizedMessage();
-	public abstract String getProxyMessage();
-	public abstract void printProxyStackTrace(java.io.PrintWriter writer);
-	public abstract void printProxyStackTrace(java.io.PrintStream stream);
-	public abstract void printProxyStackTrace();
-
-	public String toString() {
-		return super.toString() + "Proxy: " + toBeanString();	//$NON-NLS1$ - toString's aren't nls'ed. //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/UIRunner.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/UIRunner.java
deleted file mode 100644
index 06fdbf173..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/UIRunner.java
+++ /dev/null
@@ -1,105 +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.proxy.core;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
- 
-
-/**
- * The actual implementation of IUIRunner to run the build under
- * IProgressService control if in the UI thread.
- * 
- * <package-protected> because should only be used within here.
- * 
- * @since 1.0.0
- */
-class UIRunner implements IUIRunner {
-	
-	/*
-	 * Special class that takes a progress monitor 1 and only handles isCanceled from it,
-	 * but everything else is forwarded to progress monitor 2. This allows the pm that
-	 * is sent into handleBuild to signal a cancel even though the progress service
-	 * sends in its own pm. 
-	 * 
-	 * @since 1.0.0
-	 */
-	private static class UIRunnerProgressMonitor extends ProgressMonitorWrapper {
-		private IProgressMonitor pmcancel;
-		
-		public UIRunnerProgressMonitor(IProgressMonitor pmcancel, IProgressMonitor pmmain) {
-			super(pmmain);
-			this.pmcancel = pmcancel;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.IProgressMonitor#isCanceled()
-		 */
-		public boolean isCanceled() {
-			return pmcancel.isCanceled() || super.isCanceled();
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean)
-		 */
-		public void setCanceled(boolean value) {
-			super.setCanceled(value);
-			pmcancel.setCanceled(value);	// Cancel it too now.
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IUIRunner#handleBuild(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void handleBuild(final IProgressMonitor pm) throws CoreException {
-		if (!PlatformUI.isWorkbenchRunning() || Display.getCurrent() == null) {
-			ProxyLaunchSupport.runBuild(pm);
-		} else {
-			pm.beginTask("", 100); //$NON-NLS-1$
-			try {
-				PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						IProgressMonitor uipm = new UIRunnerProgressMonitor(pm, monitor); 
-						try {
-							ProxyLaunchSupport.runBuild(uipm);
-						} catch (CoreException e) {
-							throw new InvocationTargetException(e);
-						}
-						if (uipm.isCanceled()) {
-							pm.setCanceled(true);	// Make sure that cancel got through (could of come from monitor instead).
-							throw new InterruptedException();
-						}
-					}
-				});
-			} catch (InvocationTargetException e) {
-				if (e.getCause() instanceof CoreException)
-					throw (CoreException) e.getCause();
-				ProxyPlugin.getPlugin().getLogger().log(e.getCause(), Level.WARNING);
-			} catch (InterruptedException e) {
-				// It was canceled, launch will be canceled too. pm is already marked canceled and caller can check that
-			}
-			pm.done();
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties
deleted file mode 100644
index e6e08c398..000000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties,v $
-# $Revision: 1.12 $  $Date: 2005/08/24 20:39:05 $
-#
-
-
-
-#
-# Exception Messages. All of these messages are the text of an java exception.
-#
-UnexpectedException_EXC_                                    = IWAV0064E Unexpected exception thrown.
-
-# {0} and {1} are java classes (e.g. java.lang.Object)
-ClassCast_EXC__IncorrectType                                = IWAV0065E "{0}" is neither a subclass of, nor does it implement, class "{1}".
-
-# Standard Bean Proxy Factory and Standard Bean Type Proxy Factory are terms in beaninfo. They are the
-# standard (i.e. base) factories for beans or bean types. Bean types are java classes.
-ProxyFactory_EXC__NoBeanProxyFactory                        = IWAV0066E No Standard Bean Proxy Factory has been set.
-ProxyFactory_EXC__NoBeanTypeProxyFactory                    = IWAV0067E No Standard Bean Type Proxy Factory has been set.
-
-
-# {0} is the title of a project.
-Not_Java_Project_WARN_                                      = IWAV0068W Project "{0}" is not a java project.
-No_VM_WARN_                                                 = IWAV0069W Project "{0}" has no Java JRE defined to use to run programs within this project.
-No_Implementation_WARN_                                     = IWAV0070W Cannot find a proxy implementation to use for project "{0}."
-
-ProxyLaunch                                                 = Launching Local Proxy VM
-ProxyWaitForBuild                                           = Waiting for build to complete
-Expression_InInvalidStateDueTo_EXC_                         = IWAV0162E Expression is in invalid state due to "{0}"
-Expression_InInvalidState_EXC_                              = IWAV0163E Expression is in invalid state
-Expression_TypeSentInInvalidOrder_EXC_                      = IWAV0164E Expression type sent in invalid order, received: {0}, expected {1}.
-Expression_ArrayTypeNotAnArray_EXC_                         = IWAV0165E ArrayType "{0}" is not an array.
-Expression_CannotHandleNoReceiveOnFieldAccess_EXC_          = IWAV0166E Access by field name ({0}) (not by proxy) requires a receiver.
-Expression_MethodsNeedReceiver_EXC_                         = IWAV0167E Access by method name ({0}) (not by proxy) requires a receiver.
-Expression_InvalidMarkNesting                               = IWAV0168E Improper nesting of mark statements in Expression. Tried to pop or endMark to before current mark. Tried to go past Mark# {0}.
-Expression_InvalidProxy=Expression Proxy is for a different expression
-ProxyPlugin_CleanupDefaultProxyLaunchConfigurations         = Clean up default proxy launch configurations.
-ProxyLaunchSupport_RegistryCouldNotStartForSomeReason_WARN_ = IWAV0168W Registry could not be started for some reason.
-Expression_CreateProxyReassignmentExpression_InvalidForReassignment_EXC_=Invalid expression type for reassignment: {0}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/AmbiguousMethodException.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/AmbiguousMethodException.java
deleted file mode 100644
index 2856eba41..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/AmbiguousMethodException.java
+++ /dev/null
@@ -1,33 +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.proxy.common;
- 
-
-/**
- * Ambiguous Method Exception. I.E. There is more than one that could be used.
- */
-public class AmbiguousMethodException extends Exception {
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 * 
-	 * @since 1.1.0
-	 */
-	private static final long serialVersionUID = -7084137612344373381L;
-	public AmbiguousMethodException() {
-	}
-	public AmbiguousMethodException(String msg) {
-		super(msg);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/CommandException.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/CommandException.java
deleted file mode 100644
index cbb25f2d9..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/CommandException.java
+++ /dev/null
@@ -1,50 +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.proxy.common;
-/*
-
-
- */
-/**
- * An error occurred during command processing.
- *
- */
-
-public class CommandException extends Exception {
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 * 
-	 * @since 1.1.0
-	 */
-	private static final long serialVersionUID = -2519238571145682514L;
-	protected final Object fExceptionData;
-	
-	public CommandException() {
-		fExceptionData = null;
-	}
-	
-	public CommandException(Object data) {
-		fExceptionData = data;
-	}
-	
-	public CommandException(String msg, Object data) {
-		super(msg);
-		fExceptionData = data;
-	}	
-	
-	public Object getExceptionData() {
-		return fExceptionData;
-	}
-	
-	public boolean isRecoverable() {
-		return false;	// By default Command Exceptions are not recoverable.
-	}	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/GenericEventQueue.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/GenericEventQueue.java
deleted file mode 100644
index 72fd9fd07..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/GenericEventQueue.java
+++ /dev/null
@@ -1,146 +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
- *******************************************************************************/
-/*
- *  $RCSfile$
- *  $Revision$  $Date$ 
- */
-package org.eclipse.jem.internal.proxy.common;
-
-import java.util.LinkedList;
-
-/**
- * A generic event queue. It runs on its own thread and will execute any queued up runnables.
- * <p>
- * When a runnable is added to the queue, the thread will be notified. If the thread is free it will
- * run the runnable. If it is not free, the runnable will be added to the queue. The thread will process
- * all intervening runnables and then execute the runnable in sequence with all of the rest.
- * <p>
- * This is used when you can't use the system widget (e.g. AWT event queue or SWT asyncExec) or when the
- * runnable must be executed on a non-ui thread.
- * <p>
- * <b>Note:</b> It is required that {@link #close()} be called so that resources are cleared up.
- * 
- * @since 1.1.0.1
- */
-public class GenericEventQueue {
-	
-	private LinkedList queue = new LinkedList();
-
-	private class EventThread extends Thread {
-		private boolean run = true;
-		
-		public EventThread(String title) {
-			super(title);
-		}
-		
-		public void close() {
-			synchronized (queue) {
-				run = false;
-				queue.clear();
-				queue.notifyAll();
-			}
-		}
-		
-		public void postEvent(Runnable run) {
-			if (!this.isAlive()) {
-				throw new IllegalStateException("Event queue thread is not executing."); //$NON-NLS-1$
-			}
-			synchronized (queue) {
-				if (run != null)
-					queue.addLast(run);
-				queue.notifyAll();
-			}
-		}
-		
-		public void run() {
-			while (true) {
-				Runnable runnable;
-				synchronized (queue) {
-					while (run && queue.isEmpty()) {
-						try {
-							queue.wait();
-						} catch (InterruptedException e) {
-						}
-					}
-					if (!run)
-						return;	// Done.
-					else {
-						runnable = (Runnable) queue.removeFirst();
-					}
-				}
-
-				try {
-					runnable.run();
-				} catch (RuntimeException e) {
-					e.printStackTrace();
-				} finally {
-					runnable = null;	// Set this so that we don't hold onto resources in the runnable while waiting for next quy.
-				}
-			}
-		}
-	}
-	
-	private EventThread eventThread;
-	
-	/**
-	 * Construct with a title. (This title will be the title on the Thread for the queue).
-	 * The thread will have the same priority as the current thread. 
-	 * @param queueTitle
-	 * 
-	 * @since 1.1.0.1
-	 */
-	public GenericEventQueue(String queueTitle) {
-		this(queueTitle, Thread.currentThread().getPriority());
-	}
-	
-	/**
-	 * Construct with a title. (This title will be the title on the Thread for the queue).
-	 * And a priority for the event queue's processing thread.
-	 * @param queueTitle
-	 * @param priority priority to use for event queue's thread.
-	 * 
-	 * @since 1.1.0.1
-	 */
-	public GenericEventQueue(String queueTitle, int priority) {
-		eventThread = new EventThread(queueTitle);
-		eventThread.setPriority(priority);
-		synchronized(queue) {
-			eventThread.start();
-			try {
-				queue.wait(100);	// Wait for thread to start.
-			} catch (InterruptedException e) {
-			}	
-		}
-	}
-	
-	/**
-	 * Close the event queue. This will clear out any pending events. They will not
-	 * be executed. 
-	 * 
-	 * 
-	 * @since 1.1.0.1
-	 */
-	public void close() {
-		eventThread.close();
-	}
-	
-	/**
-	 * Post the event.
-	 * @param runnable runnable to execute, or <code>null</code> to kick-start the thread if for some reason it may be waiting and it shouldn't be.
-	 * 
-	 * @throws IllegalStateException thrown if the event queue thread has already been closed, or ended for some severe error.
-	 * @since 1.1.0.1
-	 */
-	public void postEvent(Runnable runnable) {
-		eventThread.postEvent(runnable);
-	}
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallback.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallback.java
deleted file mode 100644
index 4d718fe36..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallback.java
+++ /dev/null
@@ -1,30 +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.proxy.common;
-/*
-
-
- */
-
-/**
- * This interface is to be implemented by any callback.
- * The callback will use the IVMCallbackServer passed in to
- * get callback handlers, and the id passed in is
- * to be passed to these handlers.
- */
-public interface ICallback {
-	
-	/**
-	 * Initialize the callback
-	 */
-	public void initializeCallback(IVMCallbackServer vmServer, int callbackID);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackHandler.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackHandler.java
deleted file mode 100644
index 1d2f829a2..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackHandler.java
+++ /dev/null
@@ -1,101 +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.proxy.common;
-/*
-
-
- */
-
-/**
- * This is the interface for a callback handler.
- * Users will talk to this interface to perform 
- * callbacks.
- */
-public interface ICallbackHandler {
-
-	/**
-	 * Callback, but send the parm as an object, ie. it must
-	 * be nothing but constants, e.g. String, Integer, or an
-	 * array of constants. Constants should not be things like
-	 * regular objects. This is because only standard java.lang
-	 * type constants can be assured to be available on the other
-	 * client. Also you don't want to send big objects. It must
-	 * be constants that don't need to be sent back for any reason
-	 * since their identity will be lost in the transfer.
-	 * <p>
-	 * This should be used if there are no parms (i.e. it is null).
-	 * <p>
-	 * To send big objects, use the callback stream.
-	 * 
-	 * @param callbackID
-	 * @param msgID
-	 * @param parm
-	 * @return
-	 * @throws CommandException
-	 * 
-	 * @see IVMCallbackServer#requestStream(int, int)
-	 * @since 1.0.0
-	 */
-	public Object callbackAsConstants(int callbackID, int msgID, Object parm) throws CommandException;
-
-	/**
-	 * Callback to registered client.
-	 * <p>
-	 *  The parms can be <code>null</code> if no parms, or it is an array of parms.
-	 * The parms
-	 *    will be turned into proxies on the client vm. So the callback
-	 *    will recieve an array of proxies to the values in the parms.
-	 *    If any of the entries in the array is itself an array, a
-	 *    proxy to the array will be created and sent. The array itself
-	 *    will not be sent.
-	 * <p>
-	 *    If an array entry should go across as an array of proxies and
-	 *    not as one proxy to an array, then the entry needs to be an
-	 *    instance of {@link ICallbackHandler.TransmitableArray transmitableArray}. This will flag
-	 *    that it should transmit the entire entry as proxies. This should
-	 *    be used sparingly, only if there isn't much data in the array and
-	 *    all of the array would be used on the client. That way transmitting
-	 *    the entire array will be faster than accessing individual components.
-	 * <p>
-	 * If the array contains only one entry or the parm itself is null, then {@link org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, IBeanProxy)}
-	 * will be called. Else {@link org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, Object[])} will be called with all of the parms
-	 * turned into proxies as mentioned in the previous paragraph.
-	 *
-	 * @param callbackID The id of the callback. This will be given
-	 *    to the callback when it is created, and it must pass
-	 *    on to the handler. That way it is know which callback
-	 *    to call on the client.
-	 * @param msgID The id of the message for the callback. This is an
-	 *    agreed upon id of the developers of the callback on both
-	 *    sides.
-	 * @param parms Null if no parms, or an array of objects to send to the client vm. See the comments 
-	 * above for a complete description of the parameter.
-	 * 
-	 * @see ICallbackHandler.TransmitableArray
-	 */
-	public Object callbackWithParms(int callbackID, int msgID, Object[] parms) throws CommandException;
-
-	/**
-	 * Array wrapper that turns an array for parameters into a transmittable array.
-	 * 
-	 * @see ICallbackHandler#callbackWithParms(int, int, Object[])
-	 * @since 1.1.0
-	 */
-	public static class TransmitableArray {
-		protected final Object[] fArray;
-		public TransmitableArray(Object[] array) {
-			fArray = array;
-		}
-		public Object[] getArray() {
-			return fArray;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackRunnable.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackRunnable.java
deleted file mode 100644
index ceaae7cbc..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackRunnable.java
+++ /dev/null
@@ -1,28 +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.proxy.common;
-
-/**
- * Users would implement this as a runnable to 
- * send a callback request.
- */
-public interface ICallbackRunnable {
-	
-	/**
-	 * The actual run code.
-	 */
-	public Object run(ICallbackHandler handler) throws CommandException;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICommandException.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICommandException.java
deleted file mode 100644
index 66b04dfa9..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICommandException.java
+++ /dev/null
@@ -1,20 +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.proxy.common;
-/*
-
-
- */
-
-
-public class ICommandException {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMCallbackServer.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMCallbackServer.java
deleted file mode 100644
index e79349a1b..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMCallbackServer.java
+++ /dev/null
@@ -1,48 +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.proxy.common;
-/*
- *  $RCSfile$
- *  $Revision$  $Date$ 
- */
-
-import java.io.OutputStream;
-/**
- * This is the interface for accessing the 
- * VM callback Server. It will be given to an
- * ICallback so that the callback can access
- * the server to request a callback.
- */
-public interface IVMCallbackServer {
-	
-	/**
-	 * Get the IVMServer for this callback server.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IVMServer getIVMServer();
-	
-	
-	/**
-	 * Process a callback. The runnable contains the
-	 * actual code.
-	 */
-	public Object doCallback(ICallbackRunnable runnable) throws CommandException;
-	
-	/**
-	 * Request a stream for writing a lot of data (suggested for larger
-	 * than several thousand bytes). The connection will be assigned
-	 * to this stream until the stream is closed.
-	 */
-	public OutputStream requestStream(int callbackID, int msgID) throws CommandException;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMServer.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMServer.java
deleted file mode 100644
index cdedb342d..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMServer.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.proxy.common;
- 
-/**
- * This is the base server for the vm on the vm side (i.e. not the client side).
- * <p>
- * It can be passed to proxies if they need to access the vm server.
- * @since 1.1.0
- */
-public interface IVMServer {
-
-	/**
-	 * Add a runnable that will be called if shutdown is requested. If already added,
-	 * it will not be added again.
-	 * <p>
-	 * The body of the runnable must not do any vm server calls. That is because
-	 * the server is shutdown at this point. The body must simply do clean up code.
-	 * The shutdown will not continue until the call to the runnable is returned.
-	 * <p>
-	 * Calls to this will be ignored if shutdown has already started.
-	 * @param runnable
-	 * 
-	 * @since 1.1.0
-	 */
-	public void addShutdownListener(Runnable runnable);
-
-	/**
-	 * Remove the shutdown runnable from the list. If not added, then not an error to call this.
-	 * <p>
-	 * Calls to this will be ignored if shutdown has already started.
-	 * @param runnable
-	 * 
-	 * @since 1.1.0
-	 */
-	public void removeShutdownListener(Runnable runnable);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java
deleted file mode 100644
index c42afee48..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java
+++ /dev/null
@@ -1,159 +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.proxy.common;
-
-import java.util.HashMap;
- 
-
-/**
- * This is used for mapping between JNI format and non-JNI format. It also has the
- * maps for primitives.
- * @since 1.0.0
- */
-public class MapTypes {
-
-	public final static HashMap MAP_SHORTSIG_TO_TYPE = new HashMap(8);
-	public final static HashMap MAP_TYPENAME_TO_SHORTSIG = new HashMap(8);
-	static {
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("B", Byte.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("C", Character.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("D", Double.TYPE);		 //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("F", Float.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("I", Integer.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("J", Long.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("S", Short.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("Z", Boolean.TYPE); //$NON-NLS-1$
-		
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("byte","B"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("char","C"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("double","D"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("float","F"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("int","I"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("long","J"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("short","S"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("boolean","Z"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	
-
-	/**
-	 * Convert formal type name for an array (i.e. java.lang.Object[]
-	 * to the jni format (i.e. [Ljava.lang.Object;)
-	 * This is used when a name is passed in from the IDE side.
-	 * The VM side uses the jni format, and all of proxy uses the jni format.
-	 * 
-	 * @param classname
-	 * @return string jni form of name.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static String getJNIFormatName(String classname) {
-		if (classname.length() == 0 || !classname.endsWith("]")) //$NON-NLS-1$
-			return classname;	// Not an array,or invalid
-		
-		StringBuffer jni = new StringBuffer(classname.length());
-		int firstOpenBracket = classname.indexOf('[');
-		int ob = firstOpenBracket;
-		while (ob > -1) {
-			int cb = classname.indexOf(']', ob);
-			if (cb == -1)
-				break;
-			jni.append('[');
-			ob = classname.indexOf('[', cb);
-		}
-		
-		String finalType = classname.substring(0, firstOpenBracket).trim();
-		if (finalType != null) {
-			String shortSig = (String) MapTypes.MAP_TYPENAME_TO_SHORTSIG.get(finalType);
-			if (shortSig == null) {
-				jni.append('L');
-				jni.append(finalType);
-				jni.append(';');
-			} else {
-				jni.append(shortSig);
-			}
-		}
-		
-		return jni.toString();
-	}
-	
-	/**
-	 * This converts from the JNI format to the formal typename.
-	 * 
-	 * @param jniName
-	 * @return formal typename
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String getFormalTypeName(String jniName) {
-		if (jniName.charAt(0) == '[') {
-			// It is an array
-			int dims = jniName.lastIndexOf('[')+1;	// Number of dimensions
-			int startType = dims;
-			StringBuffer fName = new StringBuffer(jniName.length()+(2*dims)); 
-			if (jniName.charAt(startType) == 'L')
-				fName.append(jniName.substring(startType+1, jniName.length()-1));	// For "[Ljava.lang.String;" return "java.lang.String"
-			else if (jniName.length() == startType+1) {
-				// Possible primitive
-				Class type = (Class) MAP_SHORTSIG_TO_TYPE.get(jniName.substring(startType, startType+1));
-				if (type != null) {
-					fName.append(type.getName());
-				} else
-					return "";	// Invalid if no 'L' and not a primitive. //$NON-NLS-1$
-			} else
-				return "";	// Invalid, must be either a primitive or 'L' type. //$NON-NLS-1$
-			while(dims-- > 0) {
-				fName.append("[]"); //$NON-NLS-1$
-			}
-			return fName.toString();
-		} else if (jniName.length() == 1) {
-			// Possible primitive.
-			Class type = (Class) MAP_SHORTSIG_TO_TYPE.get(jniName);
-			if (type != null) {
-				return type.getName();
-			}
-		}
-		
-		// If got here then just a name as is.
-		return jniName;
-	}
-	
-	/**
-	 * Convert the formal type name, with the given number of dimensions,
-	 * to an array JNI type.
-	 * @param finalComponent final component name, should not be an array type.
-	 * @param dimensions number of dimensions for the array.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String getJNITypeName(String finalComponent, int dimensions) {
-		StringBuffer jni = new StringBuffer(finalComponent.length()+dimensions+2);
-		while (dimensions-- > 0) {
-			jni.append('[');
-		}
-		
-		String shortSig = (String) MapTypes.MAP_TYPENAME_TO_SHORTSIG.get(finalComponent);
-		if (shortSig == null) {
-			jni.append('L');
-			jni.append(finalComponent);
-			jni.append(';');
-		} else {
-			jni.append(shortSig);
-		}
-		
-		return jni.toString();
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/Messages.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/Messages.java
deleted file mode 100644
index e9d2984b3..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/Messages.java
+++ /dev/null
@@ -1,41 +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.proxy.common;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * 
- * @since 1.2.0
- */
-public class Messages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.common.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MethodHelper.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MethodHelper.java
deleted file mode 100644
index 3bceb66e4..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MethodHelper.java
+++ /dev/null
@@ -1,272 +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.proxy.common;
-import java.lang.reflect.*;
-import java.text.MessageFormat;
-import java.util.*;
-
-/**
- * This is a class to do message/constructor work. 
- * Specifically to find the most appropriate method.
- */
-public class MethodHelper {
-	
-	/*
-	 * The class that is used to represent Null class type.
-	 * 
-	 * @since 1.0.0
-	 */
-	private static class NULL_CLASS {
-	}
-	
-	public static final Class NULL_TYPE = NULL_CLASS.class;
-	
-	static final ArrayList sPrimitivesOrder;
-	static final int sCharPos;
-	
-	static {
-		sPrimitivesOrder = new ArrayList(6);
-		sPrimitivesOrder.add(Byte.TYPE);
-		sPrimitivesOrder.add(Short.TYPE);
-		sPrimitivesOrder.add(Integer.TYPE);
-		sPrimitivesOrder.add(Long.TYPE);
-		sPrimitivesOrder.add(Float.TYPE);
-		sPrimitivesOrder.add(Double.TYPE);
-
-		// char can be treated like a short for purposes of ordering.
-		sCharPos = sPrimitivesOrder.indexOf(Short.TYPE);
-	}
-	
-	/**
-	 * Return whether the type2 can be assigned to type1 in
-	 * method argument conversion.
-	 */
-	public static boolean isAssignableFrom(Class type1, Class type2) {
-		if (type1 == type2)
-			return true;	// They're the same, so assignable.
-		if (type1.isPrimitive()) {
-			if (type2.isPrimitive()) {
-				if (type1 == Boolean.TYPE || type2 == Boolean.TYPE)
-					return false;	// Since not equal and one is boolean and the other isn't, not assignable
-				int type1Pos = (type1 != Character.TYPE) ? sPrimitivesOrder.indexOf(type1) : sCharPos;
-				int type2Pos = (type2 != Character.TYPE) ? sPrimitivesOrder.indexOf(type2) : sCharPos;
-				return type1Pos > type2Pos;	// It can be widened if type1 is higher in the order
-			}
-			return false;	// primitive to non-primitive, not assignable.
-		} else
-			if (type2 == NULL_TYPE)
-				return true;	// NULL_TYPE represents null for us, and null can be assigned to any object
-			else		
-				return type1.isAssignableFrom(type2);	// Can type2 be assigned to type1
-	}
-	
-	
-	/**
-	 * Every entry in Array2 can be assigned to the corresponding entry in Array1.
-	 */
-	public static boolean isAssignableFrom(Class[] types1, Class[] types2) {
-		if (types1.length != types2.length)
-			return false;	// Not the same size, so not compatible.
-		for (int i=0; i<types1.length; i++) {
-			if (!isAssignableFrom(types1[i], types2[i]))
-				return false;
-		}
-		return true;	// All are assignable
-	}
-	
-	/**
-	 * Return the index of the most compatible method/constructor from the lists passed in.
-	 * MethodsList: List of methods (if null then this is for constructors)
-	 * ParmsList: List of parms for each method (each entry will be Class[]).
-	 */
-	private static int findMostCompatible(List methods, List parms, String ambiguousName) throws AmbiguousMethodException {
-		// The algorithm used is from the Java Language Specification 15.12.2.2
-		// Find the maximally specific ones
-		// This is defined as the one that is more specific then all of the rest.
-		// If there are duplicates parms that are maximally specific, then it doesn't matter which choosen
-		// because when invoked the JVM will make sure the right thing is done.
-		// 
-		Class[][] parmsCopy = (Class[][]) parms.toArray(new Class[parms.size()][]);
-		int size = parmsCopy.length;
-		// For each entry see if it is maximally specific, i.e. it is more specific then all of the others.
-nextMethod:	for (int i=0; i<size; i++) {
-			// For ctors we don't need to test the declaring class because it will always be the same class.
-			Class dclClassi = methods != null ? ((Method) methods.get(i)).getDeclaringClass() : null;
-			Class[] parmsi = parmsCopy[i];
-			for (int j=0; j<size; j++) {
-				if (i == j)
-					continue;
-				// Methodi is more specific if
-				//   a) Methodi declaring class is assignable to Methodj declaring class
-				//   b) Methodi parms are assignable to Methodj parms
-				//
-				// First see if Methodi is more specific, if it is
-				// then throw out Methodj and continue
-				// If Methodi is not compatible to Methodj, go to the next method for i. Methodi is not the most specific
-				// Something else is either more specific or none are ma
-				if (dclClassi != null) {
-					// Step a
-					if (!isAssignableFrom(((Method) methods.get(j)).getDeclaringClass(), dclClassi))
-						continue nextMethod;	// Methodi is not more specific than Methodj, so try next i.
-				}
-				
-				// Step b
-				Class[] parmsj = parmsCopy[j];
-				if (!isAssignableFrom(parmsj, parmsi)) {
-					// Methodi is not more specific than Methodj, so go to next i.
-					continue nextMethod;
-				}
-			}
-			return i;	// Methodi is more specific than all of the other ones.
-		}
-
-		throw new AmbiguousMethodException(ambiguousName);	// There was not one more specific than all of the others.
-	}
-	
-	/**
-	 * Find the most compatible method for the given arguments.
-	 */
-	public static Method findCompatibleMethod(Class receiver, String methodName, Class[] arguments) throws NoSuchMethodException, AmbiguousMethodException {
-		try {
-			return receiver.getMethod(methodName, arguments);	// Found exact match in public
-		} catch (NoSuchMethodException exc) {
-			if (arguments != null) {
-				// Need to find most compatible one. We will take protected into consideration (i.e. inheritance).
-				ArrayList parmsList = new ArrayList(); // The parm list from each compatible method.
-				ArrayList mthdsList = new ArrayList(); // The list of compatible methods, same order as the parms above.
-				Class cls = receiver;
-				while (cls != null) {
-					Method mthds[] = cls.getDeclaredMethods();
-					for (int i = 0; i < mthds.length; i++) {
-						Method mthd = mthds[i];
-						if (!mthd.getName().equals(methodName))
-							continue; // Not compatible, not same name
-						int modifiers = mthd.getModifiers();
-						if (!(Modifier.isPublic(modifiers) || Modifier.isProtected(modifiers)))
-							continue;	 // Will not call private or package-protected because we don't know the context.
-						Class[] parms = mthd.getParameterTypes();
-						// If exact match we found a non-public exact match, which is good.
-						if (Arrays.equals(arguments, parms))
-							return makeMethodAccessable(mthd);
-						if (!isAssignableFrom(parms, arguments))
-							continue; // Not compatible, parms
-						// It is compatible with the requested method - now see if we already have an exact match from a subclass. Don't want to add it twice.
-						// We are assuming the actual number of compatible methods is small, so this O(n-squared) search is efficient enough.
-						int size = parmsList.size();
-						for (int j = 0; j < size; j++) {
-							if (Arrays.equals(parms, (Object[]) parmsList.get(j)))
-								continue;
-						}
-						parmsList.add(parms);
-						mthdsList.add(mthd);
-					}
-					cls = cls.getSuperclass();
-				}				
-				// Now have list of compatible methods.
-				if (parmsList.size() == 0)
-					throw throwFixedNoSuchMethod(exc, receiver, methodName, arguments); // None found, so rethrow the exception
-				if (parmsList.size() == 1)
-					return makeMethodAccessable((Method) mthdsList.get(0)); // Only one, so return it
-
-				// Now find the most compatible method
-				int mostCompatible = findMostCompatible(mthdsList, parmsList, methodName);
-				return makeMethodAccessable((Method) mthdsList.get(mostCompatible));
-			} else
-				throw throwFixedNoSuchMethod(exc, receiver, methodName, arguments); // None found, so rethrow the exception
-		}
-	}
-	
-	private static Method makeMethodAccessable(Method m) {
-		m.setAccessible(true);	// We allow all access, let ide and compiler handle security.
-		return m;
-	}
-	
-	/*
-	 * NoSuchMEthodExeception doesn't include the signature. Since these are dynamic searches, the exception itself is useless without
-	 * the signature. So we add it.
-	 */
-	private static NoSuchMethodException throwFixedNoSuchMethod(NoSuchMethodException e, Class declareClass, String methodName, Class[] argClasses) {
-
-		// The default trace doesn't show what method was being searched for, so recreate with that.
-		StringBuffer s = new StringBuffer();
-		s.append(declareClass.getName());
-		s.append('.');
-		s.append(methodName);
-		s.append('(');
-		if (argClasses != null) {
-			for (int i = 0; i < argClasses.length; i++) {
-				if (i > 0)
-					s.append(',');
-				s.append(argClasses[i].getName());
-			}
-		}
-		s.append(')');
-		NoSuchMethodException ne = new NoSuchMethodException(s.toString());
-		ne.setStackTrace(e.getStackTrace());
-		return ne;
-	}
-	
-
-	/**
-	 * Find the most compatible constructor for the class with the given arguments.
-	 * @param receiver class to get the constructor for
-	 * @param arguments array of argument types
-	 * @return the constructor
-	 * @throws NoSuchMethodException no compatible constructor can be found
-	 * @throws AmbiguousMethodException there is more than one compatible constructor
-	 * @throws IllegalAccessException it can't be accessed. Such as it is a non-static inner class.
-	 * 
-	 * @since 1.2.0
-	 */
-	public static Constructor findCompatibleConstructor(Class receiver, Class[] arguments) throws NoSuchMethodException, AmbiguousMethodException, IllegalAccessException {
-		if (receiver.getDeclaringClass() != null && !Modifier.isStatic(receiver.getModifiers()))
-			throw new IllegalAccessException(MessageFormat.format(Messages.getString("MethodHelper.NONSTATICINNERCLASS_WARNING"), new Object[] {receiver.getName()})); //$NON-NLS-1$
-		try {
-			java.lang.reflect.Constructor ctor = receiver.getDeclaredConstructor(arguments);
-			ctor.setAccessible(true);	// We allow all access, let ide and compiler handle security.
-			return ctor;	// Found exact match
-		} catch (NoSuchMethodException exc) {
-			if (arguments != null) {
-				// Need to find most compatible one.
-				java.lang.reflect.Constructor ctors[] = receiver.getDeclaredConstructors();
-				ArrayList parmsList = new ArrayList(ctors.length); // The parm list from each compatible method.
-				ArrayList ctorsList = new ArrayList(ctors.length); // The list of compatible methods, same order as the parms above.
-				for (int i = 0; i < ctors.length; i++) {
-					java.lang.reflect.Constructor ctor = ctors[i];
-					Class[] parms = ctor.getParameterTypes();
-					if (!isAssignableFrom(parms, arguments))
-						continue; // Not compatible, parms
-					// It is compatible with the requested method
-					parmsList.add(parms);
-					ctorsList.add(ctor);
-				}
-
-				// Now have list of compatible methods.
-				if (parmsList.size() == 0)
-					throw exc; // None found, so rethrow the exception
-				if (parmsList.size() == 1) {
-					java.lang.reflect.Constructor ctor = (java.lang.reflect.Constructor) ctorsList.get(0); // Only one, so return it
-					ctor.setAccessible(true); // We allow all access, let ide and compilor handle security.
-					return ctor;
-				}
-
-				// Now find the most compatible ctor
-				int mostCompatible = findMostCompatible(null, parmsList, receiver.getName());
-				java.lang.reflect.Constructor ctor = (java.lang.reflect.Constructor) ctorsList.get(mostCompatible);
-				ctor.setAccessible(true); // We allow all access, let ide and compilor handle security.
-				return ctor;
-			} else
-				throw exc; // None found, so rethrow the exception
-		}
-	}	
-				
-		
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/UnresolvedCompilationError.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/UnresolvedCompilationError.java
deleted file mode 100644
index 687dd6f9c..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/UnresolvedCompilationError.java
+++ /dev/null
@@ -1,47 +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
- *******************************************************************************/
-/*
- *  $RCSfile$
- *  $Revision$  $Date$ 
- */
-package org.eclipse.jem.internal.proxy.common;
- 
-/**
- * Used by the the registries to indicate "UnresolvedCompilationError". This is because the
- * normal java throws just an Error with a message. To make it easier in processing, it will
- * be turned into this error instead so that it can be explicitly caught.
- * <p>
- * This will only be used in certain explicit parts of the code. It will be detailed where
- * it can be thrown.
- * 
- * @since 1.1.0.1
- */
-public class UnresolvedCompilationError extends Error {
-
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 * 
-	 * @since 1.1.0.1
-	 */
-	private static final long serialVersionUID = 7778842211073592790L;
-	
-	/**
-	 * Construct from an Error.
-	 * @param error The error that is the actual one. <b>This will not be the cause, the message and stacktrace will be copied into this new error.</b>
-	 * 
-	 * @since 1.1.0.1
-	 */
-	public UnresolvedCompilationError(Error error) {
-		super(error.getMessage());
-		setStackTrace(error.getStackTrace());
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/messages.properties b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/messages.properties
deleted file mode 100644
index 937eea7b7..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/messages.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-MethodHelper.NONSTATICINNERCLASS_WARNING=Class {0} is a non-static inner class. These cannot be instantiated at this time.
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/BeanProxyValueSender.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/BeanProxyValueSender.java
deleted file mode 100644
index 3765039ee..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/BeanProxyValueSender.java
+++ /dev/null
@@ -1,96 +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.proxy.remote;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.internal.proxy.core.ThrowableProxy;
- 
-/**
- * Useful in REM to get the array of BeanProxyValues.
- * 
- * @since 1.1.0
- */
-public class BeanProxyValueSender implements Commands.ValueSender {
-	protected int index = 0;
-	protected Object[] array;
-	private Exception exception;
-	private final REMStandardBeanProxyFactory factory;
-	
-	/**
-	 * See if there was an exception thrown during reading.
-	 * 
-	 * @return an exception or <code>null</code> if no exception.
-	 * 
-	 * @since 1.1.0
-	 */
-	public Exception getException() {
-		return exception;
-	}
-		
-	public BeanProxyValueSender(REMStandardBeanProxyFactory factory) {
-		this.factory = factory;
-	}
-	public BeanProxyValueSender(REMStandardBeanProxyFactory factory, Commands.ValueObject arrayHeader) {
-		this(factory);
-		initialize(arrayHeader);
-	}
-	
-	public void initialize(Commands.ValueObject arrayHeader) {
-		index = 0;
-		// The array type doesn't matter, it will be an array of objects.
-		// The values will either be IBeanProxies or an array, or constants.
-		array = new Object[arrayHeader.anInt];
-	}
-	
-	public void clear() {
-		array = null;
-		index = 0;
-	}
-	
-	public Object[] getArray() {
-		return array;
-	}
-				
-	// A new value is being sent to the array
-	// NOTE: It is important that this has been called within a transaction.
-	public void sendValue(Commands.ValueObject value) {
-		try {
-			array[index++] = factory.getBeanProxy(value);	// Add it to the array
-		} catch (ThrowableProxy e) {
-			// We can't stop it right away because we can't send exception on, however,
-			// we can log it and save the exception.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			exception = e;			
-		} catch (CommandException e) {
-			// We can't stop it right away because we can't send exception on, however,
-			// we can log it and save the exception.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			exception = e;
-		}
-	}
-				
-	// The next entry is an array too!
-	public Commands.ValueSender nestedArray(Commands.ValueObject arrayHeader) {
-		BeanProxyValueSender sender = new BeanProxyValueSender(factory, arrayHeader);
-		// Take the newly created array and put it into the current array.
-		array[index++] = sender.getArray();
-		return sender;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java
deleted file mode 100644
index caab6436d..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java
+++ /dev/null
@@ -1,365 +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.proxy.remote;
-
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-/**
- * This is a helper for debug mode. It allows access to
- * the workbench, if available, or AWT, if available, for
- * the debug prompts. It uses reflection so that nothing is
- * forced to be loaded or pre-reqd. That way it can run headless.
- */
-
-class DebugModeHelper {
-	boolean awt = false;
-	boolean console = false;
-	boolean setup = false;
-	java.io.InputStreamReader inReader = null;
-	
-	// Workbench reflections
-	Object display = null;	
-	Constructor cMB = null;
-	Field fPrimaryModel = null;
-	Method fasync = null;
-	Method fsync = null;	
-	Method fSetText = null;
-	Method fSetMessage = null;
-	Method fOpen = null;
-	Method fGetWorkbench = null;
-	Class cSWT = null;
-		
-	
-	// AWT Reflections
-	Class cMessageDialog = null;
-	Method fDoit = null;
-	
-	protected void setupType() {
-		if (setup)
-			return;
-			
-		setup = true;
-		
-		// See if use system console instead. If false or not set, then try to query usage.	 		
-	 	console = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName()+ProxyRemoteUtil.IO_CONSOLE)); //$NON-NLS-1$
-	 	if (console)
-	 		return;
-		
-		try {		 		
-		 	// See if PlatformUI plugin available.
-		 	Bundle uiBundle = Platform.getBundle("org.eclipse.ui"); //$NON-NLS-1$
-		 	if (uiBundle == null) {
-		 		setupAWT();	// UI not available, try through AWT.
-		 		return;
-		 	}
-	
-	 		// Setup Eclipse
-		 	Class cPlatformUI = uiBundle.loadClass("org.eclipse.ui.PlatformUI"); //$NON-NLS-1$
-		 	Method isWBRunning = cPlatformUI.getMethod("isWorkbenchRunning", null); //$NON-NLS-1$
-		 	if (!((Boolean) isWBRunning.invoke(null, null)).booleanValue()) {
-		 		setupAWT();	// UI not available, try through AWT.
-		 		return;
-		 	}
-		 	
-		 	fGetWorkbench = cPlatformUI.getMethod("getWorkbench", null); //$NON-NLS-1$
-		 	Object w = fGetWorkbench.invoke(null, null);
-
-			if (w != null) {
-	 			Class cDisplay = uiBundle.loadClass("org.eclipse.swt.widgets.Display"); //$NON-NLS-1$
-	 			Method fGetCurrent = cDisplay.getMethod("getCurrent", null); //$NON-NLS-1$
-	 			Method fGetDefault = cDisplay.getMethod("getDefault", null);	 			 //$NON-NLS-1$
-	 			fasync = cDisplay.getMethod("asyncExec", new Class[] {Runnable.class}); //$NON-NLS-1$
-	 			fsync = cDisplay.getMethod("syncExec", new Class[] {Runnable.class}); //$NON-NLS-1$
-	 			
-	 			// Get the display
-	 			display = fGetCurrent.invoke(null, null);
-	 			if (display == null)
-	 				display = fGetDefault.invoke(null, null);
-			}
-			
-			if (display != null) { 	
-	 			Class cShell = uiBundle.loadClass("org.eclipse.swt.widgets.Shell"); //$NON-NLS-1$
-	 			Class cMessageBox = uiBundle.loadClass("org.eclipse.swt.widgets.MessageBox"); //$NON-NLS-1$
-	 			cMB = cMessageBox.getConstructor(new Class[] {cShell, Integer.TYPE});
-
-				fSetText = cMessageBox.getMethod("setText", new Class[] {String.class}); //$NON-NLS-1$
-				fSetMessage = cMessageBox.getMethod("setMessage", new Class[] {String.class});				 //$NON-NLS-1$
-				fOpen = cMessageBox.getMethod("open", null);		 		 //$NON-NLS-1$				
-		 			
-	 			cSWT = uiBundle.loadClass("org.eclipse.swt.SWT"); //$NON-NLS-1$
-	 			fPrimaryModel = cSWT.getField("PRIMARY_MODAL"); //$NON-NLS-1$
-		 	} else {
-		 		setupAWT();	// UI not available, try through AWT.
-		 	}
-		} catch (NoSuchMethodException e) {
-		} catch (ClassNotFoundException e) {
-		} catch (IllegalAccessException e) {
-		} catch (InvocationTargetException e) {
-		} catch (NoSuchFieldException e) {
-		}
-		
-		return;		 			 		
-		 			
-	}	
-
-	protected void setupAWT() {
-	 		
-	 	// See if AWT is available.
-	 	try {
-		 	cMessageDialog = Class.forName("org.eclipse.jem.internal.proxy.remote.MessageDialog"); //$NON-NLS-1$
-		 	fDoit = cMessageDialog.getMethod("doit", new Class[] {String.class, String.class, String.class, String.class}); //$NON-NLS-1$
-		 	awt = true;
-		 	return;
-	 	} catch (ClassNotFoundException e) {
-	 	} catch (NoSuchMethodException e) {
-	 	}
- 		console = true;	// No AWT either, i.e. true headless environment
-	} 	
-	
-	public boolean debugMode(final String name) {
-	 	boolean debugMode = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName()+ProxyRemoteUtil.DEBUG_VM)); //$NON-NLS-1$
-	 	if (!debugMode)
-	 		return debugMode;
-	 		
-	 	setupType();
-
-		// See if use system console instead. If false or not set, then try to query usage.	 		
-	 	if (console)
-	 		return debugModeConsole(name);
-	 		
-	 	if (awt)
-	 		return debugModeAWT(name);
-		
-		try {		 		
- 			final Field fYes = cSWT.getField("YES"); //$NON-NLS-1$
- 			Field fNo = cSWT.getField("NO"); //$NON-NLS-1$
- 			Field fIcon = cSWT.getField("ICON_QUESTION"); //$NON-NLS-1$
-	 			
- 			final int style = fYes.getInt(null) | fNo.getInt(null) | fIcon.getInt(null) | fPrimaryModel.getInt(null);	 			
- 			final boolean[] db = new boolean[1];
-
-			fsync.invoke(display, new Object[] { new Runnable() {
-				/**
-				 * @see java.lang.Runnable#run()
-				 */
-				public void run() {
-					try {
-						Object shell = getActiveShell();
-						Object mb = cMB.newInstance(new Object[] {shell, new Integer(style)});					
-						fSetText.invoke(mb, new Object[] {"Debug RemoteVM?"}); //$NON-NLS-1$
-						fSetMessage.invoke(mb, new Object[] {"Do you want to start the remote vm ("+name+") in debug mode?"});	// Not NLS'd because this is for internal developers only //$NON-NLS-1$ //$NON-NLS-2$
-							
-						db[0] = fYes.get(null).equals(fOpen.invoke(mb, null));
-					} catch (InstantiationException e) {
-					} catch (IllegalAccessException e) {
-					} catch (InvocationTargetException e) {
-					}
-				}
-			}});
-		 	return db[0];
-		} catch (IllegalAccessException e) {
-		} catch (InvocationTargetException e) {
-		} catch (NoSuchFieldException e) {
-		}
-		
-		return debugModeAWT(name);
- 	}
- 	
-
-	/*
-	 * This must be called from within the display thread.
-	 */
-	protected Object getActiveShell() {
-	 	Object shell = null;		
-		try {
-			Object w = fGetWorkbench.invoke(null, null);
-			Object ww = null;
-			if (w != null) {
-			 	Class cWorkbench = w.getClass();
-			 	Method getWorkbenchWindow = cWorkbench.getMethod("getActiveWorkbenchWindow", null); //$NON-NLS-1$
-				ww = getWorkbenchWindow.invoke(w, null);
-			}
-			if (ww != null) {
-				Class cWorkbenchWindow = ww.getClass();
-				Method getShell = cWorkbenchWindow.getMethod("getShell", null); //$NON-NLS-1$
-				shell = getShell.invoke(ww, null);
-			}
-		} catch (IllegalAccessException e) {
-		} catch (InvocationTargetException e) {
-		} catch (NoSuchMethodException e) {
-		}
-	 	
-	 	return shell;
-	}	
-		 	
-	protected boolean debugModeAWT(String name) {
-	 		
-	 	// See if AWT is available.
-	 	try {
-		 	Integer r = (Integer) fDoit.invoke(null, new Object[] {"Debug RemoteVM?", "Do you want to start the remote vm ("+name+") in debug mode?", "Yes", "No"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		 	return r.intValue() == 1;	// i.e. button1 or "yes" was hit.
-	 	} catch (IllegalAccessException e) {
-	 	} catch (InvocationTargetException e) {
-	 	}
-	 	
- 		return false;	// No AWT either, i.e. headless environment, shouldn't of gotton here.
-	} 	
-	
-	protected boolean debugModeConsole(String name) {
-	 		
-	 	// Debug through the console
- 		inReader = new java.io.InputStreamReader(System.in);
- 		System.out.println("Do you want to start the remote vm ("+name+") in debug mode? (Enter Y or N):"); //$NON-NLS-1$ //$NON-NLS-2$
- 		char r = ' ';
- 		try {
- 			r = Character.toLowerCase((char) inReader.read());
- 			// Need to flush the input reader now.
- 			while (inReader.ready())
- 				inReader.read();
-		 	return r == 'y';	// i.e. "y" was entered.	 			
- 		} catch (java.io.IOException e) {
- 		}
-	 	
- 		return false;	// Error reading, so no debugging.
-	} 
- 	
- 	/**
- 	 * Return true if continue debugging.
- 	 */
-	public boolean promptPort(final int dport) {
- 		if (awt)
- 			return promptPortAWT(dport);
- 		else if (console)
- 			return promptPortConsole(dport);
- 			
- 		try {	
-			final Field fOK = cSWT.getField("OK"); //$NON-NLS-1$
-			Field fCancel = cSWT.getField("CANCEL"); //$NON-NLS-1$
-			Field fIcon = cSWT.getField("ICON_WORKING"); //$NON-NLS-1$
-	 			
-			final int style = fOK.getInt(null) | fCancel.getInt(null) | fIcon.getInt(null) | fPrimaryModel.getInt(null);
-
-			final boolean[] ok = new boolean[1];
-			fsync.invoke(display, new Object[] { new Runnable() {	
-				/**
-				 * @see java.lang.Runnable#run()
-				 */
-				public void run() {
-					try {
-						Object shell = getActiveShell();
-						Object mb = cMB.newInstance(new Object[] {shell, new Integer(style)});					
-						fSetText.invoke(mb, new Object[] {"Connect Debugger to RemoteVM!"}); //$NON-NLS-1$
-						fSetMessage.invoke(mb, new Object[] {"You must now attach the debugger to port number "+dport+". Press OK when the debugger is attached. The program will not continue properly without the debugger being attached. Press Cancel if you could not connect the debugger. This will still cause an error, but it will clean up better."});	// Not NLS'd because this is for internal developers only //$NON-NLS-1$ //$NON-NLS-2$
-						ok[0] = fOK.get(null).equals(fOpen.invoke(mb, null));
-					} catch (InstantiationException e) {
-					} catch (IllegalAccessException e) {
-					} catch (InvocationTargetException e) {
-					}
-				}
-			}});			
-			return ok[0];
- 		} catch (NoSuchFieldException e) {
- 		} catch (InvocationTargetException e) {
- 		} catch (IllegalAccessException e) {
- 		}
- 		return false;
-	}	 	
- 	
-	protected boolean promptPortAWT(int dport) {
-		try {
-		 	Integer r = (Integer) fDoit.invoke(null, new Object[] {"Connect Debugger to RemoteVM!", "You must now attach the debugger to port number "+dport+". Press OK when the debugger is attached. The program will not continue properly without the debugger being attached. Press Cancel if you could not connect the debugger. This will still cause an error, but it will clean up better.", "OK", "Cancel"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		 	return r.intValue() == 1;	// i.e. button1 or "OK" was hit.
-		} catch (InvocationTargetException e) {
-		} catch (IllegalAccessException e) {
-		}
- 		
-		return false;
-	}
-		 	
- 	protected boolean promptPortConsole(int dport) {
-		System.out.println("You must now attach the debugger to port number "+dport+". Enter 'y' when the debugger is attached. The program will not continue properly without the debugger being attached. Press 'n' if you could not connect the debugger. This will still cause an error, but it will clean up better. Enter 'y' or 'n':"); //$NON-NLS-1$ //$NON-NLS-2$
-		char r = ' ';
-		try {
-			r = Character.toLowerCase((char) inReader.read());
- 			while (inReader.ready())
- 				inReader.read();
-			return r == 'y';	// i.e. "y" was entered, go on
-		} catch (java.io.IOException e) {
-		}
- 		
-		return false;
-	}
-	
-	/**
-	 * Display an error msg. There will only be an OK button.
-	 * This will always display, debug mode won't be looked at.
-	 * This is for errors. This will be displayed async, so this
-	 * may return before the msg has been displayed and answered,
-	 * but since the only response is OK, it doesn't really matter.
-	 */
-	public void displayErrorMessage(final String title, final String msg) {
-		setupType();
-		if (console)
-			displayErrorMessageConsole(title, msg);
-		else if (awt)
-			displayErrorMessageAWT(title, msg);
-		else {
-			try { // This needs to be done in display thread.
-				Field fOK = cSWT.getField("OK"); //$NON-NLS-1$
-				Field fIcon = cSWT.getField("ICON_ERROR"); //$NON-NLS-1$
-
-				final int style = fOK.getInt(null) | fIcon.getInt(null) | fPrimaryModel.getInt(null);
-				fasync.invoke(display, new Object[] { new Runnable() {
-						/**
-						 * @see java.lang.Runnable#run()
-						 */
-						public void run() { try { Object shell = getActiveShell();
-								Object mb = cMB.newInstance(new Object[] { shell, new Integer(style)});
-
-								fSetText.invoke(mb, new Object[] { title });
-								fSetMessage.invoke(mb, new Object[] { msg });
-								fOpen.invoke(mb, null);
-							} catch (InstantiationException e) {
-							} catch (IllegalAccessException e) {
-							} catch (InvocationTargetException e) {
-							}
-						}
-					}
-				});
-			} catch (NoSuchFieldException e) {
-			} catch (InvocationTargetException e) {
-			} catch (IllegalAccessException e) {
-			}
-		}
-	}	
-	
- 	protected void displayErrorMessageConsole(String title, String msg) {
-		System.out.println("Error: " + title); //$NON-NLS-1$
-		System.out.println("       " + msg); //$NON-NLS-1$
-	}
-	
-	protected void displayErrorMessageAWT(String title, String msg) {
-		try {
-		 	fDoit.invoke(null, new Object[] {title, msg, ProxyRemoteMessages.OK_7, null}); 
-		} catch (InvocationTargetException e) {
-		} catch (IllegalAccessException e) {
-		}
-	}		
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanProxy.java
deleted file mode 100644
index 8e0427686..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanProxy.java
+++ /dev/null
@@ -1,63 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * A Remote VM proxy. All IBeanProxy implementations
- * for the Remote VM must also implement this interface.
- * This is necessary for proper functioning.
- *
- * NOTE: This is an internal interface to the Remote VM Proxy.
- * It MUST not be used outside of the proxy factory family.
- */
-
-public interface IREMBeanProxy extends IBeanProxy {
-	/**
-	 * Return the ID of this proxy
-	 */
-	public Integer getID();
-	
-	/**
-	 * Proxy is about to be released, MUST mark it invalid.
-	 * This is required. Resources can also be cleaned up
-	 * if they are being held and need to be cleaned up.
-	 *
-	 * NOTE: This method will only be called when the proxy
-	 * is explicitly released. If it is simply garbage collected,
-	 * then this method will not be called. Simple garbage collection
-	 * means that no one is referencing this proxy. The proxy factory
-	 * will know what id this proxy was referencing and will release it
-	 * on the server at GC time.
-	 *
-	 * If there are resources
-	 * that absolutely must be released, then the finalize method
-	 * should be implemented to do the clean up. However, try not
-	 * to have this be the case. Finalize methods add overhead that is
-	 * usually better not to have. The better way is for any users
-	 * that get this kind of proxy object know to call release on
-	 * ProxyFactoryRegistry to release it before garbage collection.	 
-	 */
-	public void release();
-	
-	/**
-	 * Render this bean for transport to the server into a Commands.ValueObject.
-	 * For example, a string may put a string. An id type may put out the id.
-	 */
-	public void renderBean(Commands.ValueObject renderInto);
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxy.java
deleted file mode 100644
index 391ad309c..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxy.java
+++ /dev/null
@@ -1,42 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * All bean type proxies in remote vm must implement this interface.
- *
- * NOTE: This is an internal interface to the Remote VM Proxy.
- * It MUST not be used outside of the proxy factory family. 
- */
-public interface IREMBeanTypeProxy extends IBeanTypeProxy, IREMBeanProxy {
-	
-/**
- * Create a new bean proxy with the specified id.
- */
-public IREMBeanProxy newBeanProxy(Integer anID);
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract);
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxyFactory.java
deleted file mode 100644
index 10f8b6847..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,85 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Interface for Remote VM Bean Type Proxy Factories.
- * All extension factories for Remote VM must implement this interface.
- */
-
-public interface IREMBeanTypeProxyFactory extends IBeanTypeProxyFactory {
-/**
- * Return a bean type proxy for the class name.
- * Return null if the extension factory doesn't handle this class.
- * Don't register any proxies returned, they will automatically be registered.
- * This should only return bean type proxies where the factory can determine
- * everything it needs, such as supertype and classID.
- * NOTE: This is implemented for the usage of the
- *       standard BeanType proxy factory. It should
- *       NOT be called by anyone else. They should
- *       go through the IStandardBeanTypeFactory
- *       instead. The standard bean type factory
- *       will call this method on the appropriate
- *       extension when it needs to.
- *
- * Creation date: (12/3/99 2:26:12 PM)
- */
-public IREMBeanTypeProxy getExtensionBeanTypeProxy(String typeName);	
-
-/**
- * Return a bean type proxy for the class name.
- * Return null if the extension factory doesn't handle this class.
- * Don't register any proxies returned, they will automatically be registered.
- * This should only return bean type proxies where the factory can determine
- * everything it needs, such as supertype and classID.
- * NOTE: This is implemented for the usage of the
- *       standard BeanType proxy factory. It should
- *       NOT be called by anyone else. They should
- *       go through the IStandardBeanTypeFactory
- *       instead. The standard bean type factory
- *       will call this method on the appropriate
- *       extension when it needs to.
- 
- * @param typeName
- * @param expression
- * @return
- * 
- * @since 1.1.0
- */
-public IProxyBeanType getExtensionBeanTypeProxy(String typeName, IExpression expression);
-
-/**
- * Return a bean type proxy for the class id and class name.
- * Return null if the extension factory doesn't handle this class. 
- * Don't register any proxies returned, they will automatically be registered. 
- * This will be called in the case that a new class id was returned
- * from the server that we don't have registered yet. Implementers will
- * created a proxy out of the name and the id and return it.
- * The supertype will be passed in so that the extension factory doesn't need to
- * try to find it.
- * NOTE: This is implemented for the usage of the
- *       standard BeanType proxy factory. It should
- *       NOT be called by anyone else. They should
- *       go through the IStandardBeanTypeFactory
- *       instead. The standard bean type factory
- *       will call this method on the appropriate
- *       extension when it needs to.
- *
- * Creation date: (12/3/99 2:26:12 PM)
- */
-public IREMBeanTypeProxy getExtensionBeanTypeProxy(String typeName, Integer classID, IBeanTypeProxy superType);	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConnection.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConnection.java
deleted file mode 100644
index 6e7e47587..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConnection.java
+++ /dev/null
@@ -1,106 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Interface for the Remote VM Connection object.
- */
-
-public interface IREMConnection {
-	
-	/**
-	 * Did this construct correctly.
-	 * This is needed because an exception could be thrown in the ctor and
-	 * that's not a good thing to do.
-	 */
-	public boolean isConnected();
-	
-	/**
-	 * Terminate the server.
-	 * WARNING: This is only here so that factory can to it. Termination should ONLY
-	 * be done by the Factory not any one else. 
-	 */
-	public void terminateServer();
-			
-	/**
-	 * Close the connection.
-	 */
-	public void close();
-	
-	/**
-	 * Get the class information. Null return if not found.
-	 */
-	public Commands.GetClassReturn getClass(String className) throws CommandException;
-
-	/**
-	 * Get the class information from the id. 
-	 */
-	 public Commands.GetClassIDReturn getClassFromID(int classID) throws CommandException;
-
-	
-
-	/**
-	 * Get object data from an id.
-	 */	
-	public void getObjectData(int objectID, Commands.ValueObject valueReturn) throws CommandException;
-		
-	/**
-	 * Get a new instance using the initialization string.
-	 */
-	public void getNewInstance(int classID, String initString, Commands.ValueObject newInstance) throws CommandException;
-		
-	/**
-	 * Invoke the get array contents command.
-	 * @param arrayID
-	 * @param returnValue
-	 * @throws CommandException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void getArrayContents(int arrayID, Commands.ValueObject returnValue) throws CommandException;
-	
-	/**
-	 * Invoke the method call.
-	 * The parms valueObject must represent an Object[] (either through ARRAY_IDS or OBJECT)
-	 */	
-	public void invokeMethod(int methodID, Commands.ValueObject invokeOn, Commands.ValueObject parms, Commands.ValueObject returnValue) throws CommandException;
-
-	/**
-	 * Invoke the method call with method passed.
-	 * The parms valueObject must represent an Object[] (either through ARRAY_IDS or OBJECT)
-	 */	
-	public void invokeMethod(Commands.ValueObject classType, String methodName, Commands.ValueObject parmTypes, Commands.ValueObject invokeOn, Commands.ValueObject parms, Commands.ValueObject returnValue) throws CommandException;
-
-	/**
-	 * Release the id. It is no longer needed on the client.
-	 */
-	public void releaseID(int id);
-	
-	/**
-	 * Read array values as BeanProxies into valueSender.
-	 * @param returnValue
-	 * @param valueSender
-	 * @param allowFlag <code>true</code> to allow FLAG values, <code>false</code> if not allow flag values.
-	 * 
-	 * @throws CommandException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void readProxyArrayValues(Commands.ValueObject returnValue, Commands.ValueSender valueSender, boolean allowFlag) throws CommandException;
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanProxy.java
deleted file mode 100644
index dccb9d5f6..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanProxy.java
+++ /dev/null
@@ -1,25 +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.proxy.remote;
-/*
-
-
- */
-
-
-/**
- * Tag interface to indicate this proxy is a constant proxy, i.e. there
- * is no bean on the server representing this (e.g. Strings and Integers).
- */
-
-public interface IREMConstantBeanProxy extends IREMBeanProxy {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanTypeProxy.java
deleted file mode 100644
index 2c3f9fd4a..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * This interface is used for any BeanType that represents a constant type bean.
- * These are types that are immutable and a copy of the actual value is kept here
- * in the client and not stored as an object id.
- */
-
-public interface IREMConstantBeanTypeProxy extends IBeanTypeProxy {
-	
-	/**
-	 * Create a new bean proxy the ValueObject passed in.
-	 */
-	public IBeanProxy newBeanProxy(Commands.ValueObject value);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMExpressionConnection.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMExpressionConnection.java
deleted file mode 100644
index 335fb430c..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMExpressionConnection.java
+++ /dev/null
@@ -1,182 +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.proxy.remote;
-
-import java.io.IOException;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
- 
-/**
- * Additional function on a connection for expression tree processing.
- * Connections returned (IREMConnections) will always also implement IREMExpressionConnection,
- * but they are separated so that expression functions don't pollute the regular
- * connection interface with added commands that shouldn't be called except
- * when processing an expression. If they were called out of order, big problems
- * can occur.
- * <p>
- * To use, simply cast the IREMConnection to be an IREMExpressionConnection.
- * 
- * @since 1.0.0
- */
-public interface IREMExpressionConnection extends IREMConnection {
-	
-	/**
-	 * Start expression processing.
-	 * @param expressionID 
-	 * @param trace TODO
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void startExpressionProcessing(int expressionID, byte trace) throws IOException;
-	
-	/**
-	 * Transfer the expression. This tells the remote vm to stop processing on the
-	 * given connection and return the expression processing controller for the expression.
-	 * 
-	 * @param expressionID
-	 * @param expController
-	 * @throws IOException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void transferExpression(int expressionID, Commands.ValueObject expController) throws CommandException;
-	
-	/**
-	 * Resume the expression on this connection.
-	 * @param expressionID
-	 * @param expController expression processor controller to use for the expression on this new connection.
-	 * @throws CommandException 
-	 * 
-	 * @since 1.1.0
-	 */
-	public void resumeExpression(int expressionID, Commands.ValueObject expController) throws CommandException;
-	
-	/**
-	 * Push an expression command. This is the common portion of the
-	 * subcommand. The actual data of the command will be separately done.
-	 * @param expressionID 
-	 * @param subcommand The subcommand being sent. From IInternalExpressionConstants.
-	 * 
-	 * @throws IOException
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.initParser.tree.IInternalExpressionConstants#PUSH_TO_PROXY_EXPRESSION
-	 * @since 1.0.0
-	 */
-	public void pushExpressionCommand(int expressionID, byte subcommand) throws IOException;
-	
-	/**
-	 * Push the value object to the remote side.
-	 * 
-	 * @param valueObject
-	 * @throws CommandException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pushValueObject(Commands.ValueObject valueObject) throws CommandException;
-
-	/**
-	 * Push just the single byte to the remote side.
-	 * @param abyte
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pushByte(byte abyte) throws IOException;
-	
-	/**
-	 * Push just the single int to the remote side.
-	 * 
-	 * @param anInt
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pushInt(int anInt) throws IOException;
-	
-	
-	/**
-	 * Push just the singe string to the remote side.
-	 * 
-	 * @param aString
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pushString(String aString) throws IOException;
-	
-	/**
-	 * Push just the bool to the remote side.
-	 * @param aBool
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pushBoolean(boolean aBool) throws IOException;
-	
-	/**
-	 * Get the final value. It must be called after processing the proxy id resolutions even for sync (so that we can get
-	 * any thrown errors).
-	 * 
-	 * @param result
-	 * @throws CommandException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void getFinalValue(Commands.ValueObject result) throws CommandException;
-	
-	/**
-	 * Send the pull value command, with the proxyids of intereset. If an error
-	 * occurs, command exception is thrown. 
-	 * <p>
-	 * After the pull value call, if no errors, the proxyids must be read, and then getFinalValue call must be sent.
-	 * @param expressionID
-	 * @param proxyids expression proxyids that request feedback or <code>null</code> if no proxy ids.
-	 * @param sender sender to use to process the returned proxy ids, or <code>null</code> if expecting no proxy resolutions.
-	 * 
-	 * @throws CommandException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pullValue(int expressionID, Commands.ValueObject proxyids, Commands.ValueSender sender) throws CommandException;
-	
-	/**
-	 * Send the sync command, with the proxyids of intereset. If an error
-	 * occurs, command exception is thrown.
-	 * <p>
-	 * After the sync call, if no errors, the returned proxyids must be processed and then the final endValue call must be sent.
-	 * 
-	 * @param expressionID 
-	 * @param proxyids expression proxyids that request feedback or <code>null</code> if no proxy ids.
-	 * @param sender sender to use to process the proxy id resolutions, or <code>null</code> if expecting no proxy ids.
-	 * 
-	 * @throws CommandException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void sync(int expressionID, Commands.ValueObject proxyids, Commands.ValueSender sender) throws CommandException;	
-	
-	/**
-	 * Stop expression processing.
-	 * @param expressionID 
-	 * 
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void stopExpressionProcessing(int expressionID) throws IOException;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMMethodProxy.java
deleted file mode 100644
index f56556ba9..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMMethodProxy.java
+++ /dev/null
@@ -1,34 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * This interface for REMMethodProxy allows the invokation where
- * the parms are a mixture of constant objects (i.e. can be sent
- * as values to the client) and IBeanProxies. It is only to be
- * used by other factories that want to invoke methods where
- * some of the parms are constants so that there is no need
- * create IBeanProxies for them, e.g. String. This should be
- * used with extreme care.
- */
-
-public interface IREMMethodProxy extends IMethodProxy, IREMBeanProxy {
-	public IBeanProxy invokeWithParms(IBeanProxy subject, Object[] parms) throws ThrowableProxy;
-	
-		
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMSpecialBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMSpecialBeanTypeProxy.java
deleted file mode 100644
index 897a4ff67..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMSpecialBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +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.proxy.remote;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * This is a special interface for allowing abstract
- * types to create the correct subclass types.
- * Only ones that use REMAnAbstractBeanTypeProxy
- * should implement this.
- */
-public interface IREMSpecialBeanTypeProxy {
-	
-	/**
-	 * Called by REMAnAbstractBeanTypeProxy to create a subclass of it.
-	 * This allows correct types to be created depending upon the
-	 * main super type.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java
deleted file mode 100644
index df8937b3d..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java
+++ /dev/null
@@ -1,314 +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.proxy.remote;
-
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-/**
- * This version works with local files being added to the classpath, and the classpath is strings.
- * 
- * @since 1.0.0
- */
-public class LocalFileConfigurationContributorController implements IConfigurationContributionController {
-
-	private URL[] classpathInfo;
-
-	private URL[][] bootpathInfo;
-
-	private List classpath;
-
-	private List prependBootpath;
-
-	private List appendBootpath;
-
-	private List javaLibraryPath;
-
-	private ProxyLaunchSupport.LaunchInfo launchInfo;
-
-	public LocalFileConfigurationContributorController(URL[] classpathInfo, URL[][] bootpathInfo, ProxyLaunchSupport.LaunchInfo launchInfo) {
-		this.classpathInfo = classpathInfo;
-		this.bootpathInfo = bootpathInfo;
-		this.launchInfo = launchInfo;
-	}
-
-	public URL[] getFinalClasspath() {
-		if (classpath == null)
-			return classpathInfo;
-		else
-			return (URL[]) classpath.toArray(new URL[classpath.size()]);
-	}
-
-	public URL[] getFinalPrependBootpath() {
-		if (prependBootpath == null)
-			return bootpathInfo[0];
-		else
-			return (URL[]) prependBootpath.toArray(new URL[prependBootpath.size()]);
-	}
-
-	public URL[] getFinalAppendBootpath() {
-		if (appendBootpath == null)
-			return bootpathInfo[2];
-		else
-			return (URL[]) appendBootpath.toArray(new URL[appendBootpath.size()]);
-	}
-
-	public List getFinalJavaLibraryPath() {
-		if (javaLibraryPath == null)
-			return Collections.EMPTY_LIST;
-		else
-			return javaLibraryPath;
-	}
-
-	protected List getClasspath() {
-		if (classpath == null) {
-			classpath = new ArrayList(classpathInfo.length);
-			addAll(classpath, classpathInfo, -1);
-		}
-		return classpath;
-	}
-
-	protected List getPrependBootpath() {
-		if (prependBootpath == null) {
-			if (bootpathInfo[0] != null) {
-				prependBootpath = new ArrayList(bootpathInfo[0].length);
-				addAll(prependBootpath, bootpathInfo[0], -1);
-			} else
-				prependBootpath = new ArrayList(1);
-		}
-		return prependBootpath;
-	}
-
-	protected List getAppendBootpath() {
-		if (appendBootpath == null) {
-			if (bootpathInfo[2] != null) {
-				appendBootpath = new ArrayList(bootpathInfo[2].length);
-				addAll(appendBootpath, bootpathInfo[2], -1);
-			} else
-				appendBootpath = new ArrayList(1);
-		}
-		return appendBootpath;
-	}
-
-	protected List getJavaLibraryPath() {
-		if (javaLibraryPath == null) {
-			javaLibraryPath = new ArrayList(3);
-		}
-		return javaLibraryPath;
-	}
-
-	protected void addAll(List toList, Object[] array, int loc) {
-		for (int i = 0; i < array.length; i++) {
-			// Need a dup check, sometimes dups come in especially during development
-			if (toList.contains(array[i]))
-				continue;
-			if (loc == -1)
-				toList.add(array[i]);
-			else
-				toList.add(loc++, array[i]);
-		}
-	}
-
-	protected void addLocations(List toList, IRuntimeClasspathEntry[] entries) {
-		for (int i = 0; i < entries.length; i++) {
-			IRuntimeClasspathEntry entry = entries[i];
-			URL location = ProxyLaunchSupport.convertStringPathToURL(entry.getLocation());
-			if (location != null && !toList.contains(location))
-				toList.add(location);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#getJavaProject()
-	 */
-	public IJavaProject getJavaProject() {
-		return launchInfo.getJavaProject();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeProject(org.eclipse.core.resources.IProject)
-	 */
-	public void contributeProject(IProject project) throws CoreException {
-		IJavaProject jproject = JavaCore.create(project);
-		IRuntimeClasspathEntry[] projPath = JavaRuntime.computeUnresolvedRuntimeClasspath(jproject);
-		boolean jreContainerFound = false;
-		for (int i = 0; i < projPath.length; i++) {
-			IRuntimeClasspathEntry entry = projPath[i];
-			if (entry.getClasspathProperty() == IRuntimeClasspathEntry.BOOTSTRAP_CLASSES
-					|| entry.getClasspathProperty() == IRuntimeClasspathEntry.STANDARD_CLASSES) {
-				int entryKind = entry.getClasspathEntry().getEntryKind();
-				String segment0 = entry.getPath().segment(0);
-				if (entryKind == IClasspathEntry.CPE_CONTAINER && JavaRuntime.JRE_CONTAINER.equals(segment0)
-						|| entryKind == IClasspathEntry.CPE_VARIABLE && JavaRuntime.JRELIB_VARIABLE.equals(segment0)) {
-					jreContainerFound = true;
-				} else {
-					if (jreContainerFound)
-						addLocations(getAppendBootpath(), JavaRuntime.resolveRuntimeClasspathEntry(entry, jproject));
-					else
-						addLocations(getPrependBootpath(), JavaRuntime.resolveRuntimeClasspathEntry(entry, jproject));
-				}
-			} else {
-				addLocations(getClasspath(), JavaRuntime.resolveRuntimeClasspathEntry(entry, jproject));
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.lang.String, int)
-	 */
-	public void contributeClasspath(String classpath, int typeFlag) {
-		contributeClasspath(ProxyLaunchSupport.convertStringPathToURL(classpath), typeFlag);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.net.URL, int)
-	 */
-	public void contributeClasspath(URL classpathURL, int typeFlag) {
-		if (classpathURL == null)
-			return;
-		switch (typeFlag) {
-			case PREPEND_BOOT_CLASSPATH:
-				if (!getPrependBootpath().contains(classpathURL))
-					getPrependBootpath().add(classpathURL);
-				break;
-			case PREPEND_USER_CLASSPATH:
-				if (!getClasspath().contains(classpathURL))
-					getClasspath().add(0, classpathURL);
-				break;
-			case APPEND_USER_CLASSPATH:
-				if (!getClasspath().contains(classpathURL))
-					getClasspath().add(classpathURL);
-				break;
-			case APPEND_BOOT_CLASSPATH:
-				if (!getAppendBootpath().contains(classpathURL))
-					getAppendBootpath().add(classpathURL);
-				break;
-			case APPEND_JAVA_LIBRARY_PATH:
-				if (!getJavaLibraryPath().contains(classpathURL))
-					getJavaLibraryPath().add(classpathURL);
-				break;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(org.osgi.framework.Bundle, java.lang.String,
-	 *      int, boolean)
-	 */
-	public void contributeClasspath(Bundle bundle, String relativePath, int typeFlag, boolean nlsLocalize) {
-		// If not nls localize, or if it is java library path, then just find the one in the plugin/fragment and add it.
-		if (nlsLocalize)
-			contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeAllFromBundleAndFragments(bundle, relativePath), typeFlag);
-		else if (typeFlag == IConfigurationContributionController.APPEND_JAVA_LIBRARY_PATH) {
-			if (relativePath == null || relativePath.length() == 0) {
-				// PDE is not here to help us extract that @#$ dll
-				JEMUtilPlugin.getLogger().log("Can't extract a directory from the root of a plugin."); //$NON-NLS-1$
-				return;
-			}
-			URL contribution = ProxyPlugin.getPlugin().urlLocalizeFromBundleAndFragments(bundle, relativePath);
-			contributeClasspath(contribution, typeFlag);
-		} else {
-			if (relativePath != null)
-				contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeFromBundleOnly(bundle, relativePath), typeFlag);
-			else
-				contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeBundle(bundle), typeFlag);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(org.osgi.framework.Bundle,
-	 *      org.eclipse.core.runtime.IPath, int, boolean)
-	 */
-	public void contributeClasspath(Bundle bundle, IPath relativePath, int typeFlag, boolean nlsLocalize) {
-		if (nlsLocalize)
-			if (relativePath != null)
-				contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeAllFromBundleAndFragments(bundle, relativePath), typeFlag);
-			else
-				contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeBundleAndFragments(bundle), typeFlag);
-		else if (typeFlag == IConfigurationContributionController.APPEND_JAVA_LIBRARY_PATH) {
-			if (relativePath == null || relativePath.segmentCount() == 0) {
-				// PDE is not here to help us extract that @#$ dll
-				JEMUtilPlugin.getLogger().log("Can't extract a directory from the root of a plugin."); //$NON-NLS-1$
-				return;
-			}
-			URL contribution = ProxyPlugin.getPlugin().urlLocalizeFromBundleAndFragments(bundle, relativePath);
-			contributeClasspath(contribution, typeFlag);
-		} else {
-			if (relativePath != null)
-				contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeFromBundleOnly(bundle, relativePath), typeFlag);
-			else
-				contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeBundle(bundle), typeFlag);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.lang.String[], int)
-	 */
-	public void contributeClasspath(String[] classpaths, int typeFlag) {
-		contributeClasspath(ProxyLaunchSupport.convertStringPathsToURL(classpaths), typeFlag);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.net.URL[], int)
-	 */
-	public void contributeClasspath(URL[] classpathURLs, int typeFlag) {
-		if (classpathURLs == null)
-			return;
-		switch (typeFlag) {
-			case PREPEND_BOOT_CLASSPATH:
-				addAll(getPrependBootpath(), classpathURLs, -1);
-				break;
-			case PREPEND_USER_CLASSPATH:
-				addAll(getClasspath(), classpathURLs, 0);
-				break;
-			case APPEND_USER_CLASSPATH:
-				addAll(getClasspath(), classpathURLs, -1);
-				break;
-			case APPEND_BOOT_CLASSPATH:
-				addAll(getAppendBootpath(), classpathURLs, -1);
-				break;
-			case APPEND_JAVA_LIBRARY_PATH:
-				addAll(getJavaLibraryPath(), classpathURLs, -1);
-				break;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java
deleted file mode 100644
index c59772c15..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java
+++ /dev/null
@@ -1,475 +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
- *******************************************************************************/
-/*
- * $RCSfile: LocalProxyLaunchDelegate.java,v $ $Revision: 1.35 $ $Date: 2006/05/23 15:43:03 $
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.*;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.debug.core.model.*;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.launching.*;
-
-import org.eclipse.jem.internal.proxy.common.remote.ExpressionCommands;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.remote.awt.REMRegisterAWT;
-import org.eclipse.jem.util.TimerTests;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * Launch Delegate for launching Local (i.e. remote vm is on local system). Here "remote" means the
- * registry is not in the IDE but in a separate VM, and "local" means that is in on the local
- * physical machine and not on a separate machine.
- * 
- * @since 1.0.0
- */
-public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDelegate {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration,
-	 *      java.lang.String, org.eclipse.debug.core.ILaunch,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor pm) throws CoreException {
-
-		String launchKey = configuration.getAttribute(IProxyConstants.ATTRIBUTE_LAUNCH_KEY, (String) null);
-		if (launchKey == null)
-			abort(ProxyRemoteMessages.ProxyRemoteNoLaunchKey, null, 0); 
-
-		// In Eclipse, even if private, a launch will show up in the debug process tree and in the console viewer.
-		// To be absolutely private, we need to remove the launch which has already been added.
-		if (ProxyLaunchSupport.ATTR_PRIVATE != null && configuration.getAttribute(ProxyLaunchSupport.ATTR_PRIVATE, false)) 
-			DebugPlugin.getDefault().getLaunchManager().removeLaunch(launch);		
-		if (pm == null) {
-			pm = new NullProgressMonitor();
-		}
-
-		IJavaProject project = getJavaProject(configuration);
-		String name = configuration.getAttribute(IProxyConstants.ATTRIBUTE_VM_TITLE, (String) null);
-		if (name == null)
-			name = MessageFormat.format(ProxyRemoteMessages.ProxyRemoteVMName, new Object[] { project != null ? project.getProject().getName() : "" });  //$NON-NLS-1$
-		else
-			name = MessageFormat.format(ProxyRemoteMessages.ProxyRemoteVMNameWithComment, new Object[] { project != null ? project.getProject().getName() : "", name });  //$NON-NLS-1$
-
-		String stepId = "Launch VM ( " + name + " )"; //$NON-NLS-1$ //$NON-NLS-2$
-		TimerTests.basicTest.startStep(stepId);
-		// Problem with launch, can't have double-quotes in vmName.
-		if (name.indexOf('"') != -1)
-			name = name.replace('"', '\'');
-
-		pm.beginTask("", 500); //$NON-NLS-1$
-		pm.subTask(MessageFormat.format(ProxyRemoteMessages.ProxyRemoteLaunchVM, new Object[] { name })); 
-		// check for cancellation
-		if (pm.isCanceled())
-			return;
-
-		IVMInstall vm = verifyVMInstall(configuration);
-
-		IVMRunner runner = vm.getVMRunner(mode);
-		if (runner == null) {
-			abort(MessageFormat.format(ProxyRemoteMessages.Proxy_NoRunner_ERROR_, new Object[] { name }), null, 0); 
-		}
-
-		File workingDir = verifyWorkingDirectory(configuration);
-		String workingDirName = null;
-		if (workingDir != null) {
-			workingDirName = workingDir.getAbsolutePath();
-		}
-
-		// Environment variables
-		String[] envp = DebugPlugin.getDefault().getLaunchManager().getEnvironment(configuration);
-
-		// Program & VM args
-		String pgmArgs = getProgramArguments(configuration);
-		String vmArgs = getVMArguments(configuration);
-		ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
-
-		// VM-specific attributes
-		Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-
-		pm.worked(100);
-		
-		// Now let's get the classpaths created through the contributors.
-		URL[] classpath = ProxyLaunchSupport.convertStringPathsToURL(getClasspath(configuration));
-		String[][] bootpathInfoStrings = getBootpathExt(vmAttributesMap);
-		URL[][] bootpathInfo = new URL[][]{
-				ProxyLaunchSupport.convertStringPathsToURL(bootpathInfoStrings[0]),
-				ProxyLaunchSupport.convertStringPathsToURL(bootpathInfoStrings[1]),
-				ProxyLaunchSupport.convertStringPathsToURL(bootpathInfoStrings[2]),
-		};
-		ProxyLaunchSupport.LaunchInfo launchInfo = ProxyLaunchSupport.getInfo(launchKey);
-		final IConfigurationContributor[] contributors = launchInfo.contributors;
-		final LocalFileConfigurationContributorController controller =
-			new LocalFileConfigurationContributorController(classpath, bootpathInfo, launchInfo);
-		if (contributors != null) {		
-			for (int i = 0; i < contributors.length; i++) {
-				// Run in safe mode so that anything happens we don't go away.
-				final int ii = i;
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Don't need to do anything. Platform.run logs it for me.
-					}
-
-					public void run() throws Exception {
-						contributors[ii].contributeClasspaths(controller);
-					}
-				});
-			}
-		}
-
-		// Add in the required ones by the Proxy support. These are hard-coded since they are
-		// required.
-		ProxyRemoteUtil.updateClassPaths(controller);
-		addInFragmentLibraries(controller, launchInfo.getConfigInfo());
-
-		classpath = controller.getFinalClasspath();
-		if (bootpathInfo[0] != controller.getFinalPrependBootpath()) {
-		    if (vmAttributesMap == null)
-		        vmAttributesMap = new HashMap(2);
-		    vmAttributesMap.put(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_PREPEND, ProxyLaunchSupport.convertURLsToStrings(bootpathInfo[0]));
-		}
-		if (bootpathInfo[2] != controller.getFinalAppendBootpath()) {
-		    if (vmAttributesMap == null)
-		        vmAttributesMap = new HashMap(2);
-		    vmAttributesMap.put(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_APPEND, ProxyLaunchSupport.convertURLsToStrings(bootpathInfo[2]));
-		}
-
-		// check for cancellation
-		if (pm.isCanceled())
-			return;
-		pm.worked(100);
-
-		// Create VM config
-		VMRunnerConfiguration runConfig =
-			new VMRunnerConfiguration("org.eclipse.jem.internal.proxy.vm.remote.RemoteVMApplication", ProxyLaunchSupport.convertURLsToStrings(classpath)); //$NON-NLS-1$
-
-		REMProxyFactoryRegistry registry = new REMProxyFactoryRegistry(ProxyRemoteUtil.getRegistryController(), name);
-		Integer registryKey = registry.getRegistryKey();
-
-		Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
-		if (bufSize == null)
-			bufSize = new Integer(16000);
-
-		int masterServerPort = ProxyRemoteUtil.getRegistryController().getMasterSocketPort();
-
-		// See if debug mode is requested.
-		DebugModeHelper dh = new DebugModeHelper();
-		boolean debugMode = dh.debugMode(name);
-		boolean useNoverify = ProxyPlugin.getPlugin().getPluginPreferences().getBoolean(ProxyPlugin.PREFERENCES_VM_NOVERIFY_KEY);
-
-		String[] evmArgs = execArgs.getVMArgumentsArray();
-		
-		int extraArgs = 4;	// Number of extra standard args added (if number changes below, this must change)
-		if (debugMode)
-			extraArgs+=4;	// Number of extra args added for debug mode (if number changes below, this must change).
-		if(useNoverify)
-			extraArgs++; // An extra arg added for '-noverify' flag (if number changes below, this must change).
-		
-		boolean useExpressionTracing = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACING)); //$NON-NLS-1$
-		long expressionTracingThreshold = -1;
-		if (useExpressionTracing) {
-			extraArgs++;
-			String thresholdString = Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACEING_TIMER_THRESHOLD);
-			if (thresholdString != null) {
-				try {
-					expressionTracingThreshold = Long.valueOf(thresholdString).longValue();
-					extraArgs++;
-				} catch (NumberFormatException e) {
-				}
-			}
-		}
-		
-		List javaLibPaths = controller.getFinalJavaLibraryPath();
-		int existingLibpaths = -1;
-		if (!javaLibPaths.isEmpty()) {
-			// first need to see if java lib path also specified in standard args by someone configuring the configuration by hand.
-			for (int i = 0; i < evmArgs.length; i++) {
-				if (evmArgs[i].startsWith("-Djava.library.path")) { //$NON-NLS-1$
-					// We found one already here, save the spot so we update it later.
-					existingLibpaths = i;
-					break;
-				}
-			}
-			if (existingLibpaths == -1)
-				++extraArgs;	// Need to have room for one more.
-		}
-		
-		String[] cvmArgs = new String[evmArgs.length + extraArgs];
-		System.arraycopy(evmArgs, 0, cvmArgs, extraArgs, evmArgs.length);	// Put existing into new list at the end.		
-		
-		int cvmArgsCount=0;
-		cvmArgs[cvmArgsCount++] = "-Dproxyvm.registryKey=" + registryKey; //$NON-NLS-1$
-		cvmArgs[cvmArgsCount++] = "-Dproxyvm.masterPort=" + String.valueOf(masterServerPort); //$NON-NLS-1$
-		cvmArgs[cvmArgsCount++] = "-Dproxyvm.bufsize=" + bufSize; //$NON-NLS-1$
-		cvmArgs[cvmArgsCount++] = "-Dproxyvm.servername=" + name; //$NON-NLS-1$
-		
-		if(useNoverify)
-			cvmArgs[cvmArgsCount++] = "-noverify"; //$NON-NLS-1$
-		
-		if (useExpressionTracing) {
-			cvmArgs[cvmArgsCount++] = "-D"+ExpressionCommands.EXPRESSIONTRACE+"=true"; //$NON-NLS-1$ //$NON-NLS-2$
-			if (expressionTracingThreshold != -1)
-				cvmArgs[cvmArgsCount++] = "-D"+ExpressionCommands.EXPRESSIONTRACE_TIMER_THRESHOLD+'='+String.valueOf(expressionTracingThreshold); //$NON-NLS-1$
-		}
-
-		// If in debug mode, we need to find a port for it to use.
-		int dport = -1;
-		if (debugMode) {
-			dport = findUnusedLocalPort("localhost", 5000, 15000, new int[0]); //$NON-NLS-1$
-			cvmArgs[cvmArgsCount++] = "-Djava.compiler=NONE"; //$NON-NLS-1$
-			cvmArgs[cvmArgsCount++] = "-Xdebug"; //$NON-NLS-1$
-			cvmArgs[cvmArgsCount++] = "-Xnoagent"; //$NON-NLS-1$
-			cvmArgs[cvmArgsCount++] = "-Xrunjdwp:transport=dt_socket,server=y,address=" + dport; //$NON-NLS-1$
-		}
-		
-		if (!javaLibPaths.isEmpty()) {
-			StringBuffer appendTo = null;
-			if (existingLibpaths != -1) {
-				appendTo = new StringBuffer(evmArgs[existingLibpaths]); 
-				appendTo.append(File.pathSeparatorChar);	// Plus a separator so we can append
-			} else 
-				appendTo = new StringBuffer("-Djava.library.path="); //$NON-NLS-1$
-			String [] libPaths = ProxyLaunchSupport.convertURLsToStrings((URL[]) javaLibPaths.toArray(new URL[javaLibPaths.size()]));
-			for (int i = 0; i < libPaths.length; i++) {
-				if (i != 0)
-					appendTo.append(File.pathSeparator);
-				appendTo.append(libPaths[i]);
-			}
-			if (existingLibpaths != -1)
-				cvmArgs[extraArgs+existingLibpaths] = appendTo.toString();
-			else
-				cvmArgs[extraArgs-1] = appendTo.toString();
-		}
-
-		runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
-		runConfig.setEnvironment(envp);
-		runConfig.setVMArguments(cvmArgs);
-		runConfig.setWorkingDirectory(workingDirName);
-		runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-
-		// Bootpath
-		runConfig.setBootClassPath(getBootpath(configuration));
-
-		// check for cancellation
-		if (pm.isCanceled())
-			return;
-		pm.worked(100);
-
-		// set the default source locator if required
-		setDefaultSourceLocator(launch, configuration);
-
-		// Launch the configuration - 1 unit of work
-		runner.run(runConfig, launch, new SubProgressMonitor(pm, 100));
-
-		// check for cancellation
-		if (pm.isCanceled())
-			return;
-
-		IProcess[] processes = launch.getProcesses();
-		IProcess process = processes[0]; // There is only one.
-		// Check if it is already terminated. If it is, then there was a bad error, so just
-		// print out the results from it.
-		if (process.isTerminated()) {
-			IStreamsProxy stProxy = process.getStreamsProxy();
-			// Using a printWriter for println capability, but it needs to be on another
-			// writer, which will be string
-			java.io.StringWriter s = new java.io.StringWriter();
-			java.io.PrintWriter w = new java.io.PrintWriter(s);
-
-			w.println(ProxyRemoteMessages.VM_TERMINATED_INFO_); 
-			w.println(ProxyRemoteMessages.VM_COMMAND_LINE);
-			w.println(process.getAttribute(IProcess.ATTR_CMDLINE));
-			w.println(ProxyRemoteMessages.VM_TERMINATED_LINE1); 
-			w.println(stProxy.getErrorStreamMonitor().getContents());
-			w.println(ProxyRemoteMessages.VM_TERMINATED_LINE2); 
-			w.println(stProxy.getOutputStreamMonitor().getContents());
-			w.println(ProxyRemoteMessages.VM_TERMINATED_LINE3); 
-			w.close();
-
-			String msg = MessageFormat.format(ProxyRemoteMessages.Proxy_Terminated_too_soon_ERROR_, new Object[] { name }); 
-			dh.displayErrorMessage(ProxyRemoteMessages.Proxy_Error_Title, msg); 
-			throw new CoreException(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, s.toString(), null));
-		} else {
-			final String traceName = name;
-			IStreamsProxy fStreamsProxy = process.getStreamsProxy();
-
-			/**
-			 * StreamListener. Should not be created if ProxyPlugin logger is not logging the requested level.
-			 * 
-			 * @since 1.1.0
-			 */
-			class StreamListener implements IStreamListener {
-				String tracePrefix;
-				Level level;
-				Job printJob;	// Job to try to gather printing together.
-				Logger logger;
-				StringBuffer gatheredText = new StringBuffer(100);
-				{
-					logger = ProxyPlugin.getPlugin().getLogger();
-					printJob = new Job("") { //$NON-NLS-1$
-
-						protected IStatus run(IProgressMonitor monitor) {
-							monitor.beginTask(ProxyRemoteMessages.LocalProxyLaunchDelegate_Monitor_PrintRemoteTrace_Text, 1); 
-							while(true) {
-								String output = null;
-								synchronized (gatheredText) {
-									if (gatheredText.length() <= tracePrefix.length())
-										break;	// We've reached the end, no more to print.
-									output = gatheredText.toString();
-									gatheredText.setLength(tracePrefix.length());	// Reset the length to the prefix.
-								}
-								logger.log(output, level);
-							}
-							monitor.done();
-							return Status.OK_STATUS;
-						}
-					};
-					printJob.setPriority(Job.SHORT);
-					printJob.setSystem(true);
-				}
-				
-				public StreamListener(String type, Level level, Logger logger) {
-					tracePrefix = traceName + ':' + type + '>' + System.getProperty("line.separator"); //$NON-NLS-1$
-					gatheredText.append(tracePrefix);
-					this.level = level;
-					this.logger = logger;
-				}
-
-				public void streamAppended(String newText, IStreamMonitor monitor) {
-					synchronized(gatheredText) {
-						gatheredText.append(newText);
-					}
-					printJob.schedule(100L);	// Wait tenth of second to gather as much as can together.
-				}
-			};
-
-			Logger logger = ProxyPlugin.getPlugin().getLogger();
-			if (logger.isLoggingLevel(Level.WARNING)) {
-				// Always listen to System.err output if we are at least logging warnings.
-				IStreamMonitor monitor = fStreamsProxy.getErrorStreamMonitor();
-				if (monitor != null)
-					monitor.addListener(new StreamListener("err", Level.WARNING, logger)); //$NON-NLS-1$
-			}
-
-			// If debug trace is requested, then attach trace listener for System.out
-			// Expression tracing requires debug trace too because it prints to sysout. However, it requesting expressionTracing, change logging level to INFO,
-			// we want them to show if this true. It is confusing to also have to change logging level in .options file.
-			if (useExpressionTracing)
-				if (!logger.isLoggingLevel(Level.INFO))
-					logger.setLevel(Level.INFO);
-			if (useExpressionTracing || "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyRemoteUtil.DEBUG_VM_TRACEOUT))) { //$NON-NLS-1$
-				// Want to trace the output of the remote vm's. And we are logging at least level info.
-				if (logger.isLoggingLevel(Level.INFO)) {
-					IStreamMonitor monitor = fStreamsProxy.getOutputStreamMonitor();
-					if (monitor != null)
-						monitor.addListener(new StreamListener("out", Level.INFO, logger)); //$NON-NLS-1$							
-				}							
-			}
-		}
-
-		// If in debug mode, tester must start debugger before going on.
-		if (debugMode) {
-			if (!dh.promptPort(dport)) {
-				process.terminate();
-				throw new CoreException(
-					new Status(
-						IStatus.WARNING,
-						ProxyPlugin.getPlugin().getBundle().getSymbolicName(),
-						0,
-						"Debugger attach canceled", //$NON-NLS-1$
-						null));
-			}
-		}
-
-		// Now set up the registry.
-		registry.initializeRegistry(process);
-		new REMStandardBeanTypeProxyFactory(registry);
-		new REMStandardBeanProxyFactory(registry);
-		new REMMethodProxyFactory(registry);
-
-		if (debugMode || REMProxyFactoryRegistry.fGlobalNoTimeouts)
-			registry.fNoTimeouts = true;
-		if (configuration.getAttribute(IProxyConstants.ATTRIBUTE_AWT_SWING, true))
-			REMRegisterAWT.registerAWT(registry);
-
-		launchInfo.resultRegistry = registry;
-
-		pm.done();
-		TimerTests.basicTest.stopStep(stepId);
-	}
-
-	/**
-	 * @param controller
-	 * @param info 
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.2
-	 */
-	private void addInFragmentLibraries(IConfigurationContributionController controller, IConfigurationContributionInfo info) throws CoreException {
-		IPDEContributeClasspath instance = IPDEContributeClasspath.INSTANCE;
-		if (instance != null) {
-			instance.getPDEContributions(controller, info);
-		}
-	}
-
-	// Utilities to find the free port
-	private static final Random fgRandom = new Random(System.currentTimeMillis());
-
-	private static int findUnusedLocalPort(String host, int searchFrom, int searchTo, int[] exclude) {
-		for (int i = 0; i < 10; i++) {
-			int port = 0;
-			newport : while (true) {
-				port = getRandomPort(searchFrom, searchTo);
-				if (exclude != null)
-					for (int e = 0; e < exclude.length; e++)
-						if (port == exclude[e])
-							continue newport;
-				break;
-			}
-			try {
-				new Socket(host, port);
-			} catch (ConnectException e) {
-				return port;
-			} catch (IOException e) {
-			}
-		}
-		return -1;
-	}
-
-	private static int getRandomPort(int low, int high) {
-		return (int) (fgRandom.nextFloat() * (high - low)) + low;
-	}
-	
-	private String[][] getBootpathExt(Map vmMap) {
-	    String[][] ext = new String[3][];
-	    if (vmMap != null) {
-		    ext[0] = (String[]) vmMap.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_PREPEND);
-		    ext[1] = (String[]) vmMap.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH);
-		    ext[2] = (String[]) vmMap.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_APPEND);
-	    }
-	    return ext;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/MessageDialog.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/MessageDialog.java
deleted file mode 100644
index dd60e3dd1..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/MessageDialog.java
+++ /dev/null
@@ -1,331 +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.proxy.remote;
-/*
-
-
- */
-
-import java.awt.*;
-/**
- * This is an AWT message dialog. It will only be used
- * if not running in the workbench by the debug mode helper.
- * It won't be loaded unless AWT is available, so it can be
- * distributed without causing problems on systems that
- * don't have AWT because it won't be loaded in that case.
- */
-class MessageDialog extends Dialog {
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 * 
-	 * @since 1.1.0
-	 */
-	private static final long serialVersionUID = 2547670349372067345L;
-	private java.awt.Panel ivjContentsPane = null;
-	IvjEventHandler ivjEventHandler = new IvjEventHandler();
-	private java.awt.TextArea ivjTextArea1 = null;
-	private java.awt.Button ivjButton1 = null;
-	public int result = 2;	// Nothing hit is the same as button 2.
-	private java.awt.Button ivjButton2 = null;
-
-class IvjEventHandler implements java.awt.event.ActionListener, java.awt.event.WindowListener {
-		public void actionPerformed(java.awt.event.ActionEvent e) {
-			if (e.getSource() == MessageDialog.this.getButton1()) 
-				connEtoC2(e);
-			if (e.getSource() == MessageDialog.this.getButton2()) 
-				connEtoC3(e);
-		};
-		public void windowActivated(java.awt.event.WindowEvent e) {};
-		public void windowClosed(java.awt.event.WindowEvent e) {};
-		public void windowClosing(java.awt.event.WindowEvent e) {
-			if (e.getSource() == MessageDialog.this) 
-				connEtoC1(e);
-		};
-		public void windowDeactivated(java.awt.event.WindowEvent e) {};
-		public void windowDeiconified(java.awt.event.WindowEvent e) {};
-		public void windowIconified(java.awt.event.WindowEvent e) {};
-		public void windowOpened(java.awt.event.WindowEvent e) {};
-	};
-/**
- * MessageDialog constructor comment.
- * @param owner java.awt.Frame
- * @param title java.lang.String
- * @param modal boolean
- */
-public MessageDialog(Frame owner, String title, boolean modal, String msg, String button1, String button2) {
-	super(owner, title, modal);
-
-	initialize();
-	getTextArea1().setText(msg);
-	getButton1().setLabel(button1);
-	if (button2 != null)
-		getButton2().setLabel(button2);
-	else {
-		// We only want one button, so remove button2
-		getContentsPane().remove(getButton2());
-	}
-	
-}
-/**
- * Comment
- */
-public void button1_ActionPerformed() {
-	result = 1;
-	setVisible(false);
-	return;
-}
-/**
- * Comment
- */
-public void button2_ActionPerformed() {
-	result = 2;
-	setVisible(false);
-	return;
-}
-/**
- * connEtoC1:  (MessageDialog.window.windowClosing(java.awt.event.WindowEvent) --> MessageDialog.dispose()V)
- * @param arg1 java.awt.event.WindowEvent
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void connEtoC1(java.awt.event.WindowEvent arg1) {
-	try {
-		// user code begin {1}
-		// user code end
-		this.dispose();
-		// user code begin {2}
-		// user code end
-	} catch (java.lang.Throwable ivjExc) {
-		// user code begin {3}
-		// user code end
-		handleException(ivjExc);
-	}
-}
-/**
- * connEtoC2:  (Button1.action.actionPerformed(java.awt.event.ActionEvent) --> MessageDialog.button1_ActionPerformed()V)
- * @param arg1 java.awt.event.ActionEvent
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void connEtoC2(java.awt.event.ActionEvent arg1) {
-	try {
-		// user code begin {1}
-		// user code end
-		this.button1_ActionPerformed();
-		// user code begin {2}
-		// user code end
-	} catch (java.lang.Throwable ivjExc) {
-		// user code begin {3}
-		// user code end
-		handleException(ivjExc);
-	}
-}
-/**
- * connEtoC3:  (Button2.action.actionPerformed(java.awt.event.ActionEvent) --> MessageDialog.button2_ActionPerformed()V)
- * @param arg1 java.awt.event.ActionEvent
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void connEtoC3(java.awt.event.ActionEvent arg1) {
-	try {
-		// user code begin {1}
-		// user code end
-		this.button2_ActionPerformed();
-		// user code begin {2}
-		// user code end
-	} catch (java.lang.Throwable ivjExc) {
-		// user code begin {3}
-		// user code end
-		handleException(ivjExc);
-	}
-}
-/**
- * Display dialog.
- * @param args java.lang.String[]
- */
-public static int doit(String title, String message, String button1, String button2) {
-	try {
-		Frame f = new java.awt.Frame(title);
-		f.setVisible(true);
-		// Need to massage the method since AWT doesn't have wordwrap. This is for left to right only.
-		String msg = message;
-		if (message.length() > 95) {
-			msg = ""; //$NON-NLS-1$
-nextSeg:	while (message.length() > 95) {
-				// Too wide, wrapping should be done. This is just a rough guess.
-				for (int i=95; 0<=i; i--) {
-					if (message.charAt(i) == ' ') {
-						// Break here.
-						msg = msg + message.substring(0, i) + '\n';
-						if (i+1 < message.length())
-							message = message.substring(i+1);
-						else
-							message = ""; //$NON-NLS-1$
-						continue nextSeg;
-					}
-				}
-				// If we got here, then there weren't any spaces in the first 80, so look right for first space.
-				for (int i=96; i<message.length(); i++) {
-					if (message.charAt(i) == ' ') {
-						// Break here
-						msg = msg + message.substring(0, i) + '\n';
-						if (i+1 < message.length())
-							message = message.substring(i+1);
-						else
-							message = ""; //$NON-NLS-1$
-						continue nextSeg;
-					}
-				}
-			}
-			msg += message;	// Now put on whatever is left.
-		}
-		MessageDialog aMessageDialog = new MessageDialog(f,title,true, msg, button1, button2);
-		aMessageDialog.pack();
-		aMessageDialog.getToolkit().beep();
-		aMessageDialog.setVisible(true);
-		f.dispose();
-		aMessageDialog.dispose();
-
-		return aMessageDialog.result;
-	} catch (Exception exception) {
-	}
-
-	return 2;
-}
-/**
- * Return the Button1 property value.
- * @return java.awt.Button
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.Button getButton1() {
-	if (ivjButton1 == null) {
-		try {
-			ivjButton1 = new java.awt.Button();
-			ivjButton1.setName("Button1"); //$NON-NLS-1$
-			ivjButton1.setLabel("Button1"); //$NON-NLS-1$
-			// user code begin {1}
-			// user code end
-		} catch (java.lang.Throwable ivjExc) {
-			// user code begin {2}
-			// user code end
-			handleException(ivjExc);
-		}
-	}
-	return ivjButton1;
-}
-/**
- * Return the Button2 property value.
- * @return java.awt.Button
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.Button getButton2() {
-	if (ivjButton2 == null) {
-		try {
-			ivjButton2 = new java.awt.Button();
-			ivjButton2.setName("Button2"); //$NON-NLS-1$
-			ivjButton2.setLabel("Button2"); //$NON-NLS-1$
-			// user code begin {1}
-			// user code end
-		} catch (java.lang.Throwable ivjExc) {
-			// user code begin {2}
-			// user code end
-			handleException(ivjExc);
-		}
-	}
-	return ivjButton2;
-}
-/**
- * Return the ContentsPane property value.
- * @return java.awt.Panel
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.Panel getContentsPane() {
-	if (ivjContentsPane == null) {
-		try {
-			ivjContentsPane = new java.awt.Panel();
-			ivjContentsPane.setName("ContentsPane"); //$NON-NLS-1$
-			ivjContentsPane.setLayout(new java.awt.FlowLayout());
-			getContentsPane().add(getTextArea1(), getTextArea1().getName());
-			getContentsPane().add(getButton1(), getButton1().getName());
-			getContentsPane().add(getButton2(), getButton2().getName());
-			// user code begin {1}
-			// user code end
-		} catch (java.lang.Throwable ivjExc) {
-			// user code begin {2}
-			// user code end
-			handleException(ivjExc);
-		}
-	}
-	return ivjContentsPane;
-}
-/**
- * Return the TextArea1 property value.
- * @return java.awt.TextArea
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.TextArea getTextArea1() {
-	if (ivjTextArea1 == null) {
-		try {
-			ivjTextArea1 = new TextArea();
-			ivjTextArea1.setName("TextArea1"); //$NON-NLS-1$
-			ivjTextArea1.setText("TextArea1"); //$NON-NLS-1$
-			ivjTextArea1.setRows(20);
-			ivjTextArea1.setColumns(100);
-			ivjTextArea1.setEditable(false);
-			// user code begin {1}
-			// user code end
-		} catch (java.lang.Throwable ivjExc) {
-			// user code begin {2}
-			// user code end
-			handleException(ivjExc);
-		}
-	}
-	return ivjTextArea1;
-}
-/**
- * Called whenever the part throws an exception.
- * @param exception java.lang.Throwable
- */
-private void handleException(java.lang.Throwable exception) {
-
-	/* Uncomment the following lines to print uncaught exceptions to stdout */
-	// ProxyPlugin.getPlugin().getMsgLogger().write(Level.WARNING,"--------- UNCAUGHT EXCEPTION ---------");
-	// ProxyPlugin.getPlugin().getMsgLogger().write(Level.WARNING,exception);
-}
-/**
- * Initializes connections
- * @exception java.lang.Exception The exception description.
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void initConnections() throws java.lang.Exception {
-	// user code begin {1}
-	// user code end
-	this.addWindowListener(ivjEventHandler);
-	getButton1().addActionListener(ivjEventHandler);
-	getButton2().addActionListener(ivjEventHandler);
-}
-/**
- * Initialize the class.
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void initialize() {
-	try {
-		// user code begin {1}
-		// user code end
-		setName("MessageDialog"); //$NON-NLS-1$
-		setLayout(new java.awt.BorderLayout());
-		setSize(426, 240);
-		add(getContentsPane(), "Center"); //$NON-NLS-1$
-		initConnections();
-	} catch (java.lang.Throwable ivjExc) {
-		handleException(ivjExc);
-	}
-	// user code begin {2}
-	// user code end
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java
deleted file mode 100644
index 68ddb07ef..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java
+++ /dev/null
@@ -1,55 +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.proxy.remote;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ProxyRemoteMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.remote.messages";//$NON-NLS-1$
-
-	private ProxyRemoteMessages() {
-		// Do not instantiate
-	}
-
-	public static String NO_OUTPUT_FOLDER_EXC_;
-	public static String VM_COMMAND_LINE;
-	public static String VM_TERMINATED_INFO_;
-	public static String VM_TERMINATED_LINE1;
-	public static String VM_TERMINATED_LINE2;
-	public static String VM_TERMINATED_LINE3;
-	public static String REMOTE_VM_TRACE_INFO_;
-	public static String REMOTE_VM_LOCAL_TRACE_INFO_;
-	public static String Classcast_EXC_;
-	public static String Instantiate_EXC_;
-	public static String RemoteCmd_EXC_;
-	public static String ExceptionErrorMsg_EXC_;
-	public static String OK_7;
-	public static String Proxy_NoRunner_ERROR_;
-	public static String Proxy_Error_Title;
-	public static String Proxy_Terminated_too_soon_ERROR_;
-	public static String ProxyRemoteVMName;
-	public static String ProxyRemoteVMNameWithComment;
-	public static String ProxyRemoteNoLaunchKey;
-	public static String ProxyRemoteLaunchVM;
-	public static String CleanupJob_title;
-	public static String REMProxyFactoryRegistry_CallbackConnectionNotWorking_EXC_;
-	public static String REMProxyFactoryRegistry_ConnectionCreationFailed_INFO_;
-	public static String REMProxyFactoryRegistry_Job_TerminateProcess_Title;
-	public static String REMProxyFactoryRegistry_CouldNotCreateSocketConnectionToRemoteVM_EXC_;
-	public static String REMExpression_IOExceptionSeeLog_INFO_;
-	public static String REMExpression_CommandExceptionSeeLog_INFO_;
-	public static String LocalProxyLaunchDelegate_Monitor_PrintRemoteTrace_Text;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ProxyRemoteMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteUtil.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteUtil.java
deleted file mode 100644
index 73eed8a0e..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteUtil.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.core.runtime.IPath;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionController;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-
-
-public class ProxyRemoteUtil {
-
-	// Debug options
-	public static final String DEBUG_VM = "/remote/debug/debugvm", // Bring up debugger on remote vm's. //$NON-NLS-1$
-		IO_CONSOLE = "/remote/debug/ioconsole", // IO Through console (system in and out) for asking questions. //$NON-NLS-1$
-		DEBUG_VM_TRACEOUT = "/remote/debug/vmtraceout", // Trace the output from the remote vm's. //$NON-NLS-1$
-		NO_TIMEOUTS = "/remote/debug/notimeouts";	// No socket timeouts when talking to remote vm. Turn this on when doing callback testing. Not needed otherwise. //$NON-NLS-1$
-	
-	private static REMRegistryController pluginRegistryController;
-	
-	/**
-	 * Return the registry controller.
-	 */
-	public synchronized static REMRegistryController getRegistryController() {
-		return pluginRegistryController != null ? pluginRegistryController : (pluginRegistryController = new REMRegistryController());
-	}
-	
-	/**
-	 * Method to update any class paths with any
-	 * paths that need to be added to a VM. In this case, it is
-	 * the remotevm.jar and the remotecommon.jar that need to be added. The first jar contains
-	 * the code necessary to run the remote vm and listen for commands. The second jar contains
-	 * the common code that is required to be shared on both the IDE side and remote side. It
-	 * is the interface code so that they both talk the same language.
-	 * support.
-	 */
-	public static void updateClassPaths(IConfigurationContributionController controller) {
-		Bundle proxyBundle = ProxyPlugin.getPlugin().getBundle();
-		// Need to have our jars at the beginning. (Struts causes a problem because 
-		// they have a jar (commons-fileupload.jar) that if when searching for a class and
-		// this jar is reached, it causes the class loader to barf. Our jars used to be at
-		// the end, and so it found the fileupload jar first and no remote vm could be started
-		// because of this.
-		controller.contributeClasspath(proxyBundle, (IPath) null, IConfigurationContributionController.PREPEND_USER_CLASSPATH, false); //$NON-NLS-1$
-		controller.contributeClasspath(proxyBundle, "vm/remotevm.jar", IConfigurationContributionController.PREPEND_USER_CLASSPATH, false); //$NON-NLS-1$		
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanProxy.java
deleted file mode 100644
index 9ada5230b..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanProxy.java
+++ /dev/null
@@ -1,134 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-/**
- * An abstract base class of IREMBeanProxy that doesn't
- * have the bean type stored in it. The subclasses will
- * supply it. It does however have an ID because it does
- * exist over on the remote VM.
- */
-public abstract class REMAbstractBeanProxy implements IREMBeanProxy {
-	protected final REMProxyFactoryRegistry fFactory;
-	private Integer fID;
-	
-	/**
-	 * Set the bean we are proxying.  We are a proxy for a bean running on the remote VM. 
-	 */
-	protected REMAbstractBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID){
-		fFactory = aRegistry;
-		fID = anID;
-	}
-	
-	/**
-	 * equals: Equal if:
-	 *         1) This proxy == (identity) to the other object
-	 *         2) Else if other is an IBeanProxy and not a constant one, then if
-	 *            equals on the server.
-	 *         3) If this is a constant proxy and the other is too or is a constant
-	 *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
-	 */
-	public boolean equals(Object anObject) {
-		if (super.equals(anObject))
-			return true;	// Identity
-		if (anObject instanceof IBeanProxy && !(anObject instanceof IREMConstantBeanProxy) && fFactory.isValid() && ((IBeanProxy) anObject).getProxyFactoryRegistry() == fFactory)
-			try {
-				// The other is a bean proxy and is not a constant one, let the server do the check.
-				return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getObjectEquals().invoke(this, (IBeanProxy) anObject)).booleanValue();
-			} catch (ThrowableProxy e) {
-			}
-		return false;
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		return this == aBeanProxy;	// We can be assured in Remote Proxy that identity of proxy and identity of object are the same.
-	}
-		
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return fFactory;
-	}
-	
-	/**
-	 * Get ID. An internal method to be used only within the ProxyFactory family.
-	 */
-	public Integer getID() {
-		return fID;
-	}
-	
-	/**
-	 * isValid.
-	 */
-	public boolean isValid() {
-		return fID != null;
-	}
-	
-	/**
-	 * Proxy is about to be released, MUST mark it invalid.
-	 * This is required. Resources can also be cleaned up
-	 * if they are being held and need to be cleaned up.
-	 *
-	 * NOTE: This method will only be called when the proxy
-	 * is explicitly released. If it is simply garbage collected,
-	 * then this method will not be called. Simple garbage collection
-	 * means that no one is referencing this proxy. The proxy factory
-	 * will know what id this proxy was referencing and will release it
-	 * on the server at GC time.
-	 *
-	 * If there are resources
-	 * that absolutely must be released, then the finalize method
-	 * should be implemented to do the clean up. However, try not
-	 * to have this be the case. Finalize methods add overhead that is
-	 * usually better not to have. The better way is for any users
-	 * that get this kind of proxy object know to call release on
-	 * ProxyFactoryRegistry to release it before garbage collection.	 
-	 */
-	public void release() {
-		fID = null;
-	}
-			
-	/**
-	 * Return the toString of the actual bean on the remote side.
-	 */
-	public String toBeanString() {
-		IStringBeanProxy string = (IStringBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getObjectToString().invokeCatchThrowableExceptions(this);
-		return (string != null) ? string.stringValue() : null;
-	}
-	
-	/**
-	 * Render the bean proxy into the value field.
-	 */
-	public void renderBean(Commands.ValueObject value) {
-		value.setObjectID(isValid() ? getID().intValue() : Commands.VOID);	// No longer exists, so send over null.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java
deleted file mode 100644
index dd09366b9..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java
+++ /dev/null
@@ -1,703 +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.proxy.remote;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-
-/**
- * This implementation of IBeanTypeProxy is for where the Bean is on a different VM then the IDE
- * 
- * Creation date: (12/3/99 12:29:26 PM)
- * 
- * @author: Joe Winchester
- */
-public abstract class REMAbstractBeanTypeProxy implements IREMBeanTypeProxy {
-
-	private Integer fID;
-
-	protected final REMProxyFactoryRegistry fRegistry;
-
-	protected final String fClassname; // This is cached here so that we don't need to go over the line to get it.
-
-	private IBeanTypeProxy fSuperType; // This is cached so as not to have to go over the line for it.
-
-	/**
-	 * Create with a registry and a class. It is protected so that only subclasses and the factory with this REM package can call it.
-	 */
-	protected REMAbstractBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
-		fRegistry = aRegistry;
-		fID = anID;
-		fClassname = aClassname;
-		fSuperType = aSuperType;
-	}
-
-	/**
-	 * equals: Equal if: 1) This proxy == (identity) to the other object This is all that is needed for BeanTypes because we know these are classes,
-	 * there is only one per class, and Class equals is true only for identity.
-	 */
-	public boolean equals(Object anObject) {
-		return super.equals(anObject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		return this == aBeanProxy; // We can be assured in Remote Proxy that identity of proxy and identity of object are the same.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#getID()
-	 */
-	public Integer getID() {
-		return fID;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#isValid()
-	 */
-	public boolean isValid() {
-		return fID != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#release()
-	 */
-	public void release() {
-		// Clear the id and supertype (supertype is cleared so that
-		// it won't hold onto it and will let the supertype be GC'd
-		// if necessary.
-
-		fID = null;
-		fSuperType = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		// Turn class names into array of BeanTypes.
-		IBeanTypeProxy[] argTypes = null;
-		if (argumentClassNames != null) {
-			IStandardBeanTypeProxyFactory typeFactory = fRegistry.getBeanTypeProxyFactory();
-			argTypes = new IBeanTypeProxy[argumentClassNames.length];
-			for (int i = 0; i < argumentClassNames.length; i++) {
-				IBeanTypeProxy type = argTypes[i] = typeFactory.getBeanTypeProxy(argumentClassNames[i]);
-				if (type == null)
-					return null; // Couldn't find the type.
-			}
-		}
-
-		return getConstructorProxy(argTypes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassConstructor();
-
-		// Create the argument array
-		Object[] getParms = (argumentTypes != null) ? new Object[] { new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : // Get Ctor has
-																																   // only one parm,
-																																   // the array of
-																																   // parm types.
-				null;
-
-		try {
-			return (IConstructorProxy) getCtorMethod.invokeWithParms(this, getParms);
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IConstructorProxy[] getConstructors() {
-
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassConstructors();
-
-		try {
-			IArrayBeanProxy ctors = (IArrayBeanProxy) getCtorMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = ctors.getSnapshot();
-			IConstructorProxy[] ctorproxies = new IConstructorProxy[proxies.length];
-			System.arraycopy(proxies, 0, ctorproxies, 0, proxies.length);
-			return ctorproxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		// Turn class names into array of BeanTypes.
-		IBeanTypeProxy[] argTypes = null;
-		if (argumentClassNames != null) {
-			IStandardBeanTypeProxyFactory typeFactory = fRegistry.getBeanTypeProxyFactory();
-			argTypes = new IBeanTypeProxy[argumentClassNames.length];
-			for (int i = 0; i < argumentClassNames.length; i++) {
-				IBeanTypeProxy type = argTypes[i] = typeFactory.getBeanTypeProxy(argumentClassNames[i]);
-				if (type == null)
-					return null; // Couldn't find the type.
-			}
-		}
-
-		return getDeclaredConstructorProxy(argTypes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getDeclaredClassConstructor();
-
-		// Create the argument array
-		Object[] getParms = (argumentTypes != null) ? new Object[] { new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : // Get Ctor has
-																																   // only one parm,
-																																   // the array of
-																																   // parm types.
-				null;
-
-		try {
-			return (IConstructorProxy) getCtorMethod.invokeWithParms(this, getParms);
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IConstructorProxy[] getDeclaredConstructors() {
-
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getDeclaredClassConstructors();
-
-		try {
-			IArrayBeanProxy ctors = (IArrayBeanProxy) getCtorMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = ctors.getSnapshot();
-			IConstructorProxy[] ctorproxies = new IConstructorProxy[proxies.length];
-			System.arraycopy(proxies, 0, ctorproxies, 0, proxies.length);
-			return ctorproxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IFieldProxy[] getFields() {
-
-		IREMMethodProxy getFieldsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassGetFields();
-
-		try {
-			IArrayBeanProxy fields = (IArrayBeanProxy) getFieldsMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = fields.getSnapshot();
-			IFieldProxy[] fieldProxies = new IFieldProxy[proxies.length];
-			System.arraycopy(proxies, 0, fieldProxies, 0, proxies.length);
-			return fieldProxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IFieldProxy[] getDeclaredFields() {
-
-		IREMMethodProxy getDeclaredFieldsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassGetDeclaredFields();
-
-		try {
-			IArrayBeanProxy fields = (IArrayBeanProxy) getDeclaredFieldsMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = fields.getSnapshot();
-			IFieldProxy[] fieldProxies = new IFieldProxy[proxies.length];
-			System.arraycopy(proxies, 0, fieldProxies, 0, proxies.length);
-			return fieldProxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getDeclaredFieldProxy(java.lang.String)
-	 */
-	public IFieldProxy getDeclaredFieldProxy(String fieldName) {
-		return (IFieldProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassGetDeclaredField().invokeCatchThrowableExceptions(this,
-				fRegistry.getBeanProxyFactory().createBeanProxyWith(fieldName));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFieldProxy(java.lang.String)
-	 */
-	public IFieldProxy getFieldProxy(String fieldName) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getFieldProxy(this,fieldName);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
-	 */
-	public IProxyField getFieldProxy(IExpression expression, String fieldName) {
-		REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-		return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getFieldProxy(expression, this, fieldName);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IMethodProxy[] getMethods() {
-
-		IREMMethodProxy getMethodsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassMethods();
-
-		try {
-			IArrayBeanProxy methods = (IArrayBeanProxy) getMethodsMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = methods.getSnapshot();
-			IMethodProxy[] methodProxies = new IMethodProxy[proxies.length];
-			System.arraycopy(proxies, 0, methodProxies, 0, proxies.length);
-			return methodProxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IMethodProxy[] getDeclaredMethods() {
-
-		IREMMethodProxy getDeclaredMethodsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassDeclaredMethods();
-
-		try {
-			IArrayBeanProxy methods = (IArrayBeanProxy) getDeclaredMethodsMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = methods.getSnapshot();
-			IMethodProxy[] methodProxies = new IMethodProxy[proxies.length];
-			System.arraycopy(proxies, 0, methodProxies, 0, proxies.length);
-			return methodProxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String)
-	 */
-	public IMethodProxy getMethodProxy(String methodName) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,(String[])null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String[])
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,argumentClassNames);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes) {
-		REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-		return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
-		REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-		return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
-	}
-
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName) {
-		return getMethodProxy(expression, methodName, (IProxyBeanType[]) null);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String)
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String argumentQualifiedTypeName) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,new String[] {argumentQualifiedTypeName});
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,argumentTypes);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
-
-		// Turn class names into array of BeanTypes.
-		IBeanTypeProxy[] argTypes = null;
-		if (argumentClassNames != null) {
-			IStandardBeanTypeProxyFactory typeFactory = fRegistry.getBeanTypeProxyFactory();
-			argTypes = new IBeanTypeProxy[argumentClassNames.length];
-			for (int i = 0; i < argumentClassNames.length; i++) {
-				IBeanTypeProxy type = argTypes[i] = typeFactory.getBeanTypeProxy(argumentClassNames[i]);
-				if (type == null)
-					return null; // Couldn't find the type.
-			}
-		}
-
-		return getDeclaredMethodProxy(methodName, argTypes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		IREMMethodProxy getDeclaredMethodMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassDeclaredMethod();
-		IBeanProxy nameProxy = fRegistry.getBeanProxyFactory().createBeanProxyWith(methodName);
-		// Create the argument array
-		Object[] getParms = (argumentTypes != null) ? new Object[] { nameProxy, new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : new Object[] {nameProxy, null};
-
-		try {
-			return (IMethodProxy) getDeclaredMethodMethod.invokeWithParms(this, getParms);
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String)
-	 */
-	public IInvokable getInvokable(String methodName) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getInvokable(this,methodName,(String[])null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String[])
-	 */
-	public IInvokable getInvokable(String methodName, String[] argumentClassNames) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getInvokable(this,methodName,argumentClassNames);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String)
-	 */
-	public IInvokable getInvokable(String methodName, String argumentQualifiedTypeName) {
-		return getInvokable(methodName, new String[] { argumentQualifiedTypeName});
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IInvokable getInvokable(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getInvokable(this,methodName,argumentTypes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getNullConstructorProxy()
-	 */
-	public IConstructorProxy getNullConstructorProxy() {
-		return getConstructorProxy((IBeanTypeProxy[]) null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getProxyFactoryRegistry()
-	 */
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return fRegistry;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getSuperBeanTypeProxy()
-	 */
-	public IBeanTypeProxy getSuperBeanTypeProxy() {
-		return fSuperType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getTypeName()
-	 */
-	public String getTypeName() {
-		return fClassname;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isArray()
-	 */
-	public boolean isArray() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isInterface()
-	 */
-	public boolean isInterface() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isPrimitive()
-	 */
-	public boolean isPrimitive() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isKindOf(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy)
-	 */
-	public boolean isKindOf(IBeanTypeProxy aBeanProxyType) {
-		return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassIsAssignableFrom().invokeCatchThrowableExceptions(
-				aBeanProxyType, this)).booleanValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance(java.lang.String)
-	 */
-	public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-		try {
-			return ((REMStandardBeanProxyFactory) fRegistry.getBeanProxyFactory()).createBeanProxy(this, initializationString);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return super.toString() + "(" + getTypeName() + ")"; //$NON-NLS-2$//$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getTypeProxy()
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).classClass;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#toBeanString()
-	 */
-	public String toBeanString() {
-		return getTypeName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance()
-	 */
-	public IBeanProxy newInstance() throws ThrowableProxy {
-		return ((REMStandardBeanProxyFactory) fRegistry.getBeanProxyFactory()).createBeanProxy(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#renderBean(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void renderBean(Commands.ValueObject value) {
-		value.setObjectID(getID().intValue());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFormalTypeName()
-	 */
-	public String getFormalTypeName() {
-		return getTypeName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInitializationError()
-	 */
-	public String getInitializationError() {
-		return null; // By default none have an initialization error. There is a special instance for init errors.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) throws NoSuchMethodException, AmbiguousMethodException, IllegalAccessException {
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		IREMMethodProxy findCompatibleMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getFindCompatibleConstructorMethod();
-
-		// Create the argument array
-		Object[] getParms = (argumentTypes != null) ? new Object[] { this, new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : new Object[] {this, null};
-
-		try {
-			return (IConstructorProxy) findCompatibleMethod.invokeWithParms(this, getParms);
-		} catch (ThrowableProxy e) {
-			try {
-				if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.NoSuchMethodException"))) //$NON-NLS-1$
-					throw new NoSuchMethodException(e.getProxyLocalizedMessage());
-				else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.common.AmbiguousMethodException"))) //$NON-NLS-1$
-					throw new AmbiguousMethodException(e.getProxyLocalizedMessage());
-				else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.IllegalAccessException"))) //$NON-NLS-1$
-					throw new IllegalAccessException(e.getProxyLocalizedMessage());
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				return null;
-			} finally {
-				fRegistry.releaseProxy(e);
-			}
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) throws NoSuchMethodException, AmbiguousMethodException {
-
-		IREMMethodProxy findCompatibleMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getFindCompatibleMethodMethod();
-		IBeanProxy methodNameProxy = fRegistry.getBeanProxyFactory().createBeanProxyWith(methodName);
-
-		// Create the argument array
-		Object[] getParms = (argumentTypes != null) ? new Object[] { this, methodNameProxy, new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : new Object[] {this, methodNameProxy, null};
-
-		try {
-			return (IMethodProxy) findCompatibleMethod.invokeWithParms(this, getParms);
-		} catch (ThrowableProxy e) {
-			try {
-				if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.NoSuchMethodException"))) //$NON-NLS-1$
-					throw new NoSuchMethodException(e.getProxyLocalizedMessage());
-				else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.common.AmbiguousMethodException"))) //$NON-NLS-1$
-					throw new AmbiguousMethodException(e.getProxyLocalizedMessage());
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				return null;
-			} finally {
-				fRegistry.releaseProxy(e);
-			}
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractNumberBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractNumberBeanTypeProxy.java
deleted file mode 100644
index 73a318b69..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractNumberBeanTypeProxy.java
+++ /dev/null
@@ -1,72 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Abstract class for any of the number bean type subclasses.
- * NOTE: This does not represent the beantype Number. It is a
- * class that provides functions for Number subclass beantypes.
- * The Number beantype itself is simply a REMBeanTypeProxy since
- * Number is abstract and has no necessary extra function.
- * Creation date: (08/31/00 11:49:12 AM)
- * @author: Administrator
- */
-public abstract class REMAbstractNumberBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-
-protected REMAbstractNumberBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
-	super(aRegistry, anID, aClassname, aSuperType);
-}
-/**
- * Helper to create a bean proxy
- * protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-protected abstract INumberBeanProxy createNumberBeanProxy(Number aNumber);
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For all of the Number types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the Number types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Each beantype will return a default value (usually a value of 0).
- */
-public abstract IBeanProxy newInstance() throws ThrowableProxy;
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAccessibleObjectProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAccessibleObjectProxy.java
deleted file mode 100644
index 8c2eb0047..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAccessibleObjectProxy.java
+++ /dev/null
@@ -1,53 +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.proxy.remote;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy;
-import org.eclipse.jem.internal.proxy.core.ThrowableProxy;
- 
-/**
- * AccessibleObject Proxy.
- * 
- * @since 1.0.0
- */
-public class REMAccessibleObjectProxy extends REMAbstractBeanProxy implements IAccessibleObjectProxy {
-
-	protected REMAccessibleObjectProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
-		super(aRegistry, anID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy#isAccessible()
-	 */
-	public boolean isAccessible() throws ThrowableProxy {
-		return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getAccessibleIsAccessible().invoke(this)).booleanValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy#setAccessible(boolean)
-	 */
-	public void setAccessible(boolean flag) throws ThrowableProxy {
-		REMStandardBeanProxyConstants.getConstants(fFactory).getAccessibleSetAccessible().invoke(this, fFactory.getBeanProxyFactory().createBeanProxyWith(flag));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getTypeProxy()
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).accessibleType;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAnAbstractBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAnAbstractBeanTypeProxy.java
deleted file mode 100644
index ce7fae116..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAnAbstractBeanTypeProxy.java
+++ /dev/null
@@ -1,75 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * This is a proxy for an abstract bean type. I.e. you can't create a new instance of it.
- * It can be used as a general abstract type. It will pass newBeanTypeForClass unto
- * the main super type passed in.
- */
- 
-public class REMAnAbstractBeanTypeProxy extends REMAbstractBeanTypeProxy {
-
-	protected IREMSpecialBeanTypeProxy fMainSuperType;	// The type that this was created from so that
-							// any non-abstract subclasses can create the correct
-							// type of beantype proxy.
-					
-	public REMAnAbstractBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType, IREMSpecialBeanTypeProxy aType) {
-		super(aRegistry, anID, aClassname, aSuperType);
-		fMainSuperType = aType;
-	}
-	
-	/**
-	 * Create a new bean proxy with the specified id.
-	 *
-	 * For all of the abstract types, this is an invalid operation. 
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID) {
-		throw new UnsupportedOperationException();
-	}	
-	
-	/**
-	 * Note: Since new instances of abstract classes can never be done,
-	 * this function is not supported.
-	 */
-	public IBeanProxy newInstance() { 
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		return fMainSuperType.newBeanTypeForClass(anID, aClassname, anAbstract, this);
-	}
-	
-	/**
-	 * release - BeanType is about to be released.
-	 * Clear the fMainSupertype (supertype is cleared so that
-	 * it won't hold onto it and will let the supertype be GC'd
-	 * if necessary.
-	 */
-	public void release() {
-		fMainSuperType = null;
-		super.release();
-	}					
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanProxy.java
deleted file mode 100644
index 2041d8a16..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanProxy.java
+++ /dev/null
@@ -1,268 +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.proxy.remote;
-/*
-
-
- */
-
-import java.lang.reflect.Array;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.CommandErrorException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * IDE VM version of the Array proxy
- */
-
-public final class REMArrayBeanProxy extends REMBeanProxy implements IArrayBeanProxy {
-	private int fLength = -1;
-	
-	REMArrayBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType) {
-		super(aRegistry, anID, aType);
-	}
-
-	public boolean equals(Object anObject) {
-		if (!(anObject instanceof IArrayBeanProxy))
-			return false;
-		if (sameAs((IBeanProxy) anObject))
-			return true;	// Identity
-		if (((IBeanProxy) anObject).getProxyFactoryRegistry() == fFactory)
-			try {
-				// The other is an array also, let the server do the check. We will use Arrays.equals.
-				return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperEquals().invoke(null, new IBeanProxy[] {this, (IBeanProxy) anObject})).booleanValue();
-			} catch (ThrowableProxy e) {
-				ProxyPlugin.getPlugin().getLogger().log(e, Level.INFO);
-			}
-		return false;
-	}	
-	
-	/**
-	 * Get the object at the specified index.
-	 */
-	public IBeanProxy get(int index) throws ThrowableProxy {
-		// Format of getter parms is: (Object (array), int (index)).
-		Object[] parms = new Object[] {this, new Integer(index)};
-		// If the component type is primitive, we need to use the correct getter so that a valid value is returned,
-		// if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
-		IBeanTypeProxy compType = ((IArrayBeanTypeProxy) getTypeProxy()).getComponentType();
-		if (!compType.isPrimitive()) {
-			// Use standard getter.
-			return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGet()).invokeWithParms(null, parms);
-		} else {
-			// Use the correct primitive getter.
-			int id = ((IREMBeanProxy) compType).getID().intValue();
-			switch (id) {
-				case Commands.BYTE_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetByte()).invokeWithParms(null, parms);
-				case Commands.BOOLEAN_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetBoolean()).invokeWithParms(null, parms);
-				case Commands.CHARACTER_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetChar()).invokeWithParms(null, parms);
-				case Commands.DOUBLE_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetDouble()).invokeWithParms(null, parms);
-				case Commands.FLOAT_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetFloat()).invokeWithParms(null, parms);
-				case Commands.INTEGER_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetInt()).invokeWithParms(null, parms);
-				case Commands.LONG_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetLong()).invokeWithParms(null, parms);
-				case Commands.SHORT_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetShort()).invokeWithParms(null, parms);
-			}
-		}
-		
-		return null;
-	}
-
-	/**
-	 * Get the object at the specified multi-dimensional index.
-	 * The array must be at least the number of dimensions specified,
-	 * and each index along the way must exist.
-	 * The number of dimensions can't be greater than the number
-	 * of dimensions of the real object.
-	 */
-	public IBeanProxy get(int [] indexes) throws ThrowableProxy {
-		// Format of getter parms is: (Object (array), int[] (indexes)).
-		Object[] parms = new Object[] {this, indexes};
-		// If the component type at the specified dimension is primitive, we need to use the correct getter so that a valid value is returned,
-		// if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
-		int dims = ((IArrayBeanTypeProxy) getTypeProxy()).getDimensions();
-		if (dims < indexes.length)
-			throw new IllegalArgumentException();	// Too many dimensions
-		IBeanTypeProxy finalCompType = ((IArrayBeanTypeProxy) getTypeProxy()).getFinalComponentType();			
-		if (dims == indexes.length && finalCompType.isPrimitive()) {
-			// Use the correct primitive getter because we are accessing the final component and it is primitive.
-			int id = ((IREMBeanProxy) finalCompType).getID().intValue();
-			switch (id) {
-				case Commands.BYTE_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetByte()).invokeWithParms(null, parms);
-				case Commands.BOOLEAN_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetBoolean()).invokeWithParms(null, parms);
-				case Commands.CHARACTER_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetChar()).invokeWithParms(null, parms);
-				case Commands.DOUBLE_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetDouble()).invokeWithParms(null, parms);
-				case Commands.FLOAT_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetFloat()).invokeWithParms(null, parms);
-				case Commands.INTEGER_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetInt()).invokeWithParms(null, parms);
-				case Commands.LONG_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetLong()).invokeWithParms(null, parms);
-				case Commands.SHORT_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetShort()).invokeWithParms(null, parms);
-			}
-		} else {
-			// It is not the final component, or it is not primitive, use the standard accessor.
-			return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGet()).invokeWithParms(null, parms);
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * Set the object at the specified index.
-	 */
-	public void set(IBeanProxy value, int index) throws ThrowableProxy {
-		// Format of setter parms is: (Object (array), int (index), Object (value)).
-		Object[] parms = new Object[] {this, new Integer(index), value};
-		((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArraySet()).invokeWithParms(null, parms);
-	}
-		
-	/**
-	 * Set the object at the specified multi-dimensional index.
-	 * The array must be at least the number of dimensions specified,
-	 * and each index along the way must exist.
-	 * The number of dimensions can't be greater than the number
-	 * of dimensions of the real object.
-	 */
-	public void set(IBeanProxy value, int [] indexes) throws ThrowableProxy {
-		// Format of setter parms is: (Object (array), int[] (indexes), Object (value)).
-		Object[] parms = new Object[] {this, indexes, value};
-		((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperSet()).invokeWithParms(null, parms);
-	}
-	
-	/**
-	 * Get the length of the first dimension of this array.
-	 * If there are multi-dimensions, you must get the appropriate
-	 * dimension from the get method to see the size of that dimension.
-	 *
-	 * e.g.
-	 *    int [3] returns 3
-	 *    int [3][2] returns 3
-	 *
-	 *    ((IArrayBeanProxy) get(1)).getLength() returns 2
-	 *    Since arrays do not have to be homogenous, there could
-	 *    be a different length array for each of the arrays 
-	 *    returned from the first dimension, the returned length
-	 *    from get(2) and get(3) could result in a different value
-	 *    from get(1).
-	 */
-	public int getLength() {
-		if (fLength == -1) {
-			// It hasn't yet been quiered.
-			fLength = ((IIntegerBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetLength().invokeCatchThrowableExceptions(null, this)).intValue();
-		}
-		return fLength;
-	}	
-	
-	public IBeanProxy getCatchThrowableException(int index){
-		try {
-			return get(index);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));		 //$NON-NLS-1$
-			fFactory.releaseProxy(e);	// Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}		
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IArrayBeanProxy#getSnapshot()
-	 */
-	public IBeanProxy[] getSnapshot() throws ThrowableProxy {
-		IREMConnection connect = fFactory.getFreeConnection();
-		REMStandardBeanProxyFactory proxyFactory = (REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory();
-		proxyFactory.startTransaction(); // This is definately a transaction, so start it.
-		try {
-			Commands.ValueObject returnValue = new Commands.ValueObject();
-			try {
-				try {
-					connect.getArrayContents(getID().intValue(), returnValue);
-					return processReturnValue(connect, returnValue);
-				} catch (CommandErrorException e) {
-					proxyFactory.processErrorReturn(e);
-				}
-			} catch (CommandException e) {
-				if (!e.isRecoverable()) {
-					// Close the connection and try again.
-					fFactory.closeConnection(connect);
-					connect = null;
-					connect = fFactory.getFreeConnection();
-					try {
-						connect.getArrayContents(getID().intValue(), returnValue);
-						return processReturnValue(connect, returnValue);
-					} catch (CommandException eAgain) {
-						// Failed again. Just close and print trace.
-						fFactory.closeConnection(connect);
-						connect = null;
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
-						return null;
-					}
-				} else {
-					// A recoverable error, print trace and return
-					ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-					return null;
-				}
-			}
-		} finally {
-			proxyFactory.stopTransaction();
-			if (connect != null)
-				fFactory.returnConnection(connect);
-		}
-		return null;
-	}
-
-
-	/*
-	 * @param returnValue
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	private IBeanProxy[] processReturnValue(IREMConnection connection, ValueObject returnValue) throws CommandException, ThrowableProxy {
-		// It is an array containing IDs, as it normally would be.
-		// However it will become IBeanProxy[]. That is because if ID's
-		// they must be proxies over here.
-		BeanProxyValueSender valueSender = new BeanProxyValueSender((REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory(), returnValue);
-		connection.readProxyArrayValues(returnValue, valueSender, false);
-		Exception e = valueSender.getException();
-		if (e != null) {
-			if (e instanceof ThrowableProxy)
-				throw (ThrowableProxy) e;
-			else
-				throw (CommandException) e;
-		}
-		Object vals = valueSender.getArray();
-		IBeanProxy[] proxyArray = new IBeanProxy[Array.getLength(vals)];
-		System.arraycopy(vals, 0, proxyArray, 0, proxyArray.length);
-		return proxyArray;
-	}
-	
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanTypeProxy.java
deleted file mode 100644
index ca4f3a95a..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanTypeProxy.java
+++ /dev/null
@@ -1,340 +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.proxy.remote;
-/*
-
-
- */
-
-
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Array Type Proxy for the IDE VM.
- *
- * The class is final because array's are special and shouldn't have
- * any subclasses since the factory would never call it.
- */
-
-public final class REMArrayBeanTypeProxy extends REMAbstractBeanTypeProxy implements IArrayBeanTypeProxy {
-	
-	/**
-	 * Create with a registry and a class. It is package so that only 
-	 * the factory with this IDE package can call it.
-	 */
-	protected REMArrayBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy objectType) {
-		super(aRegistry, anID, aClassname, objectType);
-	}
-	/**
-	 * This is an array type!
-	 */
-	public boolean isArray() {
-		return true;
-	}
-	/**
-	 * Return the final component type.
-	 */
-	public IBeanTypeProxy getFinalComponentType() {
-		// Component type is strip off all '[' and return class name (if we ever add classLoader support, this won't work).
-		// However, if the type is a primitive we need to go through the change table).
-		int typeStart = getTypeName().lastIndexOf('[')+1;
-		if (getTypeName().charAt(typeStart) == 'L') {
-			// It is a class.
-			// Strip off up to the 'L', and the trailing ';'. That is the class name.
-			return fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(getTypeName().substring(typeStart+1, getTypeName().length()-1));
-		} else {
-			// It is a type. Need to map it.
-			Class aType = (Class) MapTypes.MAP_SHORTSIG_TO_TYPE.get(getTypeName().substring(typeStart, typeStart+1));
-			return aType != null ? fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(aType.getName()) : null;
-		}
-	}
-	
-	/**
-	 * Return the component type.
-	 */
-	public IBeanTypeProxy getComponentType() {
-		// Component type is strip off first '[' and return class name (if we ever add classLoader support, this won't work).
-		// However, if the type is a primitive we need to go through the change table).
-		if (getTypeName().charAt(1) != '[') {
-			// It is a one dimensional array, just send to getFinalComponentType to figure out the type.
-			return getFinalComponentType();
-		} else {
-			// It is a multi-dimensional array. Just strip off one '[' and send that to the bean type factory.
-			return fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(getTypeName().substring(1));
-		}
-	}
-	/**
-	 * Return the number of dimensions.
-	 */
-	public int getDimensions() {
-		return getTypeName().lastIndexOf('[')+1;
-	}
-	
-	/**
-	 * Create a new bean proxy with the specified object
-	 * Use the constructor that allows the type proxy to be set as well as the bean
-	 * because we are the type and by setting it now we might avoid it being lookup for in the
-	 * factory the first time it is asked for.
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID) {
-		return new REMArrayBeanProxy(fRegistry, anID, this);
-	}
-	
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * Arrays can't be subclassed.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the null ctor proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */		
-	public IConstructorProxy getNullConstructorProxy() {	
-		throw new UnsupportedOperationException();
-	}
-		
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IConstructorProxy[] getConstructors() {
-		throw new UnsupportedOperationException();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IConstructorProxy[] getDeclaredConstructors() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {	
-		throw new UnsupportedOperationException();
-	}	
-	
-	/**
-	 * Return a proxy to the field for the target VM being the same as the REM
-	 * For all of the array types, this is an invalid operation.	 
-	 */	
-	public IFieldProxy getFieldProxy(String fieldName) {	
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IFieldProxy[] getFields() {
-		throw new UnsupportedOperationException();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IFieldProxy[] getDeclaredFields() {
-		throw new UnsupportedOperationException();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy[] getMethods() {
-		throw new UnsupportedOperationException();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy[] getDeclaredMethods() {
-		throw new UnsupportedOperationException();
-	}
-
-	
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-		
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-		
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
-		throw new UnsupportedOperationException();
-	}	
-	
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */	
-	public IMethodProxy getMethodProxy(String methodName, String argumentQualifiedTypeName) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */		
-	public IMethodProxy getMethodProxy(String methodName) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Create an array bean proxy.
-	 *
-	 *   - (int, new int[2] {3, 4}) will create:
-	 *      int [3] [4]
-	 *
-	 *   - (int[], new int[1] {1})
-	 *      int [1]
-	 *
-	 *   - (int[], new int[2] {2,3})
-	 *      int [2] [3]
-	 * 
-	 *
-	 *   - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0])
-	 *      int [0]
-	 *     (int[][], null) or (int[][], new int[0])
-	 *      int[0][]
-	 *     This is because an array instance with no dimensions specified is not valid. 
-	 *
-	 *   - (int[][], new int[1] {3})
-	 *      int[3][]
-	 *
-	 * It is package protected so that only the REM Factory can call it.
-	 */
-	REMArrayBeanProxy  createBeanProxyWith(int[] dimensions) throws ThrowableProxy {
-		// If the dimensions is null or zero length, then create the
-		// array as a 0 sized array one dimensional array.
-		if (dimensions == null || dimensions.length == 0)
-			return createBeanProxyWith(new int[] {0});
-			
-		// Remove from this type the number of dimensions specified
-		// coming in, up to but no further than the final component.
-		// From here we can then use the appropriate java.lang.reflect.Array
-		// method to create the array.
-		IBeanTypeProxy compType = null;	// The type of array to create (it may be different number of dimensions).
-		int numDims = getDimensions();
-		if (numDims <= dimensions.length)
-			compType = getFinalComponentType();	// There are the same or more requested dimensions, so use final component type
-		else {
-			// There are fewer requested dimensions, so strip off that many
-			String compClass = getTypeName().substring(dimensions.length);
-			compType = fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(compClass);
-		}
-		
-		if (dimensions.length == 1) {
-			// Use the one dimension call
-			Object[] parms = new Object[] {compType, new Integer(dimensions[0])};
-			return (REMArrayBeanProxy) ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getArrayNewInstanceOneDimension()).invokeWithParms(null, parms);
-		} else {
-			// Use the multi dimension call
-			Object[] parms = new Object[] {compType, dimensions};
-			return (REMArrayBeanProxy) ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getArrayNewInstanceMultiDimension()).invokeWithParms(null, parms);
-		}
-	}
-		
-	/**
-	 * @see IBeanTypeProxy#getFormalTypeName()
-	 */
-	public String getFormalTypeName() {
-		String name = getTypeName();
-		int dims = name.lastIndexOf('[') + 1;
-		String type = getFinalComponentType().getTypeName();
-		StringBuffer formalType = new StringBuffer(type.length()+("[]".length()*dims)); //$NON-NLS-1$
-		formalType.append(type);
-		for (int i=0; i<dims; i++)
-			formalType.append("[]"); //$NON-NLS-1$
-		return formalType.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanProxy.java
deleted file mode 100644
index 86e05000e..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanProxy.java
+++ /dev/null
@@ -1,39 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Standard implementation of IREMBeanProxy
- */
-
-public class REMBeanProxy extends REMAbstractBeanProxy {
-	private IBeanTypeProxy fType;
-
-	protected REMBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType){
-		super(aRegistry, anID);
-		fType = aType;
-	}
-	
-	public IBeanTypeProxy getTypeProxy() {
-		return fType;
-	}
-	
-	public void release() {
-		fType = null;
-		super.release();
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanTypeProxy.java
deleted file mode 100644
index bda0aeff7..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanTypeProxy.java
+++ /dev/null
@@ -1,66 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * Default implementation for a BeanTypeProxy. This is what is used
- * for regular default beans and beantypes when no special beans or bean types are needed.
- */
-public class REMBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMSpecialBeanTypeProxy {
-
-	/**
-	 * Create with a registry and a class. It is protected so that only subclasses
-	 * and the factory with this REM package can call it.
-	 */
-	public REMBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
-		super(aRegistry, anID, aClassname, aSuperType);
-	}
-
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * NOTE: All subclasses must override this to return the correct type of BeanTypeProxy.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		return newBeanTypeForClass(anID, aClassname, anAbstract, this);
-	}
-
-	/**
-	 * The special method to handle subclassing from an abstract).
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType) {
-		if (!anAbstract) 
-			return new REMBeanTypeProxy(fRegistry, anID, aClassname, superType);
-		else
-			return new REMAnAbstractBeanTypeProxy(fRegistry, anID, aClassname, superType, this);
-	}
-	
-	/**
-	 * Create a new bean proxy with the specified id.
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID){
-	
-		return new REMBeanProxy(fRegistry, anID, this);
-	
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanProxy.java
deleted file mode 100644
index de0427251..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanProxy.java
+++ /dev/null
@@ -1,45 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import java.math.BigDecimal;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for BigDecimals.
- */
-class REMBigDecimalBeanProxy extends REMNumberBeanProxy {
-
-REMBigDecimalBeanProxy(REMProxyFactoryRegistry aRegistry, BigDecimal aBigDecimal) {
-	super(aRegistry, aBigDecimal);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).bigDecimalClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(numberValue(), ((IREMBeanTypeProxy) getTypeProxy()).getID().intValue());
-}	
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanTypeProxy.java
deleted file mode 100644
index 8d0fce770..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanTypeProxy.java
+++ /dev/null
@@ -1,73 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import java.math.BigDecimal;
-/**
- * Remote Implementation of IBeanTypeProxy for BigDecimal.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMBigDecimalBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final static BigDecimal zeroValue = new BigDecimal(0D);
-
-REMBigDecimalBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.BIG_DECIMAL_CLASS), BigDecimal.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMBigDecimalBeanProxy(aRegistry, zeroValue);	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createBigDecimalBeanProxy(BigDecimal aBigDecimal) {
-	return (!zeroValue.equals(aBigDecimal)) ?
-		new REMBigDecimalBeanProxy(fRegistry, aBigDecimal) : zeroProxy;
-}
-
-/**
- * Generic way to create an BigDecimal proxy, however, the Number must be a BigDecimal.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createBigDecimalBeanProxy((BigDecimal) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createBigDecimalBeanProxy((BigDecimal) value.anObject);
-}	
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanProxy.java
deleted file mode 100644
index cfd4dbf79..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanProxy.java
+++ /dev/null
@@ -1,45 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import java.math.BigInteger;
-/**
- * Remote Proxy for BigIntegers.
- */
-class REMBigIntegerBeanProxy extends REMNumberBeanProxy {
-
-REMBigIntegerBeanProxy(REMProxyFactoryRegistry aRegistry, BigInteger aBigInteger) {
-	super(aRegistry, aBigInteger);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).bigIntegerClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(numberValue(), ((IREMBeanTypeProxy) getTypeProxy()).getID().intValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanTypeProxy.java
deleted file mode 100644
index 8661f332f..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanTypeProxy.java
+++ /dev/null
@@ -1,75 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import java.math.BigInteger;
-/**
- * Remote Implementation of IBeanTypeProxy for BigInteger.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMBigIntegerBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final static BigInteger zeroValue = new BigInteger("0"); //$NON-NLS-1$
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMBigIntegerBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.BIG_INTEGER_CLASS), BigInteger.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMBigIntegerBeanProxy(aRegistry, zeroValue);	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createBigIntegerBeanProxy(BigInteger aBigInteger) {
-	return (!zeroValue.equals(aBigInteger)) ?
-		new REMBigIntegerBeanProxy(fRegistry, aBigInteger) : zeroProxy;
-}
-
-/**
- * Generic way to create an BigInteger proxy, however, the Number must be a BigInteger.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createBigIntegerBeanProxy((BigInteger) aNumber);
-}	
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createBigIntegerBeanProxy((BigInteger) value.anObject);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanProxy.java
deleted file mode 100644
index 77ec3c4dc..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanProxy.java
+++ /dev/null
@@ -1,96 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBooleanBeanProxy for Boolean.class.
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-final class REMBooleanClassBeanProxy extends REMConstantBeanProxy implements IBooleanBeanProxy {
-	private final Boolean fBooleanValue;
-
-/**
- * Store the boolean value so that we can return the booleanValue faster
- * without the need for going across the line. It is package protected because it is created in
- * special way, so no one else should create these.
- * @param aBean java.lang.Object
- */
-REMBooleanClassBeanProxy(REMProxyFactoryRegistry aRegistry, Boolean value) {
-	super(aRegistry);
-	fBooleanValue = value;
-}
-
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMBooleanClassBeanProxy)
-		return fBooleanValue.booleanValue() == ((REMBooleanClassBeanProxy) anObject).booleanValue();
-	if (anObject instanceof Boolean)
-		return fBooleanValue.booleanValue() == ((Boolean) anObject).booleanValue();
-	return false;
-}
-
-/**
- * Return the boolean value
- */
-public boolean booleanValue() {
-	return fBooleanValue.booleanValue();
-}
-/**
- * Return the java.lang.Boolean value
- */
-public Boolean getBooleanValue() {
-	return fBooleanValue;
-}
-
-/**
- * Return the toString of the bean itself.
- */
-public String toBeanString() {
-	return fBooleanValue.toString();
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).booleanClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fBooleanValue);
-}
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanTypeProxy.java
deleted file mode 100644
index b5960a334..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanTypeProxy.java
+++ /dev/null
@@ -1,93 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Boolean BeanType Proxy for Boolean.class. 
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMBooleanClassBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-
-	// Cache these instances. Since the BeanType proxies are cached also, only one instance
-	// of true/false will be in system.
-	protected final IBooleanBeanProxy trueProxy;
-	protected final IBooleanBeanProxy falseProxy;
-/**
- * REMBooleanBeanTypeProxy constructor comment.
- */
-protected REMBooleanClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy objectType) {
-	super(aRegistry, new Integer(Commands.BOOLEAN_CLASS), Boolean.class.getName(), objectType);
-	
-	trueProxy = new REMBooleanClassBeanProxy( fRegistry, Boolean.TRUE);
-	falseProxy = new REMBooleanClassBeanProxy( fRegistry, Boolean.FALSE);	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache.
- */
-IBooleanBeanProxy createBooleanBeanProxy(Boolean aBoolean) {
-	return aBoolean.booleanValue() ? trueProxy : falseProxy;
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For all of the primitive wrapper types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the primitive wrapper types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. Boolean doesn't have a default ctor, so the standard way won't work.
- * Return the falseProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return falseProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createBooleanBeanProxy(value.aBool ? Boolean.TRUE : Boolean.FALSE);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanProxy.java
deleted file mode 100644
index 2dd4c0907..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanProxy.java
+++ /dev/null
@@ -1,104 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of IBooleanBeanProxy for Boolean.TYPE.
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-final class REMBooleanTypeBeanProxy extends REMConstantBeanProxy implements IBooleanBeanProxy {
-	private final boolean fBoolean;
-
-/**
- * Store the boolean value so that we can return the booleanValue faster
- * without the need for going across the line. It is package protected because it is created in
- * special way, so no one else should create these.
- * @param aBean java.lang.Object
- */
-REMBooleanTypeBeanProxy(REMProxyFactoryRegistry aRegistry, boolean value) {
-	super(aRegistry);
-	fBoolean = value;
-}
-
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMBooleanTypeBeanProxy)
-		return fBoolean == ((REMBooleanTypeBeanProxy) anObject).booleanValue();
-	if (anObject instanceof Boolean)
-		return fBoolean == ((Boolean) anObject).booleanValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMBooleanTypeBeanProxy)
-		return fBoolean == ((REMBooleanTypeBeanProxy) aBeanProxy).booleanValue();
-	return false;
-}
-
-/**
- * Return the boolean value
- */
-public boolean booleanValue() {
-	return fBoolean;
-}
-/**
- * Return the java.lang.Boolean value
- */
-public Boolean getBooleanValue() {
-	return fBoolean ? Boolean.TRUE : Boolean.FALSE;
-}
-
-/**
- * Return the toString of the bean itself.
- */
-public String toBeanString() {
-	return fBoolean ? Boolean.TRUE.toString() : Boolean.FALSE.toString();
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).booleanType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fBoolean);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanTypeProxy.java
deleted file mode 100644
index 58aab1068..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,69 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Boolean BeanType Proxy for Boolean.TYPE
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMBooleanTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-
-	// Cache these instances. Since the BeanType proxies are cached also, only one instance
-	// of true/false will be in system.
-	protected final IBooleanBeanProxy trueProxy;
-	protected final IBooleanBeanProxy falseProxy;
-/**
- * REMBooleanBeanTypeProxy constructor comment.
- */
-protected REMBooleanTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.BOOLEAN_TYPE), Boolean.TYPE.getName());
-	
-	trueProxy = new REMBooleanTypeBeanProxy( fRegistry, true);
-	falseProxy = new REMBooleanTypeBeanProxy( fRegistry, false);	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache.
- */
-IBooleanBeanProxy createBooleanBeanProxy(boolean aBoolean) {
-	return aBoolean ? trueProxy : falseProxy;
-}
-
-
-/**
- * newInstance method. boolean is a primitive, so the standard way won't work.
- * Return the falseProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return falseProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createBooleanBeanProxy(value.aBool);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanProxy.java
deleted file mode 100644
index e8a44552d..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanProxy.java
+++ /dev/null
@@ -1,45 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Remote Proxy for Byte.class.
- */
-class REMByteClassBeanProxy extends REMNumberBeanProxy {
-
-REMByteClassBeanProxy(REMProxyFactoryRegistry aRegistry, Byte aByte) {
-	super(aRegistry, aByte);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).byteClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Byte) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanTypeProxy.java
deleted file mode 100644
index bfbf1ac44..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanTypeProxy.java
+++ /dev/null
@@ -1,85 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Byte.class. 
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMByteClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMByteClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.BYTE_CLASS), Byte.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)0));	
-	oneProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)1));
-	twoProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)2));
-	threeProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)3));		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createByteBeanProxy(Byte aByte) {
-	switch(aByte.byteValue()) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMByteClassBeanProxy(fRegistry, aByte);
-	}
-}
-
-/**
- * Generic way to create an Integer proxy, however, the Number must be an Integer.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createByteBeanProxy((Byte) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createByteBeanProxy(new Byte(value.aByte));
-}	
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanProxy.java
deleted file mode 100644
index b762b9b9b..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanProxy.java
+++ /dev/null
@@ -1,133 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for Byte.TYPE.
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMByteTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final byte fByte;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMByteTypeBeanProxy(REMProxyFactoryRegistry aRegistry, byte aByte) {
-	super(aRegistry);
-	fByte = aByte;
-}
-
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMByteTypeBeanProxy)
-		return fByte == ((REMByteTypeBeanProxy) anObject).byteValue();
-	if (anObject instanceof Byte)
-		return fByte == ((Byte) anObject).byteValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMByteTypeBeanProxy)
-		return fByte == ((REMByteTypeBeanProxy) aBeanProxy).byteValue();
-	return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return fByte;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fByte;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fByte;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return fByte;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return fByte;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Byte(fByte);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return fByte;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fByte);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).byteType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fByte);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanTypeProxy.java
deleted file mode 100644
index 514192a13..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,110 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Byte.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMByteTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMByteTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.BYTE_TYPE), Byte.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMByteTypeBeanProxy(aRegistry, (byte)0);	
-	oneProxy = new REMByteTypeBeanProxy(aRegistry, (byte)1);
-	twoProxy = new REMByteTypeBeanProxy(aRegistry, (byte)2);
-	threeProxy = new REMByteTypeBeanProxy(aRegistry, (byte)3);		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createByteBeanProxy(byte aByte) {
-	switch(aByte) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMByteTypeBeanProxy(fRegistry, aByte);
-	}
-}
-
-/**
- * newInstance method. byte is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}	
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createByteBeanProxy(value.aByte);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (byte) validNumber - number can be any number because (byte) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of byte to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);	
-	byte aByte;
-	if (trim.startsWith("(byte)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(byte)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			aByte = v.byteValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		try {
-			aByte = Byte.decode(trim).byteValue();	// See if valid byte format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aByte);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java
deleted file mode 100644
index 9e2075bbb..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java
+++ /dev/null
@@ -1,146 +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.proxy.remote;
-/*
-
-
- */
-
-import java.io.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.IOCommandException;
-/**
- * This is the inputstream used to return a lot of data from
- * the server.
- */
-
-public class REMCallbackInputStream extends InputStream {
-	
-	protected DataInputStream fIn;
-	protected DataOutputStream fOut;
-	protected byte[] fBuffer;
-	protected int fNextByte = 0;
-	protected int fLastByte = 0;
-	
-	public REMCallbackInputStream(DataInputStream in, DataOutputStream out) {
-		fIn = in;
-		fOut = out;
-		
-		Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
-		if (bufSize == null)
-			bufSize = new Integer(16000);		
-		fBuffer = new byte[bufSize.intValue()];
-	}
-	
-	protected void clearStream() {
-		fIn = null;
-		fOut = null;
-		fBuffer = null;
-	}
-	
-	protected void fillBuffer() throws IOException {
-		if (fIn == null)
-			throw new InterruptedIOException();
-		try {
-			if (fLastByte != -1) {
-				fLastByte = Commands.readBytes(fIn, fBuffer);
-				if (fLastByte != -1)
-					fNextByte = 0;
-				else {
-					fNextByte = -1;
-				}
-			}	
-		} catch (CommandException e) {
-			try {
-				close(false);
-			} catch (IOException e1) {
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e1));	// Error during close, just log it. //$NON-NLS-1$
-			}
-			throw new IOCommandException(e);
-		}
-	}
-			
-	public int read() throws IOException {
-		if (fNextByte >= fLastByte) {
-			fillBuffer();
-		}
-		if (fLastByte == -1)
-			return -1;	// We've previously reached the end.		
-		
-		return fBuffer[fNextByte++] & 0xFF;	// So that it is in range 0 to 255.
-	}
-	
-	public int read(byte b[], int off, int len) throws IOException {
-		if (b == null) {
-			throw new NullPointerException();
-		} else if ((off < 0) || (off > b.length) || (len < 0) ||
-			((off + len) > b.length) || ((off + len) < 0)) {
-			throw new IndexOutOfBoundsException();
-		} else if (len == 0) {
-			return 0;
-		}
-		
-		int read = 0;
-		while (len > 0) {
-			if (fNextByte >= fLastByte)
-				fillBuffer();
-			if (fLastByte == -1)
-				return read != 0 ? read : -1;	// No more, return amount read, or if none read, then -1
-			int move = fLastByte - fNextByte;
-			if (move > len)
-				move = len;
-			System.arraycopy(fBuffer, fNextByte, b, off, move);
-			read += move;
-			fNextByte += move;
-			off += move;
-			len -= move;
-		}
-		
-		return read;
-	}
-			
-	public int available() throws IOException {
-		return fLastByte != -1 ? fLastByte - fNextByte : 0;
-	}
-	
-	public void close() throws IOException {
-		close(true);
-	}
-	
-	protected void close(boolean wait) throws IOException {
-		if (fOut == null)
-			return;	// Already closed.
-		try {
-			fOut.writeByte(Commands.CALLBACK_STREAM_TERMINATE);
-			fOut.flush();
-			fOut = null;	// So that we know we closed already if error occurs during in read() below.
-			if (wait) {
-				// Need to read until End of stream because we need to flush out the
-				// stream so that next time we use this connection we start fresh.
-				// If the server has already finished writing, we will read until then.
-				// If the server has not yet finished writing, when it reads the terminate
-				// request it will send an end of stream marker for us to read. But either
-				// way we can't leave until we've read everything from the stream.
-				
-				// If called with no wait, then we are closing hard and will be closing the socket too.
-				while (read() != -1) {
-				}
-			}
-		} finally {
-			clearStream();
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackRegistry.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackRegistry.java
deleted file mode 100644
index 816c40c80..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackRegistry.java
+++ /dev/null
@@ -1,185 +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.proxy.remote;
-/*
-
-
- */
-
-import java.net.Socket;
-import java.util.*;
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-
-/**
- * This registry will handle callbacks.
- * It is package protected because no one
- * should access it outside.
- */
-class REMCallbackRegistry implements ICallbackRegistry {
-	final REMProxyFactoryRegistry fFactory;
-	final String fNamePostfix;
-	List fThreads = Collections.synchronizedList(new LinkedList());	// List of active callback threads.	
-	
-	Map fIdToCallback = new HashMap(5);	// ID to Callback map.
-	Map fCallbackProxyToId = new HashMap(5);	// Callback to ID map. This will also hold onto the callback proxies so that they don't get GC'd while the callback is registered.
-		
-	IREMMethodProxy fInitializeCallback;
-	IBeanProxy fRemoteServer;
-	
-	boolean registryOpen = true;
-	
-	public REMCallbackRegistry(String name, REMProxyFactoryRegistry aFactory) {
-	
-		fFactory = aFactory;
-		fNamePostfix = name;
-		
-		// Now register common proxies.
-		IREMBeanTypeProxy callbackType = new REMInterfaceBeanTypeProxy(fFactory, new Integer(Commands.ICALLBACK_CLASS), "org.eclipse.jem.internal.proxy.vm.remote.ICallback"); //$NON-NLS-1$
-	
-		fInitializeCallback = (IREMMethodProxy) ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).methodType.newBeanProxy(new Integer(Commands.INITIALIZECALLBACK_METHOD_ID));
-		
-		fRemoteServer = aFactory.getBeanProxyFactory().getIVMServerProxy();	// For us, the IVMServer on the remote vm ALSO implements IVMCallbackServer.
-
-		((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).registerBeanTypeProxy(callbackType, true);
-		((REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory()).registerProxy(fInitializeCallback);
-		
-	}
-	
-	public boolean createCallback(Socket incoming) {
-		if (registryOpen) {
-			Thread st = new REMCallbackThread(incoming, this, "Callback Thread-"+fNamePostfix, fFactory, fFactory.fNoTimeouts); //$NON-NLS-1$
-			fThreads.add(st);
-			st.start();
-			return true;
-		} else
-			return false;
-	}
-	
-	/**
-	 * Use this to request a shutdown. If the server is already shutdown, this will return false.
-	 */
-	public boolean requestShutdown() {		
-		if (registryOpen)
-			shutdown();
-		else
-			return false;
-		return true;
-	}
-	
-	/**
-	 * Remove a thread from the list.
-	 */
-	public void removeCallbackThread(REMCallbackThread thread) {
-		fThreads.remove(thread);
-	}
-	
-	private void shutdown() {
-		
-		// Go through each thread and ask it to close. Make a copy of the list so that we
-		// won't get into deadlocks.
-		REMCallbackThread[] threadsArray = (REMCallbackThread[]) fThreads.toArray(new REMCallbackThread[fThreads.size()]);
-		for (int i=0; i<threadsArray.length; i++) {
-			// This is a harsh way to shut a connection down, but there's no
-			// other way I know of to interrupt the read on a socket.
-			threadsArray[i].close();
-		}
-			
-		// Now that they've been told to close, wait on each one to finish.
-		for (int i=0; i<threadsArray.length; i++)
-			try {
-				threadsArray[i].join(10000);	// Wait ten seconds, if longer, just go on to next one.
-			} catch (InterruptedException e) {
-			}
-			
-		fThreads.clear();
-		fIdToCallback.clear();
-		fCallbackProxyToId.clear();
-		fInitializeCallback = null;
-		fRemoteServer = null;
-			
-	}		
-	
-	public ICallback getRegisteredCallback(int id) {
-		synchronized(fIdToCallback)	{	
-			return (ICallback) fIdToCallback.get(new Integer(id));
-		}
-	}
-		
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.ICallbackRegistry#registerCallback(org.eclipse.jem.internal.proxy.core.IBeanProxy, org.eclipse.jem.internal.proxy.core.ICallback)
-	 */
-	public void registerCallback(IBeanProxy callbackProxy, ICallback cb) {
-		synchronized(fIdToCallback) {
-			fIdToCallback.put(((IREMBeanProxy) callbackProxy).getID(), cb);
-			fCallbackProxyToId.put(callbackProxy, ((IREMBeanProxy) callbackProxy).getID());
-			fInitializeCallback.invokeCatchThrowableExceptions(callbackProxy, new IBeanProxy[] {fRemoteServer, fFactory.getBeanProxyFactory().createBeanProxyWith(((IREMBeanProxy) callbackProxy).getID().intValue())});
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.ICallbackRegistry#registerCallback(org.eclipse.jem.internal.proxy.core.IProxy, org.eclipse.jem.internal.proxy.core.ICallback, org.eclipse.jem.internal.proxy.core.IExpression)
-	 */
-	public void registerCallback(IProxy callbackProxy, final ICallback cb, IExpression expression) {
-		final Integer id;
-		if (callbackProxy.isBeanProxy()) {
-			id = ((IREMBeanProxy) callbackProxy).getID();
-			synchronized(fIdToCallback) {
-				fIdToCallback.put(id, cb);
-				fCallbackProxyToId.put(callbackProxy, id);
-			}
-		} else {
-			id = new Integer(callbackProxy.hashCode());
-			synchronized (fIdToCallback) {
-				fIdToCallback.put(id, cb);	// This is so that it is registered in case callback is invoked from remote vm during expression processing.
-			}
-			((ExpressionProxy) callbackProxy).addProxyListener(new ExpressionProxy.ProxyListener() {
-				public void proxyResolved(ProxyEvent event) {
-					synchronized(fIdToCallback) {
-						fCallbackProxyToId.put(event.getProxy(), id);
-					}
-				}
-				
-				public void proxyNotResolved(ProxyEvent event) {
-					// Failed, so remove registration completely.
-					synchronized (fIdToCallback) {
-						fIdToCallback.remove(id);
-					}
-				}
-				
-				public void proxyVoid(ProxyEvent event) {
-					// Failed, so remove registration completely.
-					synchronized (fIdToCallback) {
-						fIdToCallback.remove(id);
-					}
-				}
-				
-			});
-		}
-		expression.createSimpleMethodInvoke(fInitializeCallback, callbackProxy, new IProxy[] {fRemoteServer, fFactory.getBeanProxyFactory().createBeanProxyWith(id.intValue())}, false);
-	}
-	
-	/**
-	 * The public interface for deregistering callbacks.
-	 */
-	public void deregisterCallback(IBeanProxy callbackProxy) {
-		synchronized(fIdToCallback)	{
-			Integer id = (Integer) fCallbackProxyToId.remove(callbackProxy);
-			fIdToCallback.remove(id);
-		}
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackThread.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackThread.java
deleted file mode 100644
index 5625d1cd2..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackThread.java
+++ /dev/null
@@ -1,327 +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.proxy.remote;
-/*
-
-
- */
-
-import java.io.*;
-import java.net.Socket;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * This thread handles the actual callback.
- * It is package protected because no one else should access it.
- */
-class REMCallbackThread extends Thread {
-	final REMConnection fConnection;	// A connection to use
-	final REMCallbackRegistry fServer;
-	final REMStandardBeanProxyFactory fFactory;
-	final REMStandardBeanTypeProxyFactory fTypeFactory;
-	final REMProxyFactoryRegistry registry;
-	protected boolean shuttingDown;
-	protected boolean inTransaction;	// Is this thread currently participating in a transaction, (i.e. reading/writing), if so then we can't use it for another transaction.
-	
-
-	/**
-	 * Is this callback thread currently participating in a transaction (reading/writing). If so then it can't be used for an
-	 * independent new transaction. In other words you can't write/read data using this callback thread's
-	 * connection because it is being used by someone else expecting to have exclusive read/write on this connection.
-	 * 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean inTransaction() {
-		return inTransaction;
-	}
-	
-	/**
-	 * Set whether this callback thread is in a transaction or not. If it is in a transaction it cannot be used
-	 * for an independent new transaction. In other words you can't write/read data using this callback thread's
-	 * connection because it is being used by someone else expecting to have exclusive read/write on this connection.
-	 * @param inTransaction
-	 * 
-	 * @since 1.1.0
-	 */
-	public void setIntransaction(boolean inTransaction) {
-		this.inTransaction = inTransaction;
-	}
-	
-	// Kludge: Bug in Linux 1.3.xxx of JVM. Closing a socket while the socket is being read/accept will not interrupt the
-	// wait. Need to timeout to the socket read/accept before the socket close will be noticed. This has been fixed
-	// in Linux 1.4. So on Linux 1.3 need to put timeouts in on those sockets that can be separately closed while reading/accepting.
-	static boolean LINUX_1_3 = "linux".equalsIgnoreCase(System.getProperty("os.name")) && System.getProperty("java.version","").startsWith("1.3");	 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	
-	public REMCallbackThread(Socket socket, REMCallbackRegistry server, String name, REMProxyFactoryRegistry registry, boolean noTimeouts) {
-		super(name);
-		
-		fConnection = new REMConnection(socket, true);	// No timeouts since this is a server thread.
-		this.registry = registry;
-		fServer = server;
-		fFactory = (REMStandardBeanProxyFactory) registry.getBeanProxyFactory();
-		fTypeFactory = (REMStandardBeanTypeProxyFactory) registry.getBeanTypeProxyFactory();		
-	}
-	
-	/**
-	 * Request the thread to close down.
-	 */
-	public void close() {
-		try {
-			shuttingDown = true;	// So that if this is a forced close then it will know not to print error msgs.
-			if (fConnection.fSocket != null)
-				fConnection.fSocket.close();
-		} catch (Exception e) {
-		}
-	}
-	
-	
-	/*
-	 * Return the IREMConnection associated with this callback. Used by
-	 * the connection server to return this connection for any requests 
-	 * made on this thread.
-	 * <package-protected> so that only remote proxy can access.
-	 */
-	IREMConnection getConnection() {
-		return fConnection;
-	}
-	
-	public void run() {
-
-		DataInputStream in = fConnection.in;
-		DataOutputStream out = fConnection.out;	
-		InputStream ins = null;	
-		boolean shutdown = false;
-		Commands.ValueObject valueObject = new Commands.ValueObject();	// Working value object so not continually recreated.
-		BeanProxyValueSender valueSender = new BeanProxyValueSender(this.fFactory);	// Working valuesender so not continually recreated. 
-		try {
-			boolean doLoop = true;
-
-			/**
-			 * Note: In the cases below you will see a lot of finally clauses that null variables out.
-			 * This is because this is a long running loop, and variables declared within blocks are not
-			 * garbage collected until the method is terminated, so these variables once set would never
-			 * be GC'd. The nulling at the end of the case makes sure that any of those objects set are
-			 * now available for garbage collection when necessary.
-			 */		
-			while(doLoop) {
-				byte cmd = 0;
-				try {
-					if (LINUX_1_3)
-						fConnection.fSocket.setSoTimeout(1000);	// Linux 1.3 bug, see static LINUX_1_3 above
-					cmd = in.readByte();
-					if (LINUX_1_3)
-						fConnection.fSocket.setSoTimeout(0);	// Linux 1.3 bug, see static LINUX_1_3 above
-				} catch (InterruptedIOException e) {
-					continue;	// Timed out, try again
-				}
-					
-				switch (cmd) {
-					case Commands.QUIT_CONNECTION:				
-						doLoop = false;	
-						break;	// Close this connection
-						
-					case Commands.TERMINATE_SERVER:
-						doLoop = false;		
-						shutdown = true;	// Shutdown everything
-						break;
-						
-					case Commands.CALLBACK:
-						int callID = in.readInt();	// The id of the registered callback to call.
-						int msgID = in.readInt();	// The id of the message to call.
-						Object parm = null;
-						Object result = null;
-						ICallback cb = null;
-						try {
-							// The register callback handler will know how to handle the parm,
-							// it will know if it is an array of proxies, or an object of some kind.
-							fFactory.startTransaction();	// Start a transaction.
-							setIntransaction(true);	// Also tell ourselves that we are in a transaction.
-							boolean isProxies = true;							
-							try {
-								Commands.readValue(in, valueObject);
-								if (valueObject.type == Commands.ARRAY_IDS) {
-									// It is an array containing IDs, as it normally would be.
-									// However it will become IBeanProxy[]. That is because if ID's
-									// they must be proxies over here.
-									valueSender.initialize(valueObject);
-									Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
-									if (valueSender.getException() != null) {
-										close();	// Something wrong, close the thread so next time we get a new one.
-									}
-									parm = valueSender.getArray();
-								} else {
-									// It is object or null. It could be an array of objects, or one object.
-									isProxies = false;
-									parm = valueObject.getAsObject();
-								}
-							} finally {
-								setIntransaction(false);
-								fFactory.stopTransaction();
-							}
-							// Now perform the callback.
-							cb = fServer.getRegisteredCallback(callID);
-							if (cb != null) {
-								// Callback still registered. If proxies, then if first entry is just a proxy,
-								// then we are sending only one. A convienence factor for callbacks.
-								// If not a single entry of IBeanProxy, then send whole array.
-								try {
-									if (isProxies)
-										if (((Object[]) parm).length == 1 && (((Object[]) parm)[0] == null || ((Object[]) parm)[0] instanceof IBeanProxy))
-											result = cb.calledBack(msgID, (IBeanProxy) ((Object[]) parm)[0]);
-										else
-											result = cb.calledBack(msgID, (Object[]) parm);
-									else
-										result = cb.calledBack(msgID, parm);
-									// We only accept null, IREMBeanProxies, and Object[], where
-									// contents of Object[] are bean proxies.
-									valueObject.set();
-									if (result instanceof IREMBeanProxy)
-										 ((IREMBeanProxy) result).renderBean(valueObject);
-									else if (result instanceof Object[]) {
-										class Retriever implements Commands.ValueRetrieve {
-											int index = 0;
-											Object[] array;
-											Commands.ValueObject worker = new Commands.ValueObject();
-
-											public Retriever(Object[] anArray) {
-												array = anArray;
-											}
-
-											public Commands.ValueObject nextValue() {
-												Object retParm = array[index++];
-												if (retParm != null)
-													if (retParm instanceof IREMBeanProxy)
-														 ((IREMBeanProxy) retParm).renderBean(worker);
-													else if (retParm instanceof TransmitableArray) {
-														// It is another array, create a new
-														// retriever.
-														worker.setArrayIDS(
-															new Retriever(((TransmitableArray) retParm).array),
-															((TransmitableArray) retParm).array.length,
-															((TransmitableArray) retParm).componentTypeID);
-													} else {
-														// It's an object. Need to get bean
-														// type so that we can send it.
-														IREMBeanProxy type =
-															(IREMBeanProxy) fTypeFactory.getBeanTypeProxy(retParm.getClass().getName());
-														if (type == null)
-															throw new IllegalArgumentException();
-														int classID = type.getID().intValue();
-														worker.setAsObject(retParm, classID);
-													}
-												else
-													worker.set();
-												return worker; 
-											}
-										};
-
-										valueObject.setArrayIDS(
-											new Retriever((Object[]) result),
-											((Object[]) result).length,
-											Commands.OBJECT_CLASS);
-									}
-									
-									Commands.sendCallbackDoneCommand(out, valueObject, Commands.NO_ERROR);
-								} catch (RuntimeException e) {
-									// Something happened, turn it into an error object
-									// to send back.
-									valueObject.set(e.getClass().getName() + ':' + e.getLocalizedMessage());
-									Commands.sendCallbackDoneCommand(out, valueObject, Commands.CALLBACK_RUNTIME_EXCEPTION);
-									ProxyPlugin.getPlugin().getLogger().log(e, Level.INFO);	// Just log it, but assume safe enough to just go back and wait for next callback request.
-								}
-							} else {
-								valueObject.set();
-								Commands.sendCallbackDoneCommand(out, valueObject, Commands.CALLBACK_NOT_REGISTERED);	// Send error msg back to indicate we weren't registered.								
-							}
-						} finally {
-							parm = null;	// Clear out for GC to work
-							result = null;
-							cb = null;
-							valueObject.set();
-							valueSender.clear();
-						}
-						break;
-						
-					case Commands.CALLBACK_STREAM:
-						// A request for a stream
-						callID = in.readInt();	// The id of the registered callback to call.
-						msgID = in.readInt();	// The id of the message to call.
-						cb = null;
-						try {
-							// Now perform the callback.
-							cb = fServer.getRegisteredCallback(callID);
-							if (cb != null) {
-								// Callback still registered
-								valueObject.set();								
-								Commands.sendCallbackDoneCommand(out, valueObject, Commands.NO_ERROR);	// Send null to let it know we've accepted the stream
-								ins = new REMCallbackInputStream(in, out);
-								try {
-									cb.calledBackStream(msgID, ins);
-								} finally {
-									try {
-										ins.close();	// Make sure it's closed.
-									} catch (IOException e) {
-										// Exception while closing, just log it and then mark to end the loop so we close connection too.
-										doLoop = false;
-										ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "In REMCallbackThread", e)); //$NON-NLS-1$										
-									}
-								}
-							} else {
-								valueObject.set();
-								Commands.sendCallbackDoneCommand(out, valueObject, Commands.CALLBACK_NOT_REGISTERED);	// Send error msg back to indicate we weren't registered.								
-							}
-						} finally {
-							cb = null;	// Clear out for GC to work
-							ins = null;
-							valueObject.set();							
-						}
-						break;																	
-						
-					default:
-						// Unknown command. We don't know how long the command is, so we need to close the connection.
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "REMCallback: Invalid cmd sent="+cmd, null)); //$NON-NLS-1$
-						doLoop = false;						
-						break;
-				}
-			}
-		} catch (EOFException e) {
-			// This is ok. It means that the connection on the other side was terminated.
-			// So just accept this and go down.
-		} catch (Exception e) {
-			if (!shuttingDown)
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "In REMCallbackThread", e)); //$NON-NLS-1$
-		} finally {
-			if (in != null)
-				try {
-					in.close();
-				} catch (Exception e) {
-				}
-			if (out != null)
-				try {
-					out.close();
-				} catch (Exception e) {
-				}
-			close();
-		}		
-		fServer.removeCallbackThread(this);
-		if (shutdown)
-			fServer.requestShutdown();
-	}	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanProxy.java
deleted file mode 100644
index 4fc5cf994..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanProxy.java
+++ /dev/null
@@ -1,150 +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.proxy.remote;
-/*
- * $RCSfile: REMCharacterClassBeanProxy.java,v $ $Revision: 1.6 $ $Date: 2005/08/24 20:39:06 $
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * IDE Implementation of ICharacterBeanProxy for the Character class. Creation date: (2/6/00
- * 9:02:54 AM) @author: Joe Winchester
- */
-final class REMCharacterClassBeanProxy extends REMConstantBeanProxy implements ICharacterBeanProxy {
-	protected Character fCharValue;
-
-	/**
-	 * As well as storing the bean store the char value so that we can return the charValue faster
-	 * without the need for repeated re-casting. It is package protected because it is created in
-	 * special way, so no one else should create these.
-	 * 
-	 * @param aBean
-	 *            java.lang.Object
-	 */
-	REMCharacterClassBeanProxy(REMProxyFactoryRegistry aRegistry, Character value) {
-		super(aRegistry);
-		fCharValue = value;
-	}
-
-	/**
-	 * equals: Equal if: 1) This proxy == (identity) to the other object 2) Else if other is an
-	 * IBeanProxy and not a constant one, then if equals on the server. 3) If this is a constant
-	 * proxy and the other is too or is a constant value (e.g. IStringBeanProxy.equals(String),
-	 * then true if values are equals.
-	 */
-	public boolean equals(Object anObject) {
-		if (this == anObject)
-			return true; // Identity
-		if (anObject instanceof REMCharacterClassBeanProxy)
-			return fCharValue.charValue() == ((REMCharacterClassBeanProxy) anObject).charValue();
-		if (anObject instanceof Character)
-			return fCharValue.charValue() == ((Character) anObject).charValue();
-		return false;
-	}
-
-	/**
-	 * Return the char value
-	 */
-	public char charValue() {
-		return fCharValue.charValue();
-	}
-	/**
-	 * Return the java.lang.Character value
-	 */
-	public Character characterValue() {
-		return fCharValue;
-	}
-
-	/**
-	 * Answer the toString() of the value.
-	 */
-	public String toBeanString() {
-		return fCharValue.toString();
-	}
-
-	/**
-	 * Get the beantype
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).characterClass;
-	}
-
-	/**
-	 * Render the bean into value object.
-	 */
-	public void renderBean(Commands.ValueObject value) {
-		value.set(fCharValue);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#byteValue()
-	 */
-	public byte byteValue() {
-		return (byte) fCharValue.charValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#doubleValue()
-	 */
-	public double doubleValue() {
-		return fCharValue.charValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#floatValue()
-	 */
-	public float floatValue() {
-		return fCharValue.charValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#intValue()
-	 */
-	public int intValue() {
-		return fCharValue.charValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#longValue()
-	 */
-	public long longValue() {
-		return fCharValue.charValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#numberValue()
-	 */
-	public Number numberValue() {
-		return new Integer(charValue()); // Kludge.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#shortValue()
-	 */
-	public short shortValue() {
-		return (short) fCharValue.charValue();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanTypeProxy.java
deleted file mode 100644
index b3d9ff7da..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanTypeProxy.java
+++ /dev/null
@@ -1,85 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Character BeanType Proxy for Character.class.
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMCharacterClassBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-	final REMCharacterClassBeanProxy nilProxy;	// Value of '\0'
-
-REMCharacterClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy objectType) {
-	super(aRegistry, new Integer(Commands.CHARACTER_CLASS), Character.class.getName(), objectType);
-	
-	nilProxy = new REMCharacterClassBeanProxy(aRegistry, new Character('\0'));
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-ICharacterBeanProxy createCharacterBeanProxy(Character aCharacter) {
-	return (aCharacter.charValue() != '\0') ?
-		new REMCharacterClassBeanProxy(fRegistry, aCharacter) : nilProxy;
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For all of the primitive wrapper types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the primitive wrapper types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. Character doesn't have a default ctor, so the standard way won't work.
- * Return the nilProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return nilProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createCharacterBeanProxy(new Character(value.aChar));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanProxy.java
deleted file mode 100644
index 1c8966bc3..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanProxy.java
+++ /dev/null
@@ -1,155 +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.proxy.remote;
-/*
- * $RCSfile: REMCharacterTypeBeanProxy.java,v $ $Revision: 1.6 $ $Date: 2005/08/24 20:39:07 $
- */
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote implementation of ICharacterBeanProxy. Creation date: (2/6/00 9:02:54 AM) @author: Joe
- * Winchester
- */
-final class REMCharacterTypeBeanProxy extends REMConstantBeanProxy implements ICharacterBeanProxy {
-	protected char fChar;
-
-	REMCharacterTypeBeanProxy(REMProxyFactoryRegistry aRegistry, char value) {
-		super(aRegistry);
-		fChar = value;
-	}
-
-	/**
-	 * equals: Equal if: 1) This proxy == (identity) to the other object 2) Else if other is an
-	 * IBeanProxy and not a constant one, then if equals on the server. 3) If this is a constant
-	 * proxy and the other is too or is a constant value (e.g. IStringBeanProxy.equals(String),
-	 * then true if values are equals.
-	 */
-	public boolean equals(Object anObject) {
-		if (this == anObject)
-			return true; // Identity
-		if (anObject instanceof REMCharacterTypeBeanProxy)
-			return fChar == ((REMCharacterTypeBeanProxy) anObject).charValue();
-		if (anObject instanceof Character)
-			return fChar == ((Character) anObject).charValue();
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		if (this == aBeanProxy)
-			return true; // Identity
-		if (aBeanProxy instanceof REMCharacterTypeBeanProxy)
-			return fChar == ((REMCharacterTypeBeanProxy) aBeanProxy).charValue();
-		return false;
-	}
-
-	/**
-	 * Return the char value
-	 */
-	public char charValue() {
-		return fChar;
-	}
-	/**
-	 * Return the java.lang.Character value
-	 */
-	public Character characterValue() {
-		return new Character(fChar);
-	}
-
-	/**
-	 * Answer the toString() of the value.
-	 */
-	public String toBeanString() {
-		return String.valueOf(fChar);
-	}
-
-	/**
-	 * Get the beantype
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).charType;
-	}
-
-	/**
-	 * Render the bean into value object.
-	 */
-	public void renderBean(Commands.ValueObject value) {
-		value.set(fChar);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#byteValue()
-	 */
-	public byte byteValue() {
-		return (byte) fChar;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#doubleValue()
-	 */
-	public double doubleValue() {
-		return fChar;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#floatValue()
-	 */
-	public float floatValue() {
-		return fChar;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#intValue()
-	 */
-	public int intValue() {
-		return fChar;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#longValue()
-	 */
-	public long longValue() {
-		return fChar;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#numberValue()
-	 */
-	public Number numberValue() {
-		return new Integer(fChar); // Kludge
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#shortValue()
-	 */
-	public short shortValue() {
-		return (short) fChar;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanTypeProxy.java
deleted file mode 100644
index 2c9f309af..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,66 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Character.TYPE BeanType Proxy.
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMCharacterTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-
-	final REMCharacterTypeBeanProxy nilProxy;	// Value of '\0'
-/**
- * REMCharacterBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMCharacterTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.CHARACTER_TYPE), Character.TYPE.getName());
-	
-	nilProxy = new REMCharacterTypeBeanProxy(aRegistry, '\0');
-}
-
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache.
- */
-ICharacterBeanProxy createCharacterBeanProxy(char aCharacter) {
-	return new REMCharacterTypeBeanProxy(fRegistry, aCharacter);
-}
-
-/**
- * newInstance method. Character doesn't have a default ctor, so the standard way won't work.
- * Return the nilProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return nilProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createCharacterBeanProxy(value.aChar);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMClassBeanTypeProxy.java
deleted file mode 100644
index cd8da01cf..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMClassBeanTypeProxy.java
+++ /dev/null
@@ -1,75 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * This is a bean type for the Class object. It is needed so that
- * when a new object id comes in that represents a class, it will
- * go through this bean type to create it. We need to do something
- * special so that the correct bean type object is created.
- */
-
-final class REMClassBeanTypeProxy extends REMAbstractBeanTypeProxy {
-
-
-REMClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy objectType) {
-	super(aRegistry, new Integer(Commands.CLASS_CLASS), Class.class.getName(), objectType);
-}
-
-/**
- * Note: Since new instances of Class are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() { 
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Class are never done through a initialization strings,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
-	throw new UnsupportedOperationException();
-}		
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * NOTE: Since the Class type is final, this function isn't supported.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * In this case it means we need a new IBeanProxyType. We will let the 
- * Beantype factory handle this since it knows how to get the information
- * for a specific id.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
-	return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).createBeanTypeProxy(anID);
-}
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java
deleted file mode 100644
index d37e8007f..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java
+++ /dev/null
@@ -1,342 +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.proxy.remote;
-/*
-
-
- */
-
-
-import java.io.*;
-import java.net.Socket;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands.*;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.util.TimerTests;
-/**
- * The default implementation of the connection.
- *
- * It uses the property "proxyvm.bufsize" to determine the buffer size to use. If not specified, it uses the system default
- */
-public class REMConnection implements IREMConnection, IREMExpressionConnection {
-	
-	public final static String INVOKE_STEP = "Invoke"; //$NON-NLS-1$
-	public final static String INVOKE_METHOD_STEP = "Invoke Method"; //$NON-NLS-1$
-	protected Socket fSocket = null;
-	protected DataInputStream in = null;
-	protected DataOutputStream out = null;
-	private static final int TIME_OUT = 1000 * 60;	// Wait up to a minute before timeout.
-	
-	public REMConnection(Socket socket, boolean noTimeouts) {
-		try {
-			fSocket = socket;
-			fSocket.setSoLinger(true, 30);	// Wait 30 seconds if necessary for the final stuff to go out after closing.
-			if (!noTimeouts)
-				fSocket.setSoTimeout(TIME_OUT);	// Timeout period
-			Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
-			if (bufSize == null)
-				bufSize = new Integer(16000);
-			out = new DataOutputStream(new BufferedOutputStream(fSocket.getOutputStream(), bufSize.intValue()));	// It didn't take the hint, so we will buffer it.
-			in = new DataInputStream(new BufferedInputStream(fSocket.getInputStream(), bufSize.intValue()));	// It didn't take the hint, so we will buffer it.
-		} catch (IOException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			
-			if (out != null)
-				try {
-					out.close();
-				} catch (IOException e2) {
-				}
-			if (in != null)
-				try {
-					in.close();
-				} catch (IOException e3) {
-				}
-			try {
-				fSocket.close();
-			} catch (IOException e4) {
-			}
-			fSocket = null;
-			in = null;
-			out = null;
-		}
-	}
-	
-	/**
-	 * Did this construct correctly.
-	 * This is needed because an exception could be thrown in the ctor and
-	 * that's not a good thing to do.
-	 */
-	public boolean isConnected() {
-		return fSocket != null;
-	}
-	
-	/**
-	 * Terminate the server. 
-	 */
-	public void terminateServer() {
-		if (isConnected()) {
-			try {
-				Commands.sendTerminateCommand(out);
-			} catch (IOException e) {
-			}
-			close();
-		}
-	}
-	
-	/**
-	 * Close the connection.
-	 */
-	public void close() {
-		if (isConnected()) {
-			try {
-				Commands.sendQuitCommand(out);
-			} catch (IOException e) {
-			} finally {
-				try {
-					out.close();
-				} catch (IOException e2) {
-				}
-				try {
-					in.close();
-				} catch (IOException e3) {
-				}
-				try {
-					fSocket.close();
-				} catch (IOException e4) {
-				}
-			}
-			fSocket = null;
-			in = null;
-			out = null;
-		}
-	}
-		
-					
-	/**
-	 * Return the class information.
-	 */
-	public GetClassReturn getClass(String className) throws CommandException {
-		if (isConnected())
-			try {
-				// It's simple, just pass onto Commands.
-				return Commands.sendGetClassCommand(out, in, className);
-			} catch (CommandErrorException e) {
-				if (e.getErrorCode() != Commands.GET_CLASS_NOT_FOUND)
-					throw e;	// Not class not found, send it on
-			}			
-		return null;	// Not found, so return null				
-	}
-	
-	
-	/**
-	 * Return the class information given an ID.
-	 */
-	public GetClassIDReturn getClassFromID(int classID) throws CommandException {
-		if (isConnected()) {
-			// It's simple, just pass onto Commands.
-			return Commands.sendGetClassFromIDCommand(out, in, classID);
-		}
-		return null;	// Not found, so return null		
-	}	
-	
-	/**
-	 * Get the object data from an id.
-	 */
-	public void getObjectData(int classID, Commands.ValueObject valueReturn) throws CommandException {
-		if (isConnected()) {
-			// Just pass onto Commands.
-			Commands.sendGetObjectData(out, in, classID, valueReturn);
-		} else
-			valueReturn.set();	// Set it to null since we aren't connected.
-	}	
-
-	/**
-	 * Get a new instance using an init string
-	 */
-	public void getNewInstance(int classID, String initString, Commands.ValueObject newInstance) throws CommandException {
-		if (isConnected()) {
-			// Just pass onto Commands.
-			Commands.sendNewInstance(out, in, classID, initString, newInstance);
-		} else
-			newInstance.set();	// Set it to null since we aren't connected.
-	}
-	
-	/**
-	 * Release the id.
-	 */
-	public void releaseID(int id){
-		if (isConnected())
-			try {
-				// Just pass onto Commands.
-				Commands.releaseObjectCommand(out, id);
-			} catch (IOException e) {
-				// Don't care it didn't work
-			}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMConnection#getArrayContents(int, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void getArrayContents(int arrayID, Commands.ValueObject returnValue) throws CommandException {
-		if (isConnected()) {
-			// It's simple, just pass onto Commands.
-			Commands.sendGetArrayContentsCommand(out, in, arrayID, returnValue);
-		}			
-	}
-	
-	/**
-	 * Invoke the method call
-	 */	
-	public void invokeMethod(int methodID, Commands.ValueObject invokeOn, Commands.ValueObject parms, Commands.ValueObject returnValue) throws CommandException {
-		if (isConnected()) {
-			// It's simple, just pass onto Commands.
-			TimerTests.basicTest.startCumulativeStep(INVOKE_METHOD_STEP);
-			Commands.sendInvokeMethodCommand(out, in, methodID, invokeOn, parms, returnValue);
-			TimerTests.basicTest.stopCumulativeStep(INVOKE_METHOD_STEP);
-		}			
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMConnection#invokeMethod(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, java.lang.String, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void invokeMethod(ValueObject classType, String methodName, ValueObject parmTypes, ValueObject invokeOn, ValueObject parms,
-			ValueObject returnValue) throws CommandException {
-		if (isConnected()) {
-			// It's simple, just pass onto Commands.
-			TimerTests.basicTest.startCumulativeStep(INVOKE_STEP);
-			Commands.sendInvokeMethodCommand(out, in, classType, methodName, parmTypes, invokeOn, parms, returnValue);
-			TimerTests.basicTest.stopCumulativeStep(INVOKE_STEP);
-		}			
-	}
-	
-	/* ************************************************************
-	 * Put the Expression processing commands here.
-	 * 
-	 * ************************************************************/
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#startExpressionProcessing()
-	 */
-	public void startExpressionProcessing(int expressionID, byte trace) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendStartExpressionProcessingCommand(expressionID, trace, out);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushExpressionCommand(byte)
-	 */
-	public void pushExpressionCommand(int expressionID, byte subcommand) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendExpressionCommand(expressionID, out, subcommand);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#stopExpressionProcessing()
-	 */
-	public void stopExpressionProcessing(int expressionID) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendEndExpressionProcessingCommand(expressionID, out);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushValueObject(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void pushValueObject(ValueObject valueObject) throws CommandException {
-		if (isConnected())
-			Commands.writeValue(out, valueObject, false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushByte(byte)
-	 */
-	public void pushByte(byte abyte) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendByte(out, abyte);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushInt(int)
-	 */
-	public void pushInt(int anInt) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendInt(out, anInt);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushString(java.lang.String)
-	 */
-	public void pushString(String aString) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendString(out, aString);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushBoolean(boolean)
-	 */
-	public void pushBoolean(boolean aBool) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendBoolean(out, aBool);
-	}
-
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#getFinalValue(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void getFinalValue(ValueObject result) throws CommandException {
-		if (isConnected())
-			Commands.readBackValue(in, result, Commands.NO_TYPE_CHECK);
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pullValue(int, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void pullValue(int expressionID, ValueObject proxyids, ValueSender sender) throws CommandException {
-		if (isConnected())
-			ExpressionCommands.sendPullValueCommand(expressionID, out, in, proxyids, sender);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#sync(int, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void sync(int expressionID, ValueObject proxyids, ValueSender sender) throws CommandException {
-		if (isConnected())
-			ExpressionCommands.sendSyncCommand(expressionID, out, in, proxyids, sender);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMConnection#readProxyArrayValues(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueSender, boolean)
-	 */
-	public void readProxyArrayValues(Commands.ValueObject returnValue, Commands.ValueSender valueSender, boolean allowFlag) throws CommandException {
-		if (isConnected())
-			Commands.readArray(in, returnValue.anInt, valueSender, returnValue, allowFlag);
-	}
-
-	public void transferExpression(int expressionID, ValueObject expController) throws CommandException {
-		if (isConnected())
-			ExpressionCommands.sendTransferExpressionCommand(expressionID, out, in, expController);
-	}
-
-	public void resumeExpression(int expressionID, ValueObject expController) throws CommandException {
-		if (isConnected())
-			ExpressionCommands.sendResumeExpressionCommand(expressionID, out, expController);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstantBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstantBeanProxy.java
deleted file mode 100644
index 7742b5bb3..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstantBeanProxy.java
+++ /dev/null
@@ -1,100 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-/**
- * This is a base for bean proxies that are constants and
- * do not have an object on the remote VM side. They are
- * shipped back and forth by value.
- */
-
-public abstract class REMConstantBeanProxy implements IREMConstantBeanProxy {
-	protected final REMProxyFactoryRegistry fFactory;
-	private final static Integer ID = new Integer(Commands.NOT_AN_ID);
-	
-	protected REMConstantBeanProxy(REMProxyFactoryRegistry aFactory) {
-		fFactory = aFactory;
-	}
-	/**
-	 * Return the registry this proxy was created with.
-	 */
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return fFactory;
-	}
-	
-	/**
-	 * equals: Equal if:
-	 *         1) This proxy == (identity) to the other object
-	 *         2) Else if other is an IBeanProxy and not a constant one, then if
-	 *            equals on the server.
-	 *         3) If this is a constant proxy and the other is too or is a constant
-	 *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
-	 * This is abstract because each type needs to do a unique test for equality.
-	 */
-	public abstract boolean equals(Object anObject);
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		// We can't be assured that there are not non-identical constants that are actually identical.
-		// This is because for constants we do not know the id of the original. That is not sent across from the vm.		
-		return this == aBeanProxy;	
-	}	
-	
-	/**
-	 * Return the ID of this proxy.
-	 * Constants have no id's, so we return -1.
-	 */
-	public Integer getID() {
-		return ID;
-	}
-	
-	/**
-	 * isValid. Constant ones are always valid unless the registry is terminated, except if an
-	 * override releases resources. In that case the overriding
-	 * subclass should also override isValid() to return false
-	 * if release() was called.
-	 */
-	public boolean isValid() {
-		return fFactory.isValid();
-	}
-	
-	/**
-	 * release. Constant ones don't need to typically be released, however
-	 * if an override does do something to release, then it MUST also
-	 * override isValid() to return false.
-	 */
-	public void release() {
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorProxy.java
deleted file mode 100644
index 555670a3c..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorProxy.java
+++ /dev/null
@@ -1,109 +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.proxy.remote;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Proxy for a constructor.
- */
-
-final class REMConstructorProxy extends REMAccessibleObjectProxy implements IConstructorProxy {
-
-	REMConstructorProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
-		super(aRegistry, anID);
-	}
-
-	/**
-	 * Using this constructor (assuming it takes no arguments) create a new instance.
-	 * Exception will be raised if this constructor takes arguments.
-	 */
-	public IBeanProxy newInstance() throws ThrowableProxy {
-		return newInstance(null);
-	}
-
-	/**
-	 * The type proxy is constant proxy out of the method factory.
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).ctorType;
-	}
-
-	/**
-	 * Using this constructor (with the arguments) create a new instance.
-	 * Exception will be raised if arguments don't match the constructor.
-	 */
-	public IBeanProxy newInstance(IBeanProxy[] creationArguments) throws ThrowableProxy {
-		IREMMethodProxy newInstanceMethod =
-			(IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getConstructorNewInstance();
-
-		// Constructor.newInstance takes one parm (Object[]) where [0] is an Object[] of the arguments to the constructor.
-		Object[] parms = null;
-		if (creationArguments != null)
-			parms = new Object[] { new TransmitableArray(Commands.OBJECT_CLASS, creationArguments)};
-
-		return newInstanceMethod.invokeWithParms(this, parms);
-	}
-	public IBeanProxy newInstanceCatchThrowableExceptions() {
-		try {
-			return newInstance();
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-	public IBeanProxy newInstanceCatchThrowableExceptions(IBeanProxy[] args) {
-		try {
-			return newInstance(args);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-	
-	private IBeanTypeProxy[] fParameterTypes;
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConstructorProxy#getParameterTypes()
-	 */
-	public synchronized IBeanTypeProxy[] getParameterTypes() {
-		if (fParameterTypes == null) {
-			IArrayBeanProxy parmTypes = (IArrayBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory)
-					.getConstructorParameterTypesMessage().invokeCatchThrowableExceptions(this);
-			if (parmTypes == null)
-				fParameterTypes = new IBeanTypeProxy[0]; // There was some error, only way null is returned
-			else {
-				int len = parmTypes.getLength();
-				fParameterTypes = new IBeanTypeProxy[len];
-				for (int i = 0; i < len; i++)
-					try {
-						fParameterTypes[i] = (IBeanTypeProxy) parmTypes.get(i);
-					} catch (ThrowableProxy e) {
-					}
-				fFactory.releaseProxy(parmTypes); // Don't need the array on the server anymore.
-			}
-		}
-
-		return fParameterTypes;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorTypeProxy.java
deleted file mode 100644
index 831ab2859..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorTypeProxy.java
+++ /dev/null
@@ -1,67 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Method class.
- */
-
-final class REMConstructorTypeProxy extends REMAbstractBeanTypeProxy {
-
-REMConstructorTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy accessibleTypeProxy) {
-	super(aRegistry, new Integer(Commands.CONSTRUCTOR_CLASS), java.lang.reflect.Constructor.class.getName(), accessibleTypeProxy);
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the accessible object types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Specialized from REMAbstractBeanTypeProxy to ensure Constructor proxies are created correctly.
- */
-public IREMBeanProxy newBeanProxy(Integer objectID) {
-	return new REMConstructorProxy(fRegistry, objectID);
-}
-
-/**
- * Note: Since new instances of Constructor are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() { 
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Constructor are never done through an initialization string,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
-	throw new UnsupportedOperationException();
-}		
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanProxy.java
deleted file mode 100644
index 1b124dc24..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanProxy.java
+++ /dev/null
@@ -1,44 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Double.class.
- */
-class REMDoubleClassBeanProxy extends REMNumberBeanProxy {
-
-REMDoubleClassBeanProxy(REMProxyFactoryRegistry aRegistry, Double aDouble) {
-	super(aRegistry, aDouble);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).doubleClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Double) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanTypeProxy.java
deleted file mode 100644
index 1f316f77f..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanTypeProxy.java
+++ /dev/null
@@ -1,73 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Double.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMDoubleClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMDoubleClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.DOUBLE_CLASS), Double.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMDoubleClassBeanProxy(aRegistry, new Double(0D));	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createDoubleBeanProxy(Double aDouble) {
-	return (aDouble.doubleValue() != 0D) ?
-		new REMDoubleClassBeanProxy(fRegistry, aDouble) : zeroProxy;
-}
-
-/**
- * Generic way to create an Double proxy, however, the Number must be a Double.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createDoubleBeanProxy((Double) aNumber);
-}	
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createDoubleBeanProxy(new Double(value.aDouble));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanProxy.java
deleted file mode 100644
index 90f075c1a..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanProxy.java
+++ /dev/null
@@ -1,133 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberProxy for the primitive "double".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMDoubleTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final double fDouble;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMDoubleTypeBeanProxy(REMProxyFactoryRegistry aRegistry, double aDouble) {
-	super(aRegistry);
-	fDouble = aDouble;
-}
-
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMDoubleTypeBeanProxy)
-		return fDouble == ((REMDoubleTypeBeanProxy) anObject).doubleValue();
-	if (anObject instanceof Double)
-		return fDouble == ((Double) anObject).doubleValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMDoubleTypeBeanProxy)
-		return fDouble == ((REMDoubleTypeBeanProxy) aBeanProxy).doubleValue();
-	return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return (byte) fDouble;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fDouble;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return (float) fDouble;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return (int) fDouble;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return (long) fDouble;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Double(fDouble);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return (short) fDouble;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fDouble);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).doubleType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fDouble);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanTypeProxy.java
deleted file mode 100644
index aa17f7d65..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,98 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Double.TYPE
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMDoubleTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMDoubleTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.DOUBLE_TYPE), Double.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMDoubleTypeBeanProxy(aRegistry, 0D);		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createDoubleBeanProxy(double aDouble) {
-	return (aDouble != 0D) ?
-		new REMDoubleTypeBeanProxy(fRegistry, aDouble) : zeroProxy;
-}
-
-/**
- * newInstance method. double is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-	
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createDoubleBeanProxy(value.aDouble);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (double) validNumber - number can be any number because (double) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of double to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);	
-	double aDouble;
-	if (trim.startsWith("(double)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(double)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			aDouble = v.doubleValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		try {
-			aDouble = Double.valueOf(initializationString).doubleValue();	// See if valid double format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aDouble);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java
deleted file mode 100644
index ee7f450a0..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java
+++ /dev/null
@@ -1,1864 +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.proxy.remote;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
- 
-/**
- * The Remote proxy version of Expression.
- * 
- * @since 1.0.0
- */
-public class REMExpression extends Expression {
-
-	private IREMExpressionConnection connection;
-	private boolean closed;	// Are we closed.
-	
-	protected Commands.ValueObject workerValue;	// A worker object so that we don't need to keep creating one and throwing it away.
-	
-	protected Map beanTypeCache;	// Use to cache pending BeanTypes. Used in conjunction with REMStandardBeanTypeFactory.
-	protected Map methodsCache;	// Use to cache pending expression method proxies. Used in conjunction with REMProxyConsants.
-	protected Map fieldsCache;	// Use to cache pending expression field proxies. Used in conjunction with REMProxyConsants.
-	
-	/*
-	 * This is very special list. It tries to eliminate unneeded traffic. For example a mark immediately followed by an endmark does
-	 * not need to be sent. Many expressions can look like: mark, endmark, endtransaction. This is a do nothing and we don't want
-	 * to create a connection to just send this. So this list is used to queue up these and remove them too when found as not needed.
-	 * 
-	 *  However, this is very tricky because all pushToProxy transactions that actually do something MUST call the processPending() method 
-	 *  first to make sure any pending transactions are submitted. Because once a real type transaction, such as assignment occurs, any
-	 *  pending transaction is a valid transaction, and no longer a do-nothing transaction.
-	 *  
-	 *  Each transaction type uses a subclass of PendingTransaction to be an entry on the list.
-	 *  
-	 *  The pendings currently supported are:
-	 *  mark/endmark
-	 *  try/catch/endtry
-	 *  block/endblock
-	 *  
-	 *  See each individual transaction type to see how it is handled.
-	 */
-	protected List pendingTransactions;
-	
-	/**
-	 * PendingTransaction entry.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract static class PendingTransaction {
-		
-		/**
-		 * The transaction is now being pushed. The implementation should
-		 * actually do the push.
-		 * 
-		 * @param remExpression The REMExpression for this transaction.
-		 * 
-		 * @since 1.1.0
-		 */
-		public abstract void pushTransaction(REMExpression remExpression);
-	}
-	
-	/**
-	 * @param registry
-	 * 
-	 * @since 1.0.0
-	 */
-	public REMExpression(REMProxyFactoryRegistry registry) {
-		super(registry);
-	}
-	
-	/**
-	 * Return the expression id for this REMExpression. This id is used on the remote vm to
-	 * identify who the request is for.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected int getREMExpressionID() {
-		return this.hashCode();
-	}
-	/**
-	 * Get the pending transactions list.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected List getPendingTransactions() {
-		if (pendingTransactions == null)
-			pendingTransactions = new ArrayList();
-		return pendingTransactions;
-	}
-	
-	// Use this flag when debugging to test if errors are due to improper pending processing.
-	// If true they will be treated as if not pending and will be executed immediately.
-	private static final boolean EXECUTE_PENDING_IMMEDIATELY = false;
-	protected void addPendingTransaction(PendingTransaction pending) {
-		if (!EXECUTE_PENDING_IMMEDIATELY)
-			getPendingTransactions().add(pending);
-		else
-			pending.pushTransaction(this);
-	}
-
-	private boolean sentData;	// Flag to indicate if we have sent anything yet to the remote vm. This is used for the pending optimizations.
-	
-	/**
-	 * Have we sent any data in this transaction yet.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected boolean haveSentData() {
-		return sentData;
-	}
-	
-	/**
-	 * @return Returns the connection.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected IREMExpressionConnection getConnection() {
-		if (connection == null) {
-			if (!sentData)
-				getREMBeanProxyFactory().startTransaction();	// This is the first time we send data, so start transaction.
-			
-			sentData = true;	// If we are getting a transaction, that means we are sending data.
-			connection = (IREMExpressionConnection) getREMRegistry().getFreeConnection();
-			// This will actually not be stopped until closeproxy. There could be a slight problem if the expression is never closed.
-			// But that shouldn't happen. This is to prevent any proxy that was released during the execution but was used by
-			// the expression from being released on the remote vm until after the expression is finished.
-			try {
-				if (workerValue == null)
-					workerValue = new Commands.ValueObject();
-				if (expressionProcesserController == null) {
-					byte trace = !isTraceSet() ? ExpressionCommands.TRACE_DEFAULT : (isTrace() ? ExpressionCommands.TRACE_ON : ExpressionCommands.TRACE_OFF); 
-					connection.startExpressionProcessing(getREMExpressionID(), trace);	// It is a new expression.
-				} else {
-					fillProxy(expressionProcesserController, workerValue);
-					connection.resumeExpression(getREMExpressionID(), workerValue);
-					expressionProcesserController = null;
-				}
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				throwIllegalStateException(IO_EXCEPTION_MSG);
-			} catch (CommandException e) {
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				if (!e.isRecoverable()) {
-					connection.close();
-					connection = null;
-				}
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}	
-		}
-		return connection;
-	}
-
-	/**
-	 * General IOException occurred msg.
-	 */
-	protected static final String IO_EXCEPTION_MSG = ProxyRemoteMessages.REMExpression_IOExceptionSeeLog_INFO_; 
-	
-	protected static final String COMMAND_EXCEPTION_MSG = ProxyRemoteMessages.REMExpression_CommandExceptionSeeLog_INFO_; 
-	
-	/**
-	 * Throw an an illegal state exception if some general error, in particular an I/O or Command Exception
-	 * occurred so that callers know there is something wrong.
-	 * 
-	 * @param msg
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected void throwIllegalStateException(String msg) throws IllegalStateException {
-		throw new IllegalStateException(msg);
-	}
-	
-	/**
-	 * Return the registry as a REMProxyFactoryRegistry
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final REMProxyFactoryRegistry getREMRegistry() {
-		return (REMProxyFactoryRegistry) registry;
-	}
-	
-	/**
-	 * Return the bean proxy factory as a REMStandardBeanProxyFactory.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final REMStandardBeanProxyFactory getREMBeanProxyFactory() {
-		return (REMStandardBeanProxyFactory) beanProxyFactory;
-	}
-
-	/**
-	 * Process any pending transactions.
-	 * <p>
-	 * <b>Note: </b>It is required that all non-pending-participating transactions must
-	 * call this method first to make sure pending transactions are sent. If this is
-	 * not done, there will be errors in the expression.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void processPendingTransactions() {
-		if (pendingTransactions != null && !pendingTransactions.isEmpty()) {
-			try {
-				for (int i = 0; i < pendingTransactions.size(); i++) {
-					((PendingTransaction) pendingTransactions.get(i)).pushTransaction(this);
-				}
-			} finally {
-				pendingTransactions.clear();
-			}
-		}
-	}
-	
-	/**
-	 * Get the pending entry from top. If top is 1, then get top entry (i.e. last one added), 2 is next one. 
-	 * @param fromTop
-	 * @return entry requested, or <code>null</code> if no such entry.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected PendingTransaction getPendingEntryFromTop(int fromTop) {
-		if (pendingTransactions != null && pendingTransactions.size() >= fromTop) {
-			return (PendingTransaction) pendingTransactions.get(pendingTransactions.size()-fromTop);
-		} else
-			return null;
-	}
-	
-	/**
-	 * Pop up the top entry from the pending transactions queue.
-	 * @param fromTop how many entries to pop from the pending transaction list.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void popPendingEntry(int fromTop) {
-		if (pendingTransactions != null)
-			if (pendingTransactions.size() > fromTop) {
-				while(fromTop-- >0)
-					pendingTransactions.remove(pendingTransactions.size()-1);
-			} else
-				pendingTransactions.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushToProxy(org.eclipse.jem.internal.proxy.core.IProxy)
-	 */
-	protected void pushToProxy(IProxy proxy) {
-		if (proxy == null || proxy.isBeanProxy())
-			pushToProxy((IBeanProxy) proxy);
-		else
-			pushToExpressionProxy((ExpressionProxy) proxy);
-	}
-	
-	private void pushToProxy(IBeanProxy proxy) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push proxy command is:
-			//	PushExpressionCommand(push to proxy) followed by:
-			//		ValueObject containing the rendered proxy.
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_TO_PROXY_EXPRESSION_VALUE);
-			if (proxy == null)
-				workerValue.set();
-			else
-				((IREMBeanProxy) proxy).renderBean(workerValue);
-			connection.pushValueObject(workerValue);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#closeProxy()
-	 */
-	protected void closeProxy() {
-		if (!closed) {
-			try {
-				if (connection != null && connection.isConnected()) {
-					try {
-							connection.stopExpressionProcessing(getREMExpressionID());
-					} catch (IOException e) {
-						connection.close();
-						ProxyPlugin.getPlugin().getLogger().log(e, Level.INFO);
-						// Not throwing an illegal state here because we don't care, other than logging and not 
-						// returning the connection to the registry that there was an error on close.
-					} finally {
-						getREMRegistry().returnConnection(connection);
-					}
-				}
-			} finally {
-				closed = true;
-				if (sentData)
-					getREMBeanProxyFactory().stopTransaction();	// Resume proxy releases. We've sent data at least once.
-			}
-		}
-		methodsCache = null;
-		fieldsCache = null;
-		beanTypeCache = null;
-		pendingTransactions = null;
-		connection = null;
-	}
-	
-	private static final Object VOIDTYPE = new Object();	// A void type was sent in expression proxy resolution.
-	private static final Object NOTRESOLVED = new Object();	// A not resolved type was sent in expression proxy resolution.
-	
-	/*
-	 * Get the sender to use for pulling the expression proxy resolutions.
-	 */
-	private BeanProxyValueSender getExpressionProxiesSender() {
-		return new BeanProxyValueSender(getREMBeanProxyFactory()) {
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jem.internal.proxy.remote.BeanProxyValueSender#sendValue(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-			 */
-			public void sendValue(ValueObject value) {
-				if (value.getType() == Commands.FLAG) {
-					switch (value.anInt) {
-						case ExpressionCommands.EXPRESSIONPROXY_NOTRESOLVED:
-							array[index++] = NOTRESOLVED;
-							break;
-						case ExpressionCommands.EXPRESSIONPROXY_VOIDTYPE:
-							array[index++] = VOIDTYPE;
-							break;
-						default:
-							// Shouldn't happen.
-							break;
-					}
-				} else
-					super.sendValue(value);
-			}
-		};
-	}
-		
-	/*
-	 * Process the pulled expression proxy resolutions.
-	 */
-	private void processpulledExpressionProxies(List expressionProxies, BeanProxyValueSender sender) {
-
-		// It is expected that each entry will coorespond to the next non-null expression proxy and will be the bean proxy or one of the special
-		// types.
-		int len = expressionProxies.size();
-		int j = 0;
-		Object[] resolveds = sender.getArray();
-		for (int i = 0; i < len; i++) {
-			ExpressionProxy ep = (ExpressionProxy) expressionProxies.get(i);
-			if (ep != null) {
-				Object resolved = resolveds[j++];
-				if (resolved == NOTRESOLVED)
-					fireProxyNotResolved(ep);
-				else if (resolved == VOIDTYPE)
-					fireProxyVoid(ep);
-				else
-					fireProxyResolved(ep, (IBeanProxy) resolved);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pullProxyValue(int, java.util.List)
-	 */
-	protected IBeanProxy pullProxyValue(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException {
-		if (!haveSentData()) {
-			markAllProxiesNotResolved(expressionProxies);
-			return null;	// We haven't pushed any commands, so there is nothing to do. Don't create a connection for this.
-		}
-		// If there are any pending transactions at this point in time, there is no need to send them. They would be do nothings anyway.
-		
-		boolean processedExpressionProxies = false;
-		IREMExpressionConnection lclConnection = getConnection();
-		markInTransaction(lclConnection);
-		try {
-			Commands.ValueObject proxyids = null;
-			BeanProxyValueSender sender = null;
-			if (proxycount > 0) {
-				proxyids = createExpressionProxiesValueObject(proxycount, expressionProxies);
-				sender = getExpressionProxiesSender();
-			}
-			
-			lclConnection.pullValue(getREMExpressionID(), proxyids, sender);
-			// If we got this far, then if there are proxies, we need to process these too.
-			if (proxycount > 0)
-				processpulledExpressionProxies(expressionProxies, sender);
-			processedExpressionProxies =true;
-			lclConnection.getFinalValue(workerValue);	// Get the returned value.
-			return getREMBeanProxyFactory().getBeanProxy(workerValue);
-		} catch (CommandErrorException e) {
-			try {
-				if (e.getErrorCode() == ExpressionCommands.EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION) {
-					// Need to turn it into a Throwable.
-					ThrowableProxy t = null;
-					try {
-						getREMBeanProxyFactory().getBeanProxy(e.getValue());	// This will cause a throw to occur, but we don't want it going out, we want to capture it.
-					} catch (ThrowableProxy e1) {
-						t = e1;
-					}
-					throw new REMNoExpressionValueException(t);
-				}
-				getREMBeanProxyFactory().processErrorReturn(e);
-			} catch (CommandException e1) {
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				if (!e.isRecoverable()) {
-					lclConnection.close();
-					throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-				}			
-			}
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			if (!e.isRecoverable()) {
-				lclConnection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		} finally {
-			markEndTransaction(lclConnection);
-			if (!processedExpressionProxies)
-				markAllProxiesNotResolved(expressionProxies);	// We failed before we could process the expression proxies. So mark all as not resolved.
-		}
-		return null;
-	}
-	
-	/**
-	 * This is called by commands that write some data and will be reading data back immediately 
-	 * (i.e. pull value and invoke expression). If we are on a callback thread and have the 
-	 * used the connection from the callback thread, we need to tell the callback thread that
-	 * it is in a transaction. This is needed because while reading data back there are
-	 * sometimes calls back to the vm to get beantype data for new classes. This would 
-	 * normally be through a new connection so that it doesn't get stuck in the middle of the
-	 * data being sent back. But when running on a callback the same connection is used. So it
-	 * would stick data in the middle of the return stream of data. To prevent this we need
-	 * to tell the callback thread that it is in a transaction during this call so that any
-	 * such new connection requests will get a new connection.
-	 * <p>
-	 * This is not nestable (i.e. the first markEndTransaction will set it false, even if several nested
-	 * markInTransactions are called).
-	 * <p>
-	 * markEndTransaction must be called in ALL cases, such use try/finally.
-	 * @param remConnection the connection to see check against and mark in transaction for.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void markInTransaction(IREMExpressionConnection remConnection) {
-		Thread thread = Thread.currentThread();
-		if (thread instanceof REMCallbackThread) {
-			// We are in a callback, and the callback connection is our connection, tell the callback that it is in transaction.
-			REMCallbackThread callbackThread = (REMCallbackThread) thread;
-			if (callbackThread.getConnection() == remConnection) {
-				callbackThread.setIntransaction(true);
-			}
-		}
-	}
-	
-	/**
-	 * Mark end of transaction.
-	 * @param remConn REMConnection to test and mark not in connection for.
-	 * 
-	 * @see REMExpression#markInTransaction(IREMExpressionConnection)
-	 * @since 1.1.0
-	 */
-	protected void markEndTransaction(IREMExpressionConnection remConn) {
-		Thread thread = Thread.currentThread();
-		if (thread instanceof REMCallbackThread) {
-			// We are in a callback, and the callback connection is our connection, tell the callback that it is in transaction.
-			REMCallbackThread callbackThread = (REMCallbackThread) thread;
-			if (callbackThread.getConnection() == remConn) {
-				callbackThread.setIntransaction(false);
-			}
-		}		
-	}
-
-	/**
-	 * @param expressionProxies
-	 * 
-	 * @since 1.1.0
-	 */
-	private Commands.ValueObject createExpressionProxiesValueObject(int actualCount, List expressionProxies) {
-		class ExpressionProxyRetriever implements Commands.ValueRetrieve {
-			Iterator expressionProxiesItr;
-			Commands.ValueObject worker = new Commands.ValueObject();
-
-			public ExpressionProxyRetriever(List expressionProxies) {
-				this.expressionProxiesItr = expressionProxies.iterator();
-			}
-
-			public Commands.ValueObject nextValue() {
-				worker.set(-1);
-				while (expressionProxiesItr.hasNext()) {
-					Object parm = expressionProxiesItr.next();
-					if (parm != null) {
-						worker.set(((ExpressionProxy) parm).getProxyID());
-						break;
-					}
-				} 
-				return worker;
-			}
-		};
-
-		workerValue.setArrayIDS(new ExpressionProxyRetriever(expressionProxies), actualCount, Commands.INT);
-		return workerValue;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushCastToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	protected void pushCastToProxy(IProxyBeanType type) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push cast to proxy command is:
-			//	PushExpressionCommand(push cast to proxy) followed by:
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.CAST_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-		} catch (IOException e) {
-			connection.close();			
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/**
-	 * Push the proxy bean type in the format depending on expression proxy or beantype proxy.
-	 * @param type
-	 * @throws IOException
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fillProxy(IProxy type, Commands.ValueObject value) throws IOException {
-		//		ValueObject containing the rendered bean type proxy if IBeanTypeProxy or int (for expression proxy id) if expression proxy.
-		if (type.isBeanProxy()) {
-			((IREMBeanProxy) type).renderBean(value);
-		} else {
-			ExpressionProxy ep = (ExpressionProxy) type;
-			value.set(ep.getProxyID());
-		}
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushInstanceofToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	protected void pushInstanceofToProxy(IProxyBeanType type) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push instanceof to proxy command is:
-			//	PushExpressionCommand(push instanceof to proxy) followed by:
-			//		ValueObject containing the rendered bean type proxy or the String representing the name of class.
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.INSTANCEOF_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushInfixToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InfixOperator, int)
-	 */
-	protected void pushInfixToProxy(InfixOperator operator, InternalInfixOperandType operandType) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push infix to proxy command is:
-			//	PushExpressionCommand(push infix to proxy) followed by:
-			//		byte: operator
-			//		byte: operandType
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.INFIX_EXPRESSION_VALUE);
-			connection.pushByte((byte) operator.getValue());
-			connection.pushByte((byte) operandType.getValue());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}		
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushPrefixToProxy(org.eclipse.jem.internal.proxy.initParser.tree.PrefixOperator)
-	 */
-	protected void pushPrefixToProxy(PrefixOperator operator) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push prefix to proxy command is:
-			//	PushExpressionCommand(push prefix to proxy) followed by:
-			//		byte: operator
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PREFIX_EXPRESSION_VALUE);
-			connection.pushByte((byte) operator.getValue());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushArrayAccessToProxy(int)
-	 */
-	protected void pushArrayAccessToProxy(int indexCount) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push array access to proxy command is:
-			//	PushExpressionCommand(push array acces to proxy) followed by:
-			//		int: indexCount
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ARRAY_ACCESS_EXPRESSION_VALUE);
-			connection.pushInt(indexCount);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushArrayCreationToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
-	 */
-	protected void pushArrayCreationToProxy(IProxyBeanType type, int dimensionCount) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push array creation to proxy command is:
-			//	PushExpressionCommand(push array creation to proxy) followed by:
-			//		ValueObject containing the rendered bean type proxy or the expression proxy.
-			//		int: dimension count
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ARRAY_CREATION_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-			connection.pushInt(dimensionCount);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	protected void pushArrayInitializerToProxy(IProxyBeanType type, int stripCount, int expressionCount) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push array initializer to proxy command is:
-			//	PushExpressionCommand(push array initializer to proxy) followed by:
-			//		ValueObject containing the rendered bean type proxy or expression proxy.
-			//		int: strip count
-			//		int: expression count
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-			connection.pushInt(stripCount);
-			connection.pushInt(expressionCount);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushClassInstanceCreationToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
-	 */
-	protected void pushClassInstanceCreationToProxy(IProxyBeanType type, int argumentCount) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push class instance creation to proxy command is:
-			//	PushExpressionCommand(push class instance creation to proxy) followed by:
-			//		ValueObject containing the rendered bean type proxy or the expression proxy
-			//		int: argument count
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.CLASS_INSTANCE_CREATION_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-			connection.pushInt(argumentCount);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTypeReceiverToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */ 
-	protected void pushTypeReceiverToProxy(IProxyBeanType type) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push type receiver to proxy command is:
-			//	PushExpressionCommand(push type receiver to proxy) followed by:
-			//		ValueObject containing the rendered bean type proxy or the expression proxy.
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.TYPERECEIVER_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushFieldAccessToProxy(java.lang.String, boolean)
-	 */
-	protected void pushFieldAccessToProxy(Object field, boolean hasReceiver) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push field access to proxy command is:
-			//	PushExpressionCommand(push field access to proxy) followed by:
-			//		Commands.Value: fieldName or IProxyField
-			//		boolean: hasReceiver
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.FIELD_ACCESS_EXPRESSION_VALUE);
-			if (field instanceof String) {
-				workerValue.set((String) field);
-			} else {
-				fillProxy((IProxy) field, workerValue);
-			}
-			connection.pushValueObject(workerValue);
-			connection.pushBoolean(hasReceiver);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushMethodInvocationToProxy(java.lang.String, boolean, int)
-	 */
-	protected void pushMethodInvocationToProxy(Object method, boolean hasReceiver, int argCount) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push method invocation to proxy command is:
-			//	PushExpressionCommand(push method invocation to proxy) followed by:
-			//		Commands.ValueObject: methodName or IMethodProxy
-			//		boolean: hasReceiver
-			//		int: argCount
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.METHOD_EXPRESSION_VALUE);
-			if (method instanceof String) {
-				workerValue.set((String) method);
-			} else {
-				fillProxy((IProxy) method, workerValue);
-			}
-			connection.pushValueObject(workerValue);
-			connection.pushBoolean(hasReceiver);
-			connection.pushInt(argCount);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushConditionalToProxy(int)
-	 */
-	protected void pushConditionalToProxy(InternalConditionalOperandType expressionType) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push conditional to proxy command is:
-			//	PushExpressionCommand(push conditional to proxy) followed by:
-			//		byte: expression type
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.CONDITIONAL_EXPRESSION_VALUE);
-			connection.pushByte((byte) expressionType.getValue());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/*
-	 * A special one that takes the ThrowableProxy for no expression value and 
-	 * wrappers it prints its stack trace instead, but still makes it a subclass
-	 * of NoExpressionValueException.
-	 * 
-	 * @since 1.1.0
-	 */
-	private static class REMNoExpressionValueException extends NoExpressionValueException {
-		/**
-		 * Comment for <code>serialVersionUID</code>
-		 * 
-		 * @since 1.1.0
-		 */
-		private static final long serialVersionUID = 1692406777391812694L;
-
-
-		public REMNoExpressionValueException(ThrowableProxy e) {
-			super(e);
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Throwable#getLocalizedMessage()
-		 */
-		public String getLocalizedMessage() {
-			return ((ThrowableProxy) getCause()).getProxyLocalizedMessage();
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Throwable#getMessage()
-		 */
-		public String getMessage() {
-			return ((ThrowableProxy) getCause()).getProxyMessage();
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Throwable#printStackTrace()
-		 */
-		public void printStackTrace() {
-			getCause().printStackTrace();
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
-		 */
-		public void printStackTrace(PrintStream s) {
-			getCause().printStackTrace(s);
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
-		 */
-		public void printStackTrace(PrintWriter s) {
-			getCause().printStackTrace(s);
-		}
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushInvoke(int, java.util.List)
-	 */
-	protected void pushInvoke(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException {
-		if (!haveSentData()) {
-			markAllProxiesNotResolved(expressionProxies);
-			return;	// We haven't pushed any commands, so there is nothing to do. Don't create a connection for this.
-		}
-		// If at this point there are pending transactions, there is no need to send them because they would all be do-nothings.
-		
-		boolean processedExpressionProxies = false;
-		IREMExpressionConnection lclConnection = getConnection();
-		markInTransaction(lclConnection);
-		try {
-			Commands.ValueObject proxyids = null;
-			BeanProxyValueSender sender = null;
-			if (proxycount > 0) {
-				proxyids = createExpressionProxiesValueObject(proxycount, expressionProxies);
-				sender = getExpressionProxiesSender();
-			}
-
-			lclConnection.sync(getREMExpressionID(), proxyids, sender);
-			
-			// If we got this far, then if there are proxies, we need to process these too.
-			if (proxycount > 0)
-				processpulledExpressionProxies(expressionProxies, sender);
-			processedExpressionProxies = true;
-			lclConnection.getFinalValue(workerValue);	// We don't care what it is, we just need to see if there is an error.
-		} catch (CommandErrorException e) {
-			try {
-				if (e.getErrorCode() == ExpressionCommands.EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION) {
-					// Need to turn it into a Throwable.
-					ThrowableProxy t = null;
-					try {
-						getREMBeanProxyFactory().getBeanProxy(e.getValue());	// This will cause a throw to occur, but we don't want it going out, we want to capture it.
-					} catch (ThrowableProxy e1) {
-						t = e1;
-					}
-					throw new REMNoExpressionValueException(t);
-				}
-				getREMBeanProxyFactory().processErrorReturn(e);
-			} catch (CommandException e1) {
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				if (!e.isRecoverable()) {
-					lclConnection.close();
-					throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-				}			
-			}
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			if (!e.isRecoverable()) {
-				lclConnection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		} finally {
-			markEndTransaction(lclConnection);
-			if (!processedExpressionProxies)
-				markAllProxiesNotResolved(expressionProxies);	// We failed before we could process the expression proxies. So mark all as not resolved.
-		}
-	}
-
-	private static class REMBeanTypeExpressionProxy extends ExpressionProxy implements IBeanTypeExpressionProxy {
-		
-		private String typeName;
-		
-		/**
-		 * @param proxyid
-		 * 
-		 * @since 1.1.0
-		 */
-		private REMBeanTypeExpressionProxy(int proxyid, Expression expression) {
-			super(proxyid, BEANTYPE_EXPRESSION_PROXY, expression);
-		}
-		
-		public void setTypeName(String typeName) {
-			this.typeName = typeName;
-		}
-		
-		public String getTypeName() {
-			return typeName;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
-		 */
-		public String toString() {
-			return super.toString()+" - "+getTypeName(); //$NON-NLS-1$
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
-		 */
-		public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes) {
-			REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-			return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
-		 */
-		public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
-			REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-			return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
-		}
-		
-		public IProxyMethod getMethodProxy(IExpression expression, String methodName) {
-			return getMethodProxy(expression, methodName, (IProxyBeanType[]) null);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
-		 */
-		public IProxyField getFieldProxy(IExpression expression, String fieldName) {
-			REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-			return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getFieldProxy(expression, this, fieldName);
-		}
-	}
-	
-	private static class REMMethodExpressionProxy extends ExpressionProxy implements IProxyMethod {
-		
-			/**
-		 * @param proxyid
-		 * @param proxyType
-		 * @param expression
-		 * 
-		 * @since 1.1.0
-		 */
-		private REMMethodExpressionProxy(int proxyid, Expression expression) {
-			super(proxyid, METHOD_EXPRESSION_PROXY, expression);
-		}
-	}
-	
-	private static class REMFieldExpressionProxy extends ExpressionProxy implements IProxyField {
-		
-			/**
-		 * @param proxyid
-		 * @param proxyType
-		 * @param expression
-		 * 
-		 * @since 1.1.0
-		 */
-		private REMFieldExpressionProxy(int proxyid, Expression expression) {
-			super(proxyid, FIELD_EXPRESSION_PROXY, expression);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#createExpressionProxy(int)
-	 */
-	protected ExpressionProxy createExpressionProxy(int proxyType, int proxyID) {
-		switch (proxyType) {
-			case NORMAL_EXPRESSION_PROXY:
-			default:
-				return new ExpressionProxy(proxyID, NORMAL_EXPRESSION_PROXY, this);
-			
-			case BEANTYPE_EXPRESSION_PROXY:
-				return new REMBeanTypeExpressionProxy(proxyID, this);
-				
-			case METHOD_EXPRESSION_PROXY:
-				return new REMMethodExpressionProxy(proxyID, this);
-				
-			case FIELD_EXPRESSION_PROXY:
-				return new REMFieldExpressionProxy(proxyID, this);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushAssignmentToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy)
-	 */
-	protected void pushAssignmentToProxy(ExpressionProxy proxy) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push assignment to proxy command is:
-			//	PushExpressionCommand(push assignment to proxy) followed by:
-			//		int: proxy id
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION_VALUE);
-			connection.pushInt(proxy.getProxyID());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushAssignmentToProxy()
-	 */
-	protected void pushAssignmentToProxy() {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of the push assignment command is:
-			//   PushAssignmentCommand.
-			connection.pushExpressionCommand(getREMExpressionID(), (byte) InternalExpressionTypes.ASSIGNMENT_EXPRESSION_VALUE);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-	
-
-	private void pushToExpressionProxy(ExpressionProxy proxy) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to expression proxy command is:
-			//	PushExpressionCommand(push expression proxy to proxy) followed by:
-			//		int: proxy id
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE);
-			connection.pushInt(proxy.getProxyID());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-
-	}
-	
-	private static class BlockBegin extends PendingTransaction {
-		public int blockNumber;
-		
-		public BlockBegin(int blockNumber) {
-			this.blockNumber = blockNumber;
-		}
-		
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push to block begin proxy command is:
-				//	PushExpressionCommand(push block begin proxy to proxy) followed by:
-				//		int: block id
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.BLOCK_BEGIN_EXPRESSION_VALUE);
-				connection.pushInt(blockNumber);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			}			
-		}
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockBeginToProxy(int)
-	 */
-	protected void pushBlockBeginToProxy(int blockNumber) {
-		addPendingTransaction(new BlockBegin(blockNumber));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockEndToProxy(int)
-	 */
-	protected void pushBlockEndToProxy(int blockNumber) {
-		// See if the top pending transactions is BreakBlock(blockNumber). If it is then the BreakBlock can be thrown away.
-		PendingTransaction topEntry = getPendingEntryFromTop(1);
-		if (topEntry instanceof BlockBreak && ((BlockBreak) topEntry).blockNumber == blockNumber) {
-			popPendingEntry(1);
-			topEntry = getPendingEntryFromTop(1);
-		}
-		// See if the top pending transaction is now BeginBlock(blockNumber). If it is, then this transaction and the block begin
-		// can be thrown away because they are an empty block.
-		if (topEntry instanceof BlockBegin && ((BlockBegin) topEntry).blockNumber == blockNumber) {
-			popPendingEntry(1);
-			return;
-		}
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to block end proxy command is:
-			//	PushExpressionCommand(push block end proxy to proxy) followed by:
-			//		int: block id
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.BLOCK_END_EXPRESSION_VALUE);
-			connection.pushInt(blockNumber);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-	
-	private static class BlockBreak extends PendingTransaction {
-		public int blockNumber;
-		
-		public BlockBreak(int blockNumber) {
-			this.blockNumber = blockNumber;
-		}
-		
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push to block break proxy command is:
-				//	PushExpressionCommand(push block break proxy to proxy) followed by:
-				//		int: block id
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.BLOCK_BREAK_EXPRESSION_VALUE);
-				connection.pushInt(blockNumber);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			}
-		}		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockBreakToProxy(int)
-	 */
-	protected void pushBlockBreakToProxy(int blockNumber) {
-		// Even if there is no pending block begin for this block, we will pend the break.
-		// This is so that if the break occurred just before the block end, then it can be ignored.
-		addPendingTransaction(new BlockBreak(blockNumber));
-	}
-
-	private static class TryBegin extends PendingTransaction {
-
-		public final int tryNumber;
-		
-		public TryBegin(int tryNumber) {
-			this.tryNumber = tryNumber;
-			
-		}
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push to try begin proxy command is:
-				//	PushExpressionCommand(push try begin to proxy) followed by:
-				//		int: try id
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.TRY_BEGIN_EXPRESSION_VALUE);
-				connection.pushInt(tryNumber);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			}
-		}
-		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryBeginToProxy(int)
-	 */
-	protected void pushTryBeginToProxy(int tryNumber) {
-		addPendingTransaction(new TryBegin(tryNumber));
-	}
-
-	private static class TryCatch extends PendingTransaction {
-
-		public final int tryNumber;
-		private final IProxyBeanType exceptionType;
-		private final ExpressionProxy ep;
-
-		public TryCatch(int tryNumber, IProxyBeanType exceptionType, ExpressionProxy ep) {
-			this.tryNumber = tryNumber;
-			this.exceptionType = exceptionType;
-			this.ep = ep;
-		}
-		
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push to try begin proxy command is:
-				//	PushExpressionCommand(push try begin to proxy) followed by:
-				//		int: try id
-				//		object: expression type (as beantype or as expression proxy)
-				//		int: proxy id or (-1 if null).
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.TRY_CATCH_EXPRESSION_VALUE);
-				connection.pushInt(tryNumber);
-				remExpression.fillProxy(exceptionType, remExpression.workerValue);
-				connection.pushValueObject(remExpression.workerValue);
-				if (ep != null)
-					connection.pushInt(ep.getProxyID());
-				else
-					connection.pushInt(-1);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			} catch (CommandException e) {
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				if (!e.isRecoverable()) {
-					connection.close();
-					remExpression.throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-				}			
-			}
-		}
-		
-	}
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryCatchClauseToProxy(int, org.eclipse.jem.internal.proxy.core.IProxyBeanType, org.eclipse.jem.internal.proxy.core.ExpressionProxy)
-	 */
-	protected void pushTryCatchClauseToProxy(int tryNumber, IProxyBeanType exceptionType, ExpressionProxy ep) {
-		addPendingTransaction(new TryCatch(tryNumber, exceptionType, ep));
-	}
-
-	private static class TryFinally extends PendingTransaction {
-		
-		public final int tryNumber;
-
-		public TryFinally(int tryNumber) {
-			this.tryNumber = tryNumber;
-			
-		}
-
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push to try begin proxy command is:
-				//	PushExpressionCommand(push try finally to proxy) followed by:
-				//		int: try id
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.TRY_FINALLY_EXPRESSION_VALUE);
-				connection.pushInt(tryNumber);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			}
-		}
-		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryFinallyClauseToProxy(int)
-	 */
-	protected void pushTryFinallyClauseToProxy(int tryNumber) {
-		addPendingTransaction(new TryFinally(tryNumber));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryEndToProxy(int)
-	 */
-	protected void pushTryEndToProxy(int tryNumber) {
-		// This is a little tricky. We need to find if there is nothing but try/catch/finally for this tryNumber on the pending
-		// transactions up to the try begin, if there is nothing else, then we can throw the entire try away. That
-		// means there was no code at all in any of the try/catch/finally blocks.
-		int fromTop = 0;
-		while (true) {
-			PendingTransaction topEntry = getPendingEntryFromTop(++fromTop);
-			if (topEntry instanceof TryFinally) {
-				if (((TryFinally) topEntry).tryNumber != tryNumber)
-					break;	// We met a finally that wasn't ours, so entire try group must be sent.
-			} else if (topEntry instanceof TryCatch) {
-				if (((TryCatch) topEntry).tryNumber != tryNumber)
-					break;	// We met a catch that wasn't ours, so entire try group must be sent.
-			} else if (topEntry instanceof TryBegin) {
-				if (((TryBegin) topEntry).tryNumber == tryNumber) {
-					// We've met our try begin, and nothing but empty catch/finally in between, so the entire group can be thrown away
-					popPendingEntry(fromTop);
-					return;
-				} else
-					break;	// We've hit a try begin that wasn't ours, so the entire try group must be sent.	
-			} else
-				break;	// We've hit something other than our try group, so process everything.
-		}
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to try begin proxy command is:
-			//	PushExpressionCommand(push try end to proxy) followed by:
-			//		int: try id
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.TRY_END_EXPRESSION_VALUE);
-			connection.pushInt(tryNumber);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushThrowToProxy()
-	 */
-	protected void pushThrowToProxy() {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to try begin proxy command is:
-			//	PushExpressionCommand(push throw to proxy)
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.THROW_EXPRESSION_VALUE);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushRethrowToProxy(int)
-	 */
-	protected void pushRethrowToProxy(int tryNumber) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to rethow proxy command is:
-			//	PushExpressionCommand(push rethrow to proxy)
-			//		int: try id
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.RETHROW_EXPRESSION_VALUE);
-			connection.pushInt(tryNumber);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBeanTypeToProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeExpressionProxy)
-	 */
-	protected void pushBeanTypeToProxy(IBeanTypeExpressionProxy proxy) {
-		// Push beantype to proxy is sent out of sequence without respect to where in expression we are,
-		// so no need to handle pending transactions at this point. They would not affect the result
-		// of this call.
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to beanType proxy command is:
-			//	PushExpressionCommand(push bean type expression proxy)
-			//		int: proxy id
-			//		string: typename
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE);
-			REMBeanTypeExpressionProxy ep = (REMBeanTypeExpressionProxy) proxy;
-			connection.pushInt(ep.getProxyID());
-			connection.pushString(ep.getTypeName());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushMethodToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy, org.eclipse.jem.internal.proxy.core.IProxyBeanType, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
-	 */
-	protected void pushMethodToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes) {
-		// Push method to proxy is sent out of sequence without respect to where in expression we are,
-		// so no need to handle pending transactions at this point. They would not affect the result
-		// of this call.
-
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to method proxy command is:
-			//	PushExpressionCommand(push method type expression proxy)
-			//		int: proxy id
-			//		ValueObject: containing the rendered bean type proxy or the expression proxy for the declaring type
-			//		string: method name
-			//		int: number of parameter types
-			//		ValueObject(s): containing the rendered bean type proxy or the expression proxy for the parameter types.
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE);
-			connection.pushInt(proxy.getProxyID());
-			fillProxy(declaringType, workerValue);
-			connection.pushValueObject(workerValue);
-			connection.pushString(methodName);
-			if (parameterTypes == null || parameterTypes.length == 0)
-				connection.pushInt(0);
-			else {
-				connection.pushInt(parameterTypes.length);
-				for (int i = 0; i < parameterTypes.length; i++) {
-					fillProxy(parameterTypes[i], workerValue);
-					connection.pushValueObject(workerValue);					
-				}
-			}
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushFieldToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy, org.eclipse.jem.internal.proxy.core.IProxyBeanType, java.lang.String)
-	 */
-	protected void pushFieldToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String fieldName) {
-		// Push field to proxy is sent out of sequence without respect to where in expression we are,
-		// so no need to handle pending transactions at this point. They would not affect the result
-		// of this call.
-
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to field proxy command is:
-			//	PushExpressionCommand(push field type expression proxy)
-			//		int: proxy id
-			//		ValueObject: containing the rendered bean type proxy or the expression proxy for the declaring type
-			//		string: field name
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE);
-			connection.pushInt(proxy.getProxyID());
-			fillProxy(declaringType, workerValue);
-			connection.pushValueObject(workerValue);
-			connection.pushString(fieldName);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-	
-	/**
-	 * Get the map of IProxyMethods for a beantype. Meant to be used only in conjunction with REMProxyConstants.
-	 * It is here so the REMProxyConstants can store pending proxies per expression.
-	 * 
-	 * @param beanType
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public Map getMethods(IProxyBeanType beanType) {
-		if (methodsCache == null)
-			methodsCache = new HashMap();
-		Map methods = (Map) methodsCache.get(beanType.getTypeName());
-		if(methods == null){
-			methods = new HashMap(20);
-			methodsCache.put(beanType.getTypeName(),methods);
-		}
-		return methods;	
-	}
-	
-	/**
-	 * Get the map of IProxyFields for a beantype. Meant to be used only in conjunction with REMProxyConstants.
-	 * It is here so the REMProxyConstants can store pending proxies per expression.
-	 * 
-	 * @param beanType
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public Map getFields(IProxyBeanType beanType) {
-		if (fieldsCache == null)
-			fieldsCache = new HashMap();
-		Map fields = (Map) fieldsCache.get(beanType.getTypeName());
-		if(fields == null){
-			fields = new HashMap(20);
-			fieldsCache.put(beanType.getTypeName(),fields);
-		}
-		return fields;	
-	}
-	
-	/**
-	 * Get the map of IProxyBeanTypes for a beantype name. Meant to be used only in conjunction with REMSgtandardBeanTypeFactory.
-	 * It is here so the REMStandardBeanTypeFactory can store pending proxies per expression.
-	 * 
-	 * @param beanType
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyBeanType getBeanType(String beanTypeName) {
-		if (beanTypeCache == null)
-			beanTypeCache = new HashMap();
-		return (IProxyBeanType) beanTypeCache.get(beanTypeName);
-	}
-	
-	/**
-	 * Add the beantype expression proxy to the map of bean type expression proxies. Used in conjunction with REMStandardBeanTypeFactory.
-	 * It is here so the REMStandardBeanTypeFactory can store pending proxies per expression.
-	 * @param beanTypeName
-	 * @param beantype
-	 * 
-	 * @since 1.1.0
-	 */
-	public void addBeanType(String beanTypeName, IProxyBeanType beantype) {
-		beanTypeCache.put(beanTypeName, beantype);
-	}
-	
-	/**
-	 * Remove the beantype expression proxy from the map. This is called because there was a rollback due to an endmark.
-	 * @param beanTypeName
-	 * 
-	 * @since 1.1.0
-	 */
-	public void removeBeanType(String beanTypeName) {
-		beanTypeCache.remove(beanTypeName);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushIfTestToProxy()
-	 */
-	protected void pushIfTestToProxy() {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push if test to proxy command is:
-			//	PushExpressionCommand(push if test to proxy)
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.IF_TEST_EXPRESSION_VALUE);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushIfElseToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InternalIfElseOperandType)
-	 */
-	protected void pushIfElseToProxy(InternalIfElseOperandType clauseType) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push conditional to proxy command is:
-			//	PushExpressionCommand(push if/else clause to proxy) followed by:
-			//		byte: clause type
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.IF_ELSE_EXPRESSION_VALUE);
-			connection.pushByte((byte) clauseType.getValue());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushNewInstanceToProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	protected void pushNewInstanceToProxy(String initializationString, IProxyBeanType resultType) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push new instance from initstring to proxy command is:
-			//	PushExpressionCommand(push new instance to proxy) followed by:
-			//		string: init string
-			//		ValueObject: containing the rendered bean type proxy or the expression proxy for the declaring type
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.NEW_INSTANCE_VALUE);
-			connection.pushString(initializationString);
-			fillProxy(resultType, workerValue);
-			connection.pushValueObject(workerValue);			
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	private static class Mark extends PendingTransaction {
-		public int markID;
-		
-		public Mark(int markID) {
-			this.markID = markID;
-		}
-		
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push mark to proxy command is:
-				//	PushExpressionCommand(push mark to proxy) followed by:
-				//		int: markID
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.MARK_VALUE);
-				connection.pushInt(markID);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			}
-		}
-		
-	}
-	
-	protected void pushMarkToProxy(int markID) {
-		addPendingTransaction(new Mark(markID));
-	}
-
-	protected void pushEndmarkToProxy(int markID, boolean restore) {
-		// See if the top pending transaction is now Mark(markID). If it is, then this transaction and the mark begin
-		// can be thrown away because they are an empty block.
-		PendingTransaction topEntry = getPendingEntryFromTop(1);
-		if (topEntry instanceof Mark && ((Mark) topEntry).markID == markID) {
-			popPendingEntry(1);
-			return;
-		}
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push end mark to proxy command is:
-			//	PushExpressionCommand(push end mark to proxy) followed by:
-			//		int: markID
-			//		boolean: restore
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ENDMARK_VALUE);
-			connection.pushInt(markID);
-			connection.pushBoolean(restore);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	// This is the expression processor controller used to transfer.
-	// This is the guy that maintains continuity of the transaction as
-	// it is passed from one connection to another.
-	protected IBeanProxy expressionProcesserController;	
-	protected void pushBeginTransferThreadToProxy() throws ThrowableProxy {
-		// If the controller is not null, that means we had already requested a transfer
-		// but had not used it in this thread so there is no need to do anything. It
-		// will be handled when switching back to the other thread.
-		// If the connection is null, no need to do anything since there is no connection
-		// to transfer.
-		if (connection != null && expressionProcesserController == null) {
-			IREMExpressionConnection lclConnection = getConnection();
-			markInTransaction(lclConnection);
-			try {
-				workerValue.set();
-				lclConnection.transferExpression(getREMExpressionID(), workerValue);
-				expressionProcesserController = getREMBeanProxyFactory().getBeanProxy(workerValue);
-				getREMRegistry().returnConnection(lclConnection);
-				this.connection = null;
-			} catch (CommandException e) {
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				if (!e.isRecoverable()) {
-					lclConnection.close();
-					throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-				}			
-			} finally {
-				markEndTransaction(lclConnection);
-			}
-		}
-	}
-
-	protected void pushTransferThreadToProxy() {
-		// Don't need to do anything. The next time we need to push data across, we will get a connection and the getConnection()
-		// will hook up the expression processor controller for us. This way if nothing happens in this thread then we won't
-		// waste communication time on it.
-	}
-
-	private static class SubexpressionBegin extends PendingTransaction {
-		public int subexpressionNumber;
-		
-		public SubexpressionBegin(int subexpressionNumber) {
-			this.subexpressionNumber = subexpressionNumber;
-		}
-		
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push to subexpression begin proxy command is:
-				//	PushExpressionCommand(push subexpression begin proxy to proxy) followed by:
-				//		int: subexpression id
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.SUBEXPRESSION_BEGIN_EXPRESSION_VALUE);
-				connection.pushInt(subexpressionNumber);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			}			
-		}
-		
-	}
-
-	protected void pushSubexpressionBeginToProxy(int subexpressionNumber) {
-		addPendingTransaction(new SubexpressionBegin(subexpressionNumber));
-	}
-
-	protected void pushSubexpressionEndToProxy(int subexpressionNumber) {
-		// See if the top pending transactions is SubexpressionBegin(subexpressionNumber). If it is then the SubexpressionBegin can be thrown away.
-		PendingTransaction topEntry = getPendingEntryFromTop(1);
-		if (topEntry instanceof SubexpressionBegin && ((SubexpressionBegin) topEntry).subexpressionNumber == subexpressionNumber) {
-			popPendingEntry(1);
-			return;
-		}
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to block end proxy command is:
-			//	PushExpressionCommand(push subexpression end proxy to proxy) followed by:
-			//		int: subexpression id
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.SUBEXPRESSION_END_EXPRESSION_VALUE);
-			connection.pushInt(subexpressionNumber);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-		}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldProxy.java
deleted file mode 100644
index b99a5968a..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldProxy.java
+++ /dev/null
@@ -1,106 +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.proxy.remote;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-final class REMFieldProxy extends REMAccessibleObjectProxy implements IFieldProxy {
-	private IBeanTypeProxy fFieldType;
-
-	REMFieldProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
-		super(aRegistry, anID);
-	}
-
-	/**
-	 * Return the type of the field.
-	 */
-	public IBeanTypeProxy getFieldType() {
-		if (fFieldType == null)
-			fFieldType =
-				(IBeanTypeProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetType().invokeCatchThrowableExceptions(
-					this);
-
-		return fFieldType;
-	}
-
-	/**
-	 * Release the proxy, i.e. mark it invalid.
-	 */
-	public void release() {
-		fFieldType = null;
-		super.release();
-	}
-
-	/**
-	 * Get the value of this field from the subject
-	 */
-	public IBeanProxy get(IBeanProxy subject) throws ThrowableProxy {
-		// Format of getter parms is: (Object (subject)).
-		// If the component type is primitive, we need to use the correct getter so that a valid value is returned,
-		// if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
-		IBeanTypeProxy fieldType = getFieldType();
-		if (!fieldType.isPrimitive()) {
-			// Use standard getter.
-			return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGet()).invoke(this, subject);
-		} else {
-			// Use the correct primitive getter.
-			int id = ((IREMBeanProxy) fieldType).getID().intValue();
-			switch (id) {
-				case Commands.BYTE_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetByte()).invoke(this, subject);
-				case Commands.BOOLEAN_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetBoolean()).invoke(
-						this,
-						subject);
-				case Commands.CHARACTER_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetChar()).invoke(this, subject);
-				case Commands.DOUBLE_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetDouble()).invoke(
-						this,
-						subject);
-				case Commands.FLOAT_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetFloat()).invoke(
-						this,
-						subject);
-				case Commands.INTEGER_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetInt()).invoke(this, subject);
-				case Commands.LONG_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetLong()).invoke(this, subject);
-				case Commands.SHORT_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetShort()).invoke(
-						this,
-						subject);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Set the value of this field in this subject to this value.
-	 */
-	public void set(IBeanProxy subject, IBeanProxy value) throws ThrowableProxy {
-		REMStandardBeanProxyConstants.getConstants(fFactory).getFieldSet().invoke(this, new IBeanProxy[] { subject, value });
-	}
-
-	/**
-	 * The type proxy is constant proxy out of the method factory.
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).fieldType;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldTypeProxy.java
deleted file mode 100644
index 06f6670ea..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldTypeProxy.java
+++ /dev/null
@@ -1,67 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Method class.
- */
-
-final class REMFieldTypeProxy extends REMAbstractBeanTypeProxy {
-
-REMFieldTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy accessibleTypeProxy) {
-	super(aRegistry, new Integer(Commands.FIELD_CLASS), java.lang.reflect.Field.class.getName(), accessibleTypeProxy);
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the accessible object types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Specialized from REMAbstractBeanTypeProxy to ensure Constructor proxies are created correctly.
- */
-public IREMBeanProxy newBeanProxy(Integer objectID) {
-	return new REMFieldProxy(fRegistry, objectID);
-}
-
-/**
- * Note: Since new instances of Constructor are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() { 
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Constructor are never done through an initialization string,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
-	throw new UnsupportedOperationException();
-}		
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanProxy.java
deleted file mode 100644
index ab325e3f5..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanProxy.java
+++ /dev/null
@@ -1,44 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote proxy implementation of INumberBeanProxy for Float.class
- */
-class REMFloatClassBeanProxy extends REMNumberBeanProxy {
-
-REMFloatClassBeanProxy(REMProxyFactoryRegistry aRegistry, Float aFloat) {
-	super(aRegistry, aFloat);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).floatClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Float) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanTypeProxy.java
deleted file mode 100644
index da271beec..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanTypeProxy.java
+++ /dev/null
@@ -1,74 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypePRoxy for Float.class
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMFloatClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMFloatClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.FLOAT_CLASS), Float.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMFloatClassBeanProxy(aRegistry, new Float(0F));	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createFloatBeanProxy(Float aFloat) {
-	return (aFloat.floatValue() != 0F) ?
-		new REMFloatClassBeanProxy(fRegistry, aFloat) : zeroProxy;
-}
-
-/**
- * Generic way to create an Float proxy, however, the Number must be a Float.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createFloatBeanProxy((Float) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createFloatBeanProxy(new Float(value.aFloat));
-}	
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanProxy.java
deleted file mode 100644
index 67fab4107..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanProxy.java
+++ /dev/null
@@ -1,131 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for the primitive "float".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMFloatTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final float fFloat;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMFloatTypeBeanProxy(REMProxyFactoryRegistry aRegistry, float aFloat) {
-	super(aRegistry);
-	fFloat = aFloat;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMFloatTypeBeanProxy)
-		return fFloat == ((REMFloatTypeBeanProxy) anObject).floatValue();
-	if (anObject instanceof Double)
-		return fFloat == ((Float) anObject).floatValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMFloatTypeBeanProxy)
-		return fFloat == ((REMFloatTypeBeanProxy) aBeanProxy).floatValue();
-	return false;
-}
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return (byte) fFloat;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fFloat;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fFloat;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return (int) fFloat;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return (long) fFloat;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Float(fFloat);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return (short) fFloat;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fFloat);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).floatType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fFloat);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanTypeProxy.java
deleted file mode 100644
index edc7eb193..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,98 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Float.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMFloatTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMFloatTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.FLOAT_TYPE), Float.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMFloatTypeBeanProxy(aRegistry, 0F);		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createFloatBeanProxy(float aFloat) {
-	return (aFloat != 0F) ?
-		new REMFloatTypeBeanProxy(fRegistry, aFloat) : zeroProxy;
-}
-
-/**
- * newInstance method. float is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createFloatBeanProxy(value.aFloat);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (float) validNumber - number can be any number because (float) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of float to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);	
-	float aFloat;
-	if (trim.startsWith("(float)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(float)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			aFloat = v.floatValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		try {
-			aFloat = Float.valueOf(initializationString).floatValue();	// See if valid float format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aFloat);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInitErrorBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInitErrorBeanTypeProxy.java
deleted file mode 100644
index d70efd2fd..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInitErrorBeanTypeProxy.java
+++ /dev/null
@@ -1,469 +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.proxy.remote;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * A special bean type proxy. It is for those bean types that had an instantiation error while being initialized. It is so we have the message. All
- * other actions against it will fail.
- * 
- * @author richkulp
- */
-public class REMInitErrorBeanTypeProxy implements IREMBeanTypeProxy {
-
-	protected final String initializationError;
-
-	protected final REMProxyFactoryRegistry registry;
-
-	protected final String classname;
-
-	/**
-	 * Constructor for REMInitErrorBeanTypeProxy.
-	 */
-	public REMInitErrorBeanTypeProxy(REMProxyFactoryRegistry registry, String initializationError, String classname) {
-		super();
-		this.registry = registry;
-		this.initializationError = initializationError;
-		this.classname = classname;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxy#newBeanProxy(java.lang.Integer)
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxy#newBeanTypeForClass(java.lang.Integer, java.lang.String, boolean)
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IConstructorProxy[] getConstructors() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IConstructorProxy[] getDeclaredConstructors() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IFieldProxy[] getFields() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IFieldProxy[] getDeclaredFields() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFieldProxy(java.lang.String)
-	 */
-	public IFieldProxy getFieldProxy(String fieldName) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getDeclaredFieldProxy(java.lang.String)
-	 */
-	public IFieldProxy getDeclaredFieldProxy(String fieldName) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IMethodProxy[] getMethods() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IMethodProxy[] getDeclaredMethods() {
-		return null;
-	}
-
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String)
-	 */
-	public IMethodProxy getMethodProxy(String methodName) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String[])
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String)
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String argumentClassName) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String[])
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getNullConstructorProxy()
-	 */
-	public IConstructorProxy getNullConstructorProxy() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getProxyFactoryRegistry()
-	 */
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return registry;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getSuperBeanTypeProxy()
-	 */
-	public IBeanTypeProxy getSuperBeanTypeProxy() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getTypeName()
-	 */
-	public String getTypeName() {
-		return classname;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFormalTypeName()
-	 */
-	public String getFormalTypeName() {
-		return getTypeName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isArray()
-	 */
-	public boolean isArray() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isInterface()
-	 */
-	public boolean isInterface() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isPrimitive()
-	 */
-	public boolean isPrimitive() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isKindOf(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy)
-	 */
-	public boolean isKindOf(IBeanTypeProxy aBeanProxyType) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance()
-	 */
-	public IBeanProxy newInstance() throws ThrowableProxy {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance(java.lang.String)
-	 */
-	public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInitializationError()
-	 */
-	public String getInitializationError() {
-		return initializationError;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#getID()
-	 */
-	public Integer getID() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#release()
-	 */
-	public void release() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#renderBean(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void renderBean(Commands.ValueObject renderInto) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getTypeProxy()
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#toBeanString()
-	 */
-	public String toBeanString() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#isValid()
-	 */
-	public boolean isValid() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		return this == aBeanProxy; // This is place holder anyway. So only identical if same proxy.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IInvokable getInvokable(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String)
-	 */
-	public IInvokable getInvokable(String methodName, String argumentClassName) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String[])
-	 */
-	public IInvokable getInvokable(String methodName, String[] argumentClassNames) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String)
-	 */
-	public IInvokable getInvokable(String methodName) {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameters) {
-		return null;	// Since this guy is invalid, we can't return a method.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
-		return null;
-	}
-	
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
-	 */
-	public IProxyField getFieldProxy(IExpression expression, String fieldName) {
-		return null;
-	}
-	
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanProxy.java
deleted file mode 100644
index 790596823..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanProxy.java
+++ /dev/null
@@ -1,49 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Integers. Since Integers were first implemented
- * in the VCE, and because they are often referenced, we've created
- * a subclass to handle them. That way we wouldn't need to change
- * everyone that was using the IIntegerProxy interface.
- * Creation date: (08/31/00 11:28:48 AM)
- * @author: Administrator
- */
-class REMIntegerClassBeanProxy extends REMNumberBeanProxy implements IIntegerBeanProxy {
-
-REMIntegerClassBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anInteger) {
-	super(aRegistry, anInteger);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).integerClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Integer) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanTypeProxy.java
deleted file mode 100644
index 7e5d6cc5d..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanTypeProxy.java
+++ /dev/null
@@ -1,85 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of INumberBeanProxy for Integer.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMIntegerClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final IIntegerBeanProxy zeroProxy;
-	private final IIntegerBeanProxy oneProxy;
-	private final IIntegerBeanProxy twoProxy;
-	private final IIntegerBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMIntegerClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.INTEGER_CLASS), Integer.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(0));	
-	oneProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(1));
-	twoProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(2));
-	threeProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(3));
-		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-IIntegerBeanProxy createIntegerBeanProxy(Integer anInteger) {
-	switch(anInteger.intValue()) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMIntegerClassBeanProxy(fRegistry, anInteger);
-	}
-}
-
-/**
- * Generic way to create an Integer proxy, however, the Number must be an Integer.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createIntegerBeanProxy((Integer) aNumber);
-}	
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createIntegerBeanProxy(new Integer(value.anInt));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanProxy.java
deleted file mode 100644
index e80dcc1ec..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanProxy.java
+++ /dev/null
@@ -1,132 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of IIntegerBeanProxy for the primitive "int".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMIntegerTypeBeanProxy extends REMConstantBeanProxy implements IIntegerBeanProxy {
-	private final int fInt;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMIntegerTypeBeanProxy(REMProxyFactoryRegistry aRegistry, int anInt) {
-	super(aRegistry);
-	fInt = anInt;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMIntegerTypeBeanProxy)
-		return fInt == ((REMIntegerTypeBeanProxy) anObject).intValue();
-	if (anObject instanceof Integer)
-		return fInt == ((Integer) anObject).intValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMIntegerTypeBeanProxy)
-		return fInt == ((REMIntegerTypeBeanProxy) aBeanProxy).intValue();
-	return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return (byte) fInt;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fInt;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fInt;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return fInt;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return fInt;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Integer(fInt);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return (short) fInt;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fInt);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).intType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fInt);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanTypeProxy.java
deleted file mode 100644
index 1f35e7f88..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,111 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Integer.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMIntegerTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final IIntegerBeanProxy zeroProxy;
-	private final IIntegerBeanProxy oneProxy;
-	private final IIntegerBeanProxy twoProxy;
-	private final IIntegerBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMIntegerTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.INTEGER_TYPE), Integer.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMIntegerTypeBeanProxy(aRegistry, 0);	
-	oneProxy = new REMIntegerTypeBeanProxy(aRegistry, 1);
-	twoProxy = new REMIntegerTypeBeanProxy(aRegistry, 2);
-	threeProxy = new REMIntegerTypeBeanProxy(aRegistry, 3);
-		
-}
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache to see if the value is being held before creating a new one
- */
-IIntegerBeanProxy createIntegerBeanProxy(int anInt) {
-
-	switch(anInt) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMIntegerTypeBeanProxy(fRegistry, anInt);
-	}
-}
-
-/**
- * newInstance method. integer is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createIntegerBeanProxy(value.anInt);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (int) validNumber - number can be any number because (byte) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of int to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);	
-	int anInt;
-	if (trim.startsWith("(int)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(int)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			anInt = v.intValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		try {
-			anInt = Integer.decode(trim).intValue();	// See if valid int format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(anInt);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInterfaceBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInterfaceBeanTypeProxy.java
deleted file mode 100644
index f18ed5221..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInterfaceBeanTypeProxy.java
+++ /dev/null
@@ -1,72 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Default beantype proxy for an interface.
- */
-
-public class REMInterfaceBeanTypeProxy extends REMAbstractBeanTypeProxy {
-	
-	protected REMInterfaceBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname) {
-		super(aRegistry, anID, aClassname, null);
-	}
-	
-	/** 
-	 * Interfaces are interfaces.
-	 */
-	public boolean isInterface() {
-		return true;
-	}
-	
-	/**
-	 * Create a new bean proxy with the specified id.
-	 *
-	 * For all of the interface types, this is an invalid operation. 
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * For all of the interface types, you can't create a newBeanType for subclasses since
-	 * interface aren't subclassable, only extendable.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstact) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Note: Since new instances of interfaces can never be done,
-	 * this function is not supported.
-	 */
-	public IBeanProxy newInstance() { 
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * newInstance(initializationString) is valid because it can be used to create
-	 * an instance of an implementation of the interface.
-	 */
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInvokable.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInvokable.java
deleted file mode 100644
index fc4514b75..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInvokable.java
+++ /dev/null
@@ -1,233 +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.proxy.remote;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IInvokable;
- 
-
-/**
- * Remote Invokable. This invokes on the remote vm, but it doesn't use a method proxy. Instead
- * it sends the information to get the method to the remote vm along with the parms. That way
- * it will do the lookup on the remote vm and we don't have the overhead of two calls, one to
- * get the methodproxy and the other to actually do the invoke. This should typically be used
- * only for infrequent calls so that cache of the method proxy is not needed.
- * 
- * @since 1.0.0
- */
-class REMInvokable implements IInvokable {
-
-	protected final IREMBeanTypeProxy beanType;	// Beantype to get method from.
-	protected final String methodName;	// Method name
-	protected final IBeanTypeProxy[] methodArgTypes;	// Argument types (or null if no arguments).
-	protected final REMProxyFactoryRegistry factory;	// Factory for this invokable
-	
-	
-	REMInvokable(IREMBeanTypeProxy beanType, String methodName, IBeanTypeProxy[] methodArgTypes) {
-		this.beanType = beanType;
-		this.methodName = methodName;
-		this.methodArgTypes = methodArgTypes;
-		this.factory = (REMProxyFactoryRegistry) beanType.getProxyFactoryRegistry();
-	}
-	
-	public IBeanProxy invoke(IBeanProxy subject) throws ThrowableProxy {
-		return invoke(subject, (IBeanProxy[]) null);
-	}
-
-	public IBeanProxy invoke(IBeanProxy subject, IBeanProxy[] parms) throws ThrowableProxy {
-		return invokeWithParms(subject, parms);
-	}
-
-	/**
-	 * The internal method that allows mixture of constants (e.g. String) with bean proxies.
-	 * A parm value can be a REMMethodProxy.ParmArray. This means this parm is an array that
-	 * needs to have a ValueRetriever created for it. This is used if the array has ID's in
-	 * it and is not an existing array on the server or all constant values.
-	 *
-	 * NOTE: It is assumed that all IBeanTypeProxies of the parms have already been retrieved.
-	 *       It should still work, but it could be asking for them in the middle of the request
-	 *       if they are not first gotton.
-	 *
-	 */
-	public IBeanProxy invokeWithParms(IBeanProxy subject, final Object[] parms) throws ThrowableProxy {
-		IREMConnection connect = factory.getFreeConnection();
-		REMStandardBeanProxyFactory proxyFactory = (REMStandardBeanProxyFactory) factory.getBeanProxyFactory();
-		proxyFactory.startTransaction(); // This is definately a transaction, so start it.
-		try {
-			// First need to send the method info.
-			Commands.ValueObject classValue = new Commands.ValueObject();
-			beanType.renderBean(classValue);
-			
-			Commands.ValueObject parmTypesValue = new Commands.ValueObject();
-			if (methodArgTypes != null) {
-				class Retriever implements Commands.ValueRetrieve {
-					int index = 0;
-					Object[] array;
-					Commands.ValueObject worker = new Commands.ValueObject();
-
-					public Retriever(Object[] anArray) {
-						array = anArray;
-					}
-
-					public Commands.ValueObject nextValue() {
-						Object parm = array[index++];
-						((IREMBeanTypeProxy) parm).renderBean(worker);
-						return worker;
-					}
-				};
-
-				parmTypesValue.setArrayIDS(new Retriever(methodArgTypes), methodArgTypes.length, Commands.CLASS_CLASS); // Create Class[].
-			}
-			
-			
-			// Now we start building the actual invocation.
-			
-			Commands.ValueObject subjectValue = new Commands.ValueObject();
-			if (subject != null)
-				 ((IREMBeanProxy) subject).renderBean(subjectValue);
-
-			Commands.ValueObject parmsValue = new Commands.ValueObject();
-
-			if (parms != null) {
-				// Have a local definition of the retriever so that the retriever can create
-				// another one of itself if necessary.
-				final IStandardBeanTypeProxyFactory typeFactory = factory.getBeanTypeProxyFactory();
-
-				class Retriever implements Commands.ValueRetrieve {
-					int index = 0;
-					Object[] array;
-					Commands.ValueObject worker = new Commands.ValueObject();
-
-					public Retriever(Object[] anArray) {
-						array = anArray;
-					}
-
-					public Commands.ValueObject nextValue() {
-						Object parm = array[index++];
-						if (parm != null)
-							if (parm instanceof IREMBeanProxy)
-								 ((IREMBeanProxy) parm).renderBean(worker);
-							else if (parm instanceof TransmitableArray) {
-								// It is another array, create a new retriever.
-								worker.setArrayIDS(
-									new Retriever(((TransmitableArray) parm).array),
-									((TransmitableArray) parm).array.length,
-									((TransmitableArray) parm).componentTypeID);
-							} else {
-								// It's an object. Need to get bean type so that we can send it.
-								IREMBeanProxy type = (IREMBeanProxy) typeFactory.getBeanTypeProxy(parm.getClass().getName());
-								if (type == null)
-									throw new IllegalArgumentException();
-								int classID = type.getID().intValue();
-								worker.setAsObject(parm, classID);
-							}
-						else
-							worker.set();
-						return worker; 
-					}
-				};
-
-				parmsValue.setArrayIDS(new Retriever(parms), parms.length, Commands.OBJECT_CLASS); // Create Object[].
-			}
-
-			Commands.ValueObject returnValue = new Commands.ValueObject();
-			try {
-				invoke(connect, proxyFactory, classValue, parmTypesValue, subjectValue, parmsValue, returnValue);
-				return proxyFactory.getBeanProxy(returnValue);
-			} catch (CommandException e) {
-				if (!e.isRecoverable()) {
-					// Close the connection and try again.
-					factory.closeConnection(connect);
-					connect = null;
-					connect = factory.getFreeConnection();
-					try {
-						invoke(connect, proxyFactory, classValue, parmTypesValue, subjectValue, parmsValue, returnValue);
-						return proxyFactory.getBeanProxy(returnValue);
-					} catch (CommandException eAgain) {
-						// Failed again. Just close and print trace.
-						factory.closeConnection(connect);
-						connect = null;
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
-						return null;
-					}
-				} else {
-					// A recoverable error, print trace and return
-					ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-					return null;
-				}
-			}
-		} finally {
-			proxyFactory.stopTransaction();
-			if (connect != null)
-				factory.returnConnection(connect);
-		}
-	}
-
-private void invoke(
-		IREMConnection connect,
-		REMStandardBeanProxyFactory proxyFactory,
-		Commands.ValueObject classTypeValue,
-		Commands.ValueObject parmTypesValue,
-		Commands.ValueObject subjectValue,
-		Commands.ValueObject parmsValue,
-		Commands.ValueObject returnValue)
-		throws ThrowableProxy, CommandException {
-		try {
-			connect.invokeMethod(classTypeValue, methodName, parmTypesValue, subjectValue, parmsValue, returnValue);
-		} catch (CommandErrorException e) {
-			proxyFactory.processErrorReturn(e);
-		}
-	}
-
-	public IBeanProxy invoke(IBeanProxy subject, IBeanProxy parm) throws ThrowableProxy {
-		return invoke(subject, new IBeanProxy[] { parm });
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject) {
-		try {
-			return invoke(subject);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			factory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy[] parms) {
-		try {
-			return invoke(subject, parms);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			factory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy parm) {
-		try {
-			return invoke(subject, parm);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			factory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanProxy.java
deleted file mode 100644
index 94b41a244..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanProxy.java
+++ /dev/null
@@ -1,44 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Long.class.
- */
-class REMLongClassBeanProxy extends REMNumberBeanProxy {
-
-REMLongClassBeanProxy(REMProxyFactoryRegistry aRegistry, Long aLong) {
-	super(aRegistry, aLong);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).longClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Long) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanTypeProxy.java
deleted file mode 100644
index 45556c21c..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanTypeProxy.java
+++ /dev/null
@@ -1,87 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy Long.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMLongClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMLongClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.LONG_CLASS), Long.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMLongClassBeanProxy(aRegistry, new Long(0));	
-	oneProxy = new REMLongClassBeanProxy(aRegistry, new Long(1));
-	twoProxy = new REMLongClassBeanProxy(aRegistry, new Long(2));
-	threeProxy = new REMLongClassBeanProxy(aRegistry, new Long(3));		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createLongBeanProxy(Long aLong) {
-	if (aLong.longValue() >= 0 && aLong.longValue() < 4) {
-		// Switch statements don't work with longs.
-		switch(aLong.intValue()) {
-			case 0: return zeroProxy;
-			case 1: return oneProxy ;
-			case 2: return twoProxy ;
-			case 3: return threeProxy ;
-		}
-	} 
-	return new REMLongClassBeanProxy(fRegistry, aLong);
-}
-
-/**
- * Generic way to create a Long proxy, however, the Number must be a Long.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createLongBeanProxy((Long) aNumber);
-}	
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createLongBeanProxy(new Long(value.aLong));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanProxy.java
deleted file mode 100644
index a26d8006c..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanProxy.java
+++ /dev/null
@@ -1,131 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for the primitive "long".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMLongTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final long fLong;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMLongTypeBeanProxy(REMProxyFactoryRegistry aRegistry, long aLong) {
-	super(aRegistry);
-	fLong = aLong;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMLongTypeBeanProxy)
-		return fLong == ((REMLongTypeBeanProxy) anObject).longValue();
-	if (anObject instanceof Long)
-		return fLong == ((Long) anObject).longValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMLongTypeBeanProxy)
-		return fLong == ((REMLongTypeBeanProxy) aBeanProxy).longValue();
-	return false;
-}
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return (byte) fLong;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fLong;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fLong;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return (int) fLong;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return fLong;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Long(fLong);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return (short) fLong;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fLong);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).longType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fLong);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanTypeProxy.java
deleted file mode 100644
index b35740141..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,115 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Long.TYPE/
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMLongTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMLongTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.LONG_TYPE), Long.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMLongTypeBeanProxy(aRegistry, 0);	
-	oneProxy = new REMLongTypeBeanProxy(aRegistry, 1);
-	twoProxy = new REMLongTypeBeanProxy(aRegistry, 2);
-	threeProxy = new REMLongTypeBeanProxy(aRegistry, 3);		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createLongBeanProxy(long aLong) {
-	if (aLong >= 0 && aLong < 4) {
-		// Switch statements don't work with longs.
-		switch((int) aLong) {
-			case 0: return zeroProxy;
-			case 1: return oneProxy ;
-			case 2: return twoProxy ;
-			case 3: return threeProxy ;
-		}
-	} 
-	return new REMLongTypeBeanProxy(fRegistry, aLong);
-}
-
-/**
- * newInstance method. long is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}	
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createLongBeanProxy(value.aLong);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (long) validNumber - number can be any number because (byte) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of long to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);
-	long aLong;
-	if (trim.startsWith("(long)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(long)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			aLong = v.longValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		if (trim.charAt(trim.length()-1) == 'L' || trim.charAt(trim.length()-1) == 'l')
-			trim = trim.substring(0, trim.length()-1);
-		try {
-			aLong = Long.decode(trim).longValue();	// See if valid long format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aLong);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java
deleted file mode 100644
index da70385dd..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java
+++ /dev/null
@@ -1,172 +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.proxy.remote;
-/*
-
-
- */
-
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Master Server thread for the Remote VMs.
- * 
- * It responds to the remote vm requests to this IDE.
- * 
- * It is package-protected because only ProxyRemotePluguin should access it.
- * @author richkulp
- */
-class REMMasterServerThread extends Thread {
-	
-	protected ServerSocket masterServerSocket;
-	protected REMRegistryController registryController;
-	protected boolean shuttingDown = false;
-	
-	// Kludge: Bug in Linux 1.3.xxx of JVM. Closing a socket while the socket is being read/accept will not interrupt the
-	// wait. Need to timeout to the socket read/accept before the socket close will be noticed. This has been fixed
-	// in Linux 1.4. So on Linux 1.3 need to put timeouts in on those sockets that can be separately closed while reading/accepting.
-	static boolean LINUX_1_3 = "linux".equalsIgnoreCase(System.getProperty("os.name")) && System.getProperty("java.version","").startsWith("1.3");	 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	
-	
-	public REMMasterServerThread(REMRegistryController registryController) {
-		super("Remote Proxy Master Server Thread");	//$NON-NLS-1$
-		this.registryController = registryController;
-		
-		try {
-			masterServerSocket = new ServerSocket(0, 50, InetAddress.getByName("localhost"));	// Any available port //$NON-NLS-1$
-			if (LINUX_1_3)
-				masterServerSocket.setSoTimeout(1000);	// Linux 1.3 bug, see comment on LINUX_1_3
-		} catch (SocketException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	// This is bad. Should be no exceptions creating a socket. //$NON-NLS-1$
-		} catch (IOException e) {				
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	// This is bad. Should be no exceptions creating a socket. //$NON-NLS-1$
-		}			
-	}
-
-	public ServerSocket getMasterSocket() {
-		return masterServerSocket;
-	}
-	
-	/**
-	 * @see java.lang.Thread#run()
-	 */
-	public void run() {
-		try {
-			while (masterServerSocket != null) {
-				Socket incoming = null;
-				try {
-					incoming = masterServerSocket.accept();
-				} catch (InterruptedIOException e) {
-					continue; // Timeout, try again
-				} catch (NullPointerException e) {
-					continue;	// In Linux 1.3 case masterServerSocket could of gone null between loop test and try block.
-				}
-				boolean close = false;	// process request will tell if socket should be closed. it may be passed onto callback thread instead.
-				try {
-					close = processRequest(incoming);
-				} finally {
-					if (close) {
-						try {
-						incoming.close();
-					} catch (IOException e) {
-					}
-				}
-}
-				incoming = null;
-			}
-		} catch (Exception e) {
-			if (!shuttingDown)
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-		}
-		
-		shutdown();	// Either a bad exception or we were closed. Either way is shutdown.
-	}
-	
-	/**
-	 * Use this to request a shutdown.
-	 */
-	public void requestShutdown() {		
-		if (masterServerSocket == null)
-			return;
-		// Closing the server socket should cause a break.
-		try {
-			shuttingDown = true;
-			masterServerSocket.close();
-		} catch (Exception e) {
-		}
-		return;
-	}	
-	
-	protected boolean processRequest(Socket remote) throws IOException {
-		DataInputStream	in = new DataInputStream(remote.getInputStream());
-		DataOutputStream out = new DataOutputStream(remote.getOutputStream());
-		boolean  close = true;	// flag indicating socket not given over to callback. Don't close the socket when done because callback has it.
-		try {
-			byte cmd = in.readByte();
-			switch (cmd) {
-				case Commands.ALIVE:
-					int registryID = in.readInt();
-					out.writeBoolean(registryController.getRegistry(new Integer(registryID)) != null);	// Return if registry still alive
-					out.flush();
-					break;
-					
-				case Commands.REMOTE_STARTED:
-					registryID = in.readInt();
-					int remoteServerPort = in.readInt();
-					REMProxyFactoryRegistry registry = registryController.getRegistry(new Integer(registryID));
-					if (registry != null) {
-						registry.setServerPort(remoteServerPort);
-						out.writeBoolean(true);
-					} else
-						out.writeBoolean(false);	// No registry
-					out.flush();
-					break;
-					
-				case Commands.ATTACH_CALLBACK:
-					registryID = in.readInt();
-					registry = registryController.getRegistry(new Integer(registryID));
-					if (registry != null) {
-						close = !((REMCallbackRegistry) registry.getCallbackRegistry()).createCallback(remote);	// close if failed, don't close if good.
-						out.writeBoolean(!close);	// if not close, then return it worked.
-					} else
-						out.writeBoolean(false);
-					out.flush();
-					break;
-			}
-		} catch (Exception e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	 //$NON-NLS-1$
-		} finally {
-			if (close) {
-				try {
-					in.close();
-				} catch (IOException e) {
-				}
-				try {
-					out.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-		return close;
-	}
-	
-	private void shutdown() {
-		requestShutdown();
-		masterServerSocket = null;		
-	}		
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxy.java
deleted file mode 100644
index 681a90d99..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxy.java
+++ /dev/null
@@ -1,276 +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.proxy.remote;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote VM implementation of the MethodProxy
- */
-
-final class REMMethodProxy extends REMAccessibleObjectProxy implements IREMMethodProxy {
-
-	private IBeanTypeProxy fDeclaringType;
-	private String fMethodName;
-	private IBeanTypeProxy[] fParameterTypes;
-	private IBeanTypeProxy fReturnType;
-
-	REMMethodProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
-		super(aRegistry, anID);
-	}
-
-	public IBeanTypeProxy getClassType() {
-		if (fDeclaringType == null)
-			fDeclaringType =
-				(IBeanTypeProxy) REMStandardBeanProxyConstants
-					.getConstants(fFactory)
-					.getMethodDeclaringClassMessage()
-					.invokeCatchThrowableExceptions(
-					this);
-		return fDeclaringType;
-	}
-
-	public String getName() {
-		if (fMethodName == null) {
-			IStringBeanProxy proxy =
-				(IStringBeanProxy) REMStandardBeanProxyConstants
-					.getConstants(fFactory)
-					.getMethodMethodNameMessage()
-					.invokeCatchThrowableExceptions(
-					this);
-			if (proxy != null)
-				fMethodName = proxy.stringValue();
-			else
-				fMethodName = ""; //$NON-NLS-1$
-		}
-		return fMethodName;
-	}
-
-	public synchronized IBeanTypeProxy[] getParameterTypes() {
-		if (fParameterTypes == null) {
-			IArrayBeanProxy parmTypes = (IArrayBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory)
-					.getMethodParameterTypesMessage().invokeCatchThrowableExceptions(this);
-			if (parmTypes == null)
-				fParameterTypes = new IBeanTypeProxy[0]; // There was some error, only way null is returned
-			else {
-				int len = parmTypes.getLength();
-				fParameterTypes = new IBeanTypeProxy[len];
-				for (int i = 0; i < len; i++)
-					try {
-						fParameterTypes[i] = (IBeanTypeProxy) parmTypes.get(i);
-					} catch (ThrowableProxy e) {
-					}
-				fFactory.releaseProxy(parmTypes); // Don't need the array on the server anymore.
-			}
-		}
-
-		return fParameterTypes;
-	}
-
-	public IBeanTypeProxy getReturnType() {
-		if (fReturnType == null)
-			fReturnType =
-				(IBeanTypeProxy) REMStandardBeanProxyConstants
-					.getConstants(fFactory)
-					.getMethodReturnTypeMessage()
-					.invokeCatchThrowableExceptions(
-					this);
-		return fReturnType;
-	}
-
-	public IBeanProxy invoke(IBeanProxy subject) throws ThrowableProxy {
-		return invoke(subject, (IBeanProxy[]) null);
-	}
-
-	public IBeanProxy invoke(IBeanProxy subject, IBeanProxy[] parms) throws ThrowableProxy {
-		return invokeWithParms(subject, parms);
-	}
-
-	/**
-	 * The internal method that allows mixture of constants (e.g. String) with bean proxies.
-	 * A parm value can be a REMMethodProxy.ParmArray. This means this parm is an array that
-	 * needs to have a ValueRetriever created for it. This is used if the array has ID's in
-	 * it and is not an existing array on the server or all constant values.
-	 *
-	 * NOTE: It is assumed that all IBeanTypeProxies of the parms have already been retrieved.
-	 *       It should still work, but it could be asking for them in the middle of the request
-	 *       if they are not first gotton.
-	 *
-	 * NOTE: This is in IREMMethodProxy only so that other REM proxy implementations can access it.
-	 */
-
-	public IBeanProxy invokeWithParms(IBeanProxy subject, final Object[] parms) throws ThrowableProxy {
-		IREMConnection connect = fFactory.getFreeConnection();
-		REMStandardBeanProxyFactory proxyFactory = (REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory();
-		proxyFactory.startTransaction(); // This is definately a transaction, so start it.
-		try {
-			Commands.ValueObject subjectValue = new Commands.ValueObject();
-			if (subject != null)
-				 ((IREMBeanProxy) subject).renderBean(subjectValue);
-
-			Commands.ValueObject parmsValue = new Commands.ValueObject();
-
-			class Retriever implements Commands.ValueRetrieve {
-				int index = 0;
-				Object[] array;
-				Commands.ValueObject worker = new Commands.ValueObject();
-				IStandardBeanTypeProxyFactory typeFactory = fFactory.getBeanTypeProxyFactory();
-
-				public Retriever(Object[] anArray) {
-					array = anArray;
-				}
-				
-				public void reset() {
-					index = 0;
-				}
-
-				public Commands.ValueObject nextValue() {
-					Object parm = array[index++];
-					if (parm != null)
-						if (parm instanceof IREMBeanProxy)
-							 ((IREMBeanProxy) parm).renderBean(worker);
-						else if (parm instanceof TransmitableArray) {
-							// It is another array, create a new retriever.
-							worker.setArrayIDS(
-								new Retriever(((TransmitableArray) parm).array),
-								((TransmitableArray) parm).array.length,
-								((TransmitableArray) parm).componentTypeID);
-						} else {
-							// It's an object. Need to get bean type so that we can send it.
-							IREMBeanProxy type = (IREMBeanProxy) typeFactory.getBeanTypeProxy(parm.getClass().getName());
-							if (type == null)
-								throw new IllegalArgumentException();
-							int classID = type.getID().intValue();
-							worker.setAsObject(parm, classID);
-						}
-					else
-						worker.set();
-					return worker; 
-				}
-			};
-			
-			Retriever retriever = null;
-
-			if (parms != null) {
-				// Have a local definition of the retriever so that the retriever can create
-				// another one of itself if necessary.
-				parmsValue.setArrayIDS(retriever = new Retriever(parms), parms.length, Commands.OBJECT_CLASS); // Create Object[].
-			}
-
-			Commands.ValueObject returnValue = new Commands.ValueObject();
-			try {
-				invoke(connect, proxyFactory, subjectValue, parmsValue, returnValue);
-				return proxyFactory.getBeanProxy(returnValue);
-			} catch (CommandException e) {
-				if (!e.isRecoverable()) {
-					// Close the connection and try again.
-					fFactory.closeConnection(connect);
-					connect = null;
-					connect = fFactory.getFreeConnection();
-					try {
-						if (retriever != null)
-							retriever.reset();
-						invoke(connect, proxyFactory, subjectValue, parmsValue, returnValue);
-						return proxyFactory.getBeanProxy(returnValue);
-					} catch (CommandException eAgain) {
-						// Failed again. Just close and print trace.
-						fFactory.closeConnection(connect);
-						connect = null;
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
-						return null;
-					}
-				} else {
-					// A recoverable error, print trace and return
-					ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-					return null;
-				}
-			}
-		} finally {
-			proxyFactory.stopTransaction();
-			if (connect != null)
-				fFactory.returnConnection(connect);
-		}
-	}
-
-private void invoke(
-		IREMConnection connect,
-		REMStandardBeanProxyFactory proxyFactory,
-		Commands.ValueObject subjectValue,
-		Commands.ValueObject parmsValue,
-		Commands.ValueObject returnValue)
-		throws ThrowableProxy, CommandException {
-		try {
-			connect.invokeMethod(getID().intValue(), subjectValue, parmsValue, returnValue);
-		} catch (CommandErrorException e) {
-			proxyFactory.processErrorReturn(e);
-		}
-	}
-
-	public IBeanProxy invoke(IBeanProxy subject, IBeanProxy parm) throws ThrowableProxy {
-		return invoke(subject, new IBeanProxy[] { parm });
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject) {
-		try {
-			return invoke(subject);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy[] parms) {
-		try {
-			return invoke(subject, parms);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy parm) {
-		try {
-			return invoke(subject, parm);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-	/**
-	 * The type proxy is constant proxy out of the method factory.
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).methodType;
-	}
-
-	/**
-	 * The bean is being released, clear out the fields so they can be GC'd if necessary.
-	 * Usually only big objects and proxy fields need to be cleared.
-	 */
-	public void release() {
-		fDeclaringType = null;
-		fParameterTypes = null;
-		fReturnType = null;
-		super.release();
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxyFactory.java
deleted file mode 100644
index 8660c8e3c..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxyFactory.java
+++ /dev/null
@@ -1,305 +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.proxy.remote;
-
-import java.lang.reflect.AccessibleObject;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-
-/**
- * Factory for creating method proxies. Creation date: (12/3/99 6:29:40 PM)
- * 
- * @author: Joe Winchester
- */
-public class REMMethodProxyFactory implements IMethodProxyFactory {
-
-	final protected REMProxyFactoryRegistry fFactoryRegistry;
-
-	// Cached copy of a few typical method type proxies.
-	IREMBeanTypeProxy accessibleType;
-
-	REMMethodTypeProxy methodType;
-
-	REMFieldTypeProxy fieldType;
-
-	REMConstructorTypeProxy ctorType;
-
-	REMMethodProxy getMethodProxy;
-
-	REMMethodProxyFactory(REMProxyFactoryRegistry aRegistry) {
-		fFactoryRegistry = aRegistry;
-		aRegistry.registerMethodProxyFactory(this);
-		REMStandardBeanTypeProxyFactory typeFactory = (REMStandardBeanTypeProxyFactory) aRegistry.getBeanTypeProxyFactory();
-
-		accessibleType = typeFactory.objectClass.newBeanTypeForClass(new Integer(Commands.ACCESSIBLEOBJECT_CLASS), AccessibleObject.class.getName(),
-				false);
-		methodType = new REMMethodTypeProxy(aRegistry, accessibleType);
-		fieldType = new REMFieldTypeProxy(aRegistry, accessibleType);
-		ctorType = new REMConstructorTypeProxy(aRegistry, accessibleType);
-		aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(accessibleType, true);
-		aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(methodType, true);
-		aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(fieldType, true);
-		aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(ctorType, true);
-
-		getMethodProxy = (REMMethodProxy) methodType.newBeanProxy(new Integer(Commands.GET_METHOD_ID));
-		((REMStandardBeanProxyFactory) aRegistry.getBeanProxyFactory()).registerProxy(getMethodProxy);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getMethodProxy(java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public IMethodProxy getMethodProxy(String className, String methodName, String[] parameterTypes) {
-		IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-		IBeanTypeProxy clsProxy = typeFactory.getBeanTypeProxy(className);
-		if (clsProxy == null)
-			return null;
-		// This will redirect to the beantype, which will go through the method cache.
-		return clsProxy.getMethodProxy(methodName, parameterTypes);
-	}
-	
-	/**
-	 * A helper method to get the method proxy for the expression. This is used by registries and beantype proxies. It will go through
-	 * the method cache to make sure we get only one.
-	 * 
-	 * @param expression
-	 * @param aBeanTypeProxy
-	 * @param methodName
-	 * @param parmTypes
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, String methodName, IProxyBeanType[] parmTypes){
-		return ((REMStandardBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(expression, aBeanTypeProxy, methodName, parmTypes);
-	}
-	
-	/**
-	 * A helper method to get the field proxy for the expression. This is used by registries and beantype proxies. It will go through
-	 * the method cache to make sure we get only one.
-	 * @param expression
-	 * @param aBeanTypeProxy
-	 * @param fieldName
-	 * 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyField getFieldProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, String fieldName){
-		return ((REMStandardBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactory()).proxyConstants.getFieldProxy(expression, aBeanTypeProxy, fieldName);
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String)
-	 */
-	public IProxyField getFieldProxy(IExpression expression, String className, String fieldName) {
-		// We are getting the class resolved through the expression. Might as well because it probably will
-		// be needed again and this way when the expression is finished it will be resolved for later usage.
-		IStandardBeanTypeProxyFactory beanTypeProxyFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-		IProxyBeanType beanType = beanTypeProxyFactory.getBeanTypeProxy(expression, className);
-		return beanType.getFieldProxy(expression, fieldName);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String className, String methodName, String[] parameterTypes) {
-		// We are getting the class and parmtypes resolved through the expression. Might as well because they probably will
-		// be needed again and this way when the expression is finished they will be resolved for later usage.
-		IStandardBeanTypeProxyFactory beanTypeProxyFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-		IProxyBeanType beanType = beanTypeProxyFactory.getBeanTypeProxy(expression, className);
-		IProxyBeanType[] parmTypes = getParameterTypes(expression, parameterTypes, beanTypeProxyFactory);
-		return beanType.getMethodProxy(expression, methodName, parmTypes);
-	}
-	
-	/**
-	 * Helper method for BeanTypes and proxy Beantypes. So they don't need to have common code to convert string to proxy bean type.
-	 * @param expression
-	 * @param classType
-	 * @param methodName
-	 * @param parameterTypes
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, IProxyBeanType classType, String methodName, String[] parameterTypes) {
-		// We are getting the class and parmtypes resolved through the expression. Might as well because they probably will
-		// be needed again and this way when the expression is finished they will be resolved for later usage.
-		IStandardBeanTypeProxyFactory beanTypeProxyFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-		IProxyBeanType[] parmTypes = getParameterTypes(expression, parameterTypes, beanTypeProxyFactory);
-		return classType.getMethodProxy(expression, methodName, parmTypes);
-	}
-
-	/**
-	 * @param expression
-	 * @param parameterTypes
-	 * @param beanTypeProxyFactory
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected IProxyBeanType[] getParameterTypes(IExpression expression, String[] parameterTypes, IStandardBeanTypeProxyFactory beanTypeProxyFactory) {
-		IProxyBeanType[] parmTypes;
-		if (parameterTypes == null || parameterTypes.length == 0)
-			parmTypes = null;
-		else {
-			parmTypes = new IProxyBeanType[parameterTypes.length];
-			for (int i = 0; i < parameterTypes.length; i++) {
-				parmTypes[i] = beanTypeProxyFactory.getBeanTypeProxy(expression, parameterTypes[i]);
-			}
-		}
-		return parmTypes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getInvokable(java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public IInvokable getInvokable(String className, String methodName, String[] parameterTypes) {
-		IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-		IBeanTypeProxy clsProxy = typeFactory.getBeanTypeProxy(className);
-		if (clsProxy == null)
-			return null;
-		return clsProxy.getInvokable(methodName, parameterTypes);
-	}
-
-	/**
-	 * Get the method id from the remote system and create the method proxy.
-	 * 
-	 * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
-	 * 
-	 * @param beanType
-	 * @param methodName
-	 * @param parameterTypes
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(IREMBeanTypeProxy beanType, String methodName, String[] parameterTypes) {
-		// First convert the parameter types into IBeanTypeProxy[].
-		IREMBeanTypeProxy[] types = null;
-		if (parameterTypes != null) {
-			IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-			types = new IREMBeanTypeProxy[parameterTypes.length];
-			for (int i = 0; i < parameterTypes.length; i++) {
-				IBeanTypeProxy type = types[i] = (IREMBeanTypeProxy) typeFactory.getBeanTypeProxy(parameterTypes[i]);
-				if (type == null)
-					return null; // One of the parm types doesn't exist.
-			}
-		}
-
-		return getInvokable(beanType, methodName, types);		
-	}
-	
-	/**
-	 * Get the method id from the remote system and create the method proxy.
-	 * This does not go through the method cache. It goes direct to the remote vm.
-	 * 
-	 * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
-	 */
-	public IMethodProxy getMethodProxy(IREMBeanTypeProxy beanType, String methodName, String[] parameterTypes) {
-		// First convert the parameter types into IBeanTypeProxy[].
-		IBeanTypeProxy[] types = null;
-		if (parameterTypes != null) {
-			IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-			types = new IBeanTypeProxy[parameterTypes.length];
-			for (int i = 0; i < parameterTypes.length; i++) {
-				IBeanTypeProxy type = types[i] = typeFactory.getBeanTypeProxy(parameterTypes[i]);
-				if (type == null)
-					return null; // One of the parm types doesn't exist.
-			}
-		}
-
-		return getMethodProxy(beanType, methodName, types);
-	}
-
-	
-	/**
-	 * Get the invokable. 
-	 * 
-	 * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
-	 * @param beanType
-	 * @param methodName
-	 * @param parameterTypes
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(IREMBeanTypeProxy beanType, String methodName, IBeanTypeProxy[] parameterTypes) {
-		return new REMInvokable(beanType, methodName, parameterTypes);
-	}
-	
-	/**
-	 * Get the method id from the remote system and create the method proxy.
-	 * <p>
-	 * This does not go through the method cache. It goes direct to the remote vm.
-	 * 
-	 * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
-	 */
-	public IMethodProxy getMethodProxy(IREMBeanTypeProxy beanType, String methodName, IBeanTypeProxy[] parameterTypes) {
-		// The parms to getMethod are:
-		// parm[0] = String - method name
-		// parm[1] = Class[] - Parameter Classes.
-		Object[] parms = new Object[] { methodName, parameterTypes != null ? (new TransmitableArray(Commands.CLASS_CLASS, parameterTypes)) : null};
-		IBeanProxy result = null;
-		try {
-			result = getMethodProxy.invokeWithParms(beanType, parms);
-			return (IMethodProxy) result;
-		} catch (ThrowableProxy e) {
-			fFactoryRegistry.releaseProxy(e); // Since it's not needed, get rid of now instead of GC time.
-			return null;
-		} catch (ClassCastException e) {
-			// Some trace msgs because we keep getting into a mode after awhile (though not reproducible) that returns non-method proxies and we need
-			// more info.
-			StringBuffer buf = new StringBuffer("Method requested is \"" + methodName + "("); //$NON-NLS-1$	//$NON-NLS-2$
-			for (int i = 0; i < parameterTypes.length; i++) {
-				if (i > 0)
-					buf.append(','); //$NON-NLS-1$
-				buf.append(parameterTypes[i].getTypeName());
-			}
-			buf.append(")\""); //$NON-NLS-1$
-			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, buf.toString(), null));
-			try {
-				if (result != null) {
-					ProxyPlugin.getPlugin().getLogger().log(
-							new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0,
-									"ClassCastException of result. Return type is \"" + result.getTypeProxy().getTypeName() + "\"\n" + //$NON-NLS-1$	//$NON-NLS-2$
-											"Return type bean type proxy class=\"" + result.getTypeProxy().getClass().getName() + "\"\n" + //$NON-NLS-1$	//$NON-NLS-2$
-											"GetMethodProxy valid=" + getMethodProxy.isValid() + "\n" + //$NON-NLS-1$	//$NON-NLS-2$
-											"GetMethodProxy real name is \"" + getMethodProxy.getName() + "\"\n", null)); //$NON-NLS-1$	//$NON-NLS-2$			
-				}
-			} catch (Exception e2) {
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e2)); //$NON-NLS-1$
-			}
-			throw e; // Rethrow it.
-		}
-	}
-
-	/*
-	 * Terminate the factory. Don't need to do anything because of the proxies being held onto are registered any will be cleaned up themselves.
-	 */
-	public void terminateFactory(boolean wait) {
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodTypeProxy.java
deleted file mode 100644
index d3019b951..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodTypeProxy.java
+++ /dev/null
@@ -1,67 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Method class.
- */
-
-final class REMMethodTypeProxy extends REMAbstractBeanTypeProxy {
-
-REMMethodTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy accessibleTypeProxy) {
-	super(aRegistry, new Integer(Commands.METHOD_CLASS), java.lang.reflect.Method.class.getName(), accessibleTypeProxy);
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the accessible object types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Specialized from REMAbstractBeanTypeProxy to ensure Constructor proxies are created correctly.
- */
-public IREMBeanProxy newBeanProxy(Integer objectID) {
-	return new REMMethodProxy(fRegistry, objectID);
-}
-
-/**
- * Note: Since new instances of Constructor are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() { 
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Constructor are never done through an initialization string,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
-	throw new UnsupportedOperationException();
-}		
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMNumberBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMNumberBeanProxy.java
deleted file mode 100644
index 8ca6e7ab9..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMNumberBeanProxy.java
+++ /dev/null
@@ -1,106 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Remote Implementation of INumberBeanProxy for any Number (i.e. the non-primitives)
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-abstract class REMNumberBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final Number fNumberValue;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMNumberBeanProxy(REMProxyFactoryRegistry aRegistry, Number aNumber) {
-	super(aRegistry);
-	fNumberValue = aNumber;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMNumberBeanProxy)
-		return fNumberValue.equals(((REMNumberBeanProxy) anObject).numberValue());
-	if (anObject instanceof Number)
-		return fNumberValue.equals(anObject);
-	return false;
-}
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return fNumberValue.byteValue();
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fNumberValue.doubleValue();
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fNumberValue.floatValue();
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return fNumberValue.intValue();
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return fNumberValue.longValue();
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return fNumberValue;
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return fNumberValue.shortValue();
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return fNumberValue.toString();
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMPrimitiveBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMPrimitiveBeanTypeProxy.java
deleted file mode 100644
index 78c6f752b..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMPrimitiveBeanTypeProxy.java
+++ /dev/null
@@ -1,234 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Primitive BeanType Proxies
- */
-public abstract class REMPrimitiveBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy  {
-	
-	protected REMPrimitiveBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname) {
-		super(aRegistry, anID, aClassname, null);
-	}
-	
-	/**
-	 * Return whether this is the primitive Byte.TYPE or Byte.class
-	 */
-	public boolean isPrimitive() {
-		return true;
-	}
-	
-	/**
-	 * Return the null ctor proxy for this method with these arguments.
-	 * For all of the primitive types, this is an invalid operation.	 
-	 */		
-	public IConstructorProxy getNullConstructorProxy() {	
-		throw new UnsupportedOperationException();
-	}
-		
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {	
-		throw new UnsupportedOperationException();
-	}	
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy[] getConstructors() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {	
-		throw new UnsupportedOperationException();
-	}	
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy[] getDeclaredConstructors() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IFieldProxy[] getFields() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IFieldProxy[] getDeclaredFields() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return a proxy to the field for the target VM being the same as the REM
-	 * For all of the primitive types, this is an invalid operation.
-	 */	
-	public IFieldProxy getFieldProxy(String fieldName) {	
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the primitive types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-		
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the primitive types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the primitive types, this is an invalid operation.	 
-	 */	
-	public IMethodProxy getMethodProxy(String methodName, String argumentQualifiedTypeName) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the primitive types, this is an invalid operation.	 
-	 */		
-	public IMethodProxy getMethodProxy(String methodName) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	
-	/**
-	 * Create a new bean proxy with the specified id.
-	 *
-	 * For all of the primitive types, this is an invalid operation. They are created
-	 * explicitly through the appropriate create method.
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * For all of the primitive types, they aren't classes, so you can't create a newBeanType 
-	 * for subclasses.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * release - BeanType is about to be released.
-	 * primitives don't need to be released, they don't hold onto any ids or resources.
-	 */
-	public void release() {
-	}
-	
-	/**
-	 * Have a string that should represent a number.
-	 * See if it ends in a type letter, if so parse as such.
-	 * See if there is an 'E' in it, then parse as a double.
-	 * If neither condition, then try parse as long, if that 
-	 * fails try as double.
-	 */
-	protected static Number parseString(String v) {
-		if (v.length() == 0)
-			return null;
-		char last = v.charAt(v.length()-1);
-		try {
-			switch (last) {
-				case 'd':
-				case 'D':
-					return Double.valueOf(v);
-				case 'f':
-				case 'F':
-					return Float.valueOf(v);
-				case 'l':
-				case 'L':
-					return Long.decode(v.substring(0, v.length()-1));
-			}
-		} catch (NumberFormatException e) {
-			return null;
-		}
-		
-		try {
-			return Long.decode(v);
-		} catch (NumberFormatException e) {
-			try {
-				return Double.valueOf(v);
-			} catch (NumberFormatException e1) {
-				return null;
-			}
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java
deleted file mode 100644
index 92a9d3bcf..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java
+++ /dev/null
@@ -1,679 +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.proxy.remote;
-
-import java.util.*;
-import java.util.Map.Entry;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-
-
-
-
-/**
- * MethodProxyConstants is a cache of IMethodProxies to avoid repeated lookup
- * and thereby avoid the relatively expensive java.lang.reflect calls to repeatedly
- * lookup method by name
- * 
- * @since 1.1.0
- */
-public class REMProxyConstants {
-
-	private Map methodsCache = new HashMap(80);
-	private Map invokablesCache = new HashMap(80);	
-	private Map fieldsCache = new HashMap(80);
-	
-	private REMProxyFactoryRegistry registry;
-	
-	public REMProxyConstants(REMProxyFactoryRegistry registry) {
-		this.registry = registry;
-	}
-	
-	/*
-	 * Used as the key to the methodCache and invokablesCache when there are parms.
-	 * It allows the parms to be either strings or IBeanTypeProxies without the
-	 * overhead of creating complicated strings.
-	 * 
-	 * It will compare method name and each individual parm name without fluffing
-	 * up a string and building it up.
-	 * 
-	 * For no parm methods, just the name of the method as a string will be the key.
-	 * 
-	 * @since 1.1.0
-	 */
-	private abstract static class MethodKey {
-		public String methodName;
-		public MethodKey(String methodName) {
-			this.methodName = methodName;
-		}
-				
-		protected abstract boolean compareParms(IProxyBeanType[] parms);
-		protected abstract boolean compareParms(String[] parms);
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
-		public int hashCode() {
-			return methodName.hashCode();
-		}
-	}
-	
-	private static class MethodKeyStringParms extends MethodKey {
-		public String[] parmNames;
-		
-		public MethodKeyStringParms(String methodName, String[] parmNames) {
-			super(methodName);
-			this.parmNames = parmNames;
-		}
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		public boolean equals(Object obj) {
-			if (this == obj)
-				return true;
-			try {
-				return ((MethodKey) obj).compareParms(parmNames);
-			} catch (ClassCastException e) {
-				return false;
-			}
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#hashCode()
-		 */
-		public int hashCode() {
-			int h = super.hashCode();
-			for (int i = 0; i < parmNames.length; i++) {
-				h += parmNames[i].hashCode();
-			}
-			return h;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-		 */
-		protected boolean compareParms(IProxyBeanType[] parms) {
-			if (parms.length != parmNames.length)
-				return false;
-			for (int i = 0; i < parms.length; i++) {
-				if (!parms[i].getTypeName().equals(parmNames[i]))
-					return false;
-			}
-			return true;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(java.lang.String[])
-		 */
-		protected boolean compareParms(String[] parms) {
-			return Arrays.equals(parms, parmNames);
-		}
-	}
-	
-	private static class MethodKeyProxyParms extends MethodKey {
-		public IProxyBeanType[] parmTypes;
-		
-		public MethodKeyProxyParms(String methodName, IProxyBeanType[] parmTypes) {
-			super(methodName);
-			this.parmTypes = parmTypes;
-		}
-		
-		public Object toMethodKeyStringParms() {
-			String[] parms = new String[parmTypes.length];
-			for (int i = 0; i < parmTypes.length; i++) {
-				parms[i] = parmTypes[i].getTypeName();
-			}
-			return new MethodKeyStringParms(methodName, parms);
-		}
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		public boolean equals(Object obj) {
-			if (this == obj)
-				return true;
-			try {
-				return ((MethodKey) obj).compareParms(parmTypes);
-			} catch (ClassCastException e) {
-				return false;
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#hashCode()
-		 */
-		public int hashCode() {
-			int h = super.hashCode();
-			for (int i = 0; i < parmTypes.length; i++) {
-				h += parmTypes[i].getTypeName().hashCode();
-			}
-			return h;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-		 */
-		protected boolean compareParms(String[] parms) {
-			if (parms.length != parmTypes.length)
-				return false;
-			for (int i = 0; i < parms.length; i++) {
-				if (!parmTypes[i].getTypeName().equals(parms[i]))
-					return false;
-			}
-			return true;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(java.lang.String[])
-		 */
-		protected boolean compareParms(IProxyBeanType[] parms) {
-			if (parms.length != parmTypes.length)
-				return false;
-			for (int i = 0; i < parms.length; i++) {
-				if (!parmTypes[i].getTypeName().equals(parms[i].getTypeName()))
-					return false;
-			}
-			return true;
-		}		
-	}
-		
-	static int REMMETHODCOUNT = 0;
-	static int UNIQUEMETHODCOUNT = 0;	
-	static int REMINVOKABLECOUNT = 0;
-	static int UNIQUEINVOKABLECOUNT = 0;
-	static int INVOKEINVOKECOUNT = 0;
-	static int METHODPROXYINVOKECOUNT = 0;
-	static int REMFIELDCOUNT = 0;
-	static int UNIQUEFIELDCOUNT = 0;
-	static int REMCONSTRUCTORCALLED = 0;
-	static HashMap METHODCOUNTMAP;
-	static HashMap FIELDCOUNTMAP;	 
-	static HashMap FIELDSETCOUNTMAP;
-	static boolean GATHER_COUNTS;
-	
-	/**
-	 * Set if counts should be gathered.
-	 * 
-	 * @param gatherCounts
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void setGatherCounts(boolean gatherCounts) {
-		if (gatherCounts != GATHER_COUNTS) {
-			reset();
-			if (gatherCounts) {
-				if (METHODCOUNTMAP == null) {
-					METHODCOUNTMAP = new HashMap();
-					FIELDCOUNTMAP = new HashMap();
-					FIELDSETCOUNTMAP = new HashMap();
-				}
-			}
-			GATHER_COUNTS = gatherCounts;
-		}
-	}
-	
-	
-	public static void reset(){
-		REMMETHODCOUNT = UNIQUEMETHODCOUNT = REMINVOKABLECOUNT = UNIQUEINVOKABLECOUNT = REMCONSTRUCTORCALLED = METHODPROXYINVOKECOUNT = INVOKEINVOKECOUNT = REMFIELDCOUNT = UNIQUEFIELDCOUNT = 0;
-		if (GATHER_COUNTS) {
-			METHODCOUNTMAP.clear();
-			FIELDCOUNTMAP.clear();
-			FIELDSETCOUNTMAP.clear();
-		}
-	}
-	
-	public static void println(){
-		
-		if (GATHER_COUNTS) {
-			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
-			System.out.println("Method proxies invokes = " + METHODPROXYINVOKECOUNT); //$NON-NLS-1$
-			System.out.println("Invoke invokes = " + INVOKEINVOKECOUNT); //$NON-NLS-1$
-			System.out.println(".................................................."); //$NON-NLS-1$
-			System.out.println("Methods retrieved = " + REMMETHODCOUNT + "(" + UNIQUEMETHODCOUNT + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			System.out.println("Invokes retrieved = " + REMINVOKABLECOUNT + "(" + UNIQUEINVOKABLECOUNT + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			System.out.println("Fields retrieved = " + REMFIELDCOUNT + "(" + UNIQUEFIELDCOUNT + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			System.out.println("Constructor calls = " + REMCONSTRUCTORCALLED); //$NON-NLS-1$
-			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
-			System.out.println("-Count of methods invoked-------------------------"); //$NON-NLS-1$
-			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
-
-			// Collate the methods called
-			Iterator entries = METHODCOUNTMAP.entrySet().iterator();
-			while (entries.hasNext()) {
-				Map.Entry entry = (Entry) entries.next();
-				REMMethodProxy methodProxy = (REMMethodProxy) entry.getKey();
-				System.out.println(methodProxy.getClassType().getTypeName() + "," + methodProxy.getName() + "," + entry.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
-			System.out.println("-Count of fields get called ----------------------"); //$NON-NLS-1$
-			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
-
-			// Collate the fields accessed
-			entries = FIELDCOUNTMAP.entrySet().iterator();
-			while (entries.hasNext()) {
-				Map.Entry entry = (Entry) entries.next();
-				REMFieldProxy fieldProxy = (REMFieldProxy) entry.getKey();
-				System.out.println(fieldProxy.toBeanString() + "," + entry.getValue()); //$NON-NLS-1$
-			}
-
-			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
-			System.out.println("-Count of fields set called ----------------------"); //$NON-NLS-1$
-			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
-
-			// Collate the fields set
-			entries = FIELDSETCOUNTMAP.entrySet().iterator();
-			while (entries.hasNext()) {
-				Map.Entry entry = (Entry) entries.next();
-				REMFieldProxy fieldProxy = (REMFieldProxy) entry.getKey();
-				System.out.println(fieldProxy.toBeanString() + "," + entry.getValue()); //$NON-NLS-1$
-			} 
-		}
-		
-	}
-	
-/**
- * @param aBeanTypeProxy = BeanTypeProxy for the method
- * @param methodName = methodName to be looked for
- * @param parmTypes = array of qualified type names for the method arguments, null if no methods
- */ 
-	public IMethodProxy getMethodProxy(IBeanTypeProxy aBeanTypeProxy, String methodName, String[] parmTypes){
-		if (!registry.isValid())
-			return null;
-
-		REMMETHODCOUNT++;
-		Map methods;
-		Object key;
-		synchronized (this) {
-			// The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
-			methods = getMethods(aBeanTypeProxy);
-
-			// The syntax of the key is methodName(parmType1,parmType2)
-			if (parmTypes == null || parmTypes.length == 0) {
-				key = methodName;
-			} else {
-				key = new MethodKeyStringParms(methodName, parmTypes);
-			}
-
-			IMethodProxy result = (IMethodProxy) methods.get(key);
-			if (result != null)
-				return result;
-		}
-		
-		UNIQUEMETHODCOUNT++;
-		// Get the method proxy and cache this before returning it
-		// Get the method proxy and cache this before returning it
-		REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) registry.getMethodProxyFactory();
-		IMethodProxy result = proxyFactory.getMethodProxy((IREMBeanTypeProxy)aBeanTypeProxy,methodName,parmTypes);
-		synchronized (this) {
-			// Get it again to make sure it hasn't changed due to a race condition. We don't sync for the getMethodProxy because that goes to the remote vm and could deadlock.
-			IMethodProxy mValue = (IMethodProxy) methods.get(key);
-			if (mValue != null && mValue != result) {
-				registry.releaseProxy(result); // Don't need the result now, got it through a race condition.
-				return mValue; // We have a real value now.
-			}
-			methods.put(key, result);
-		}		
-		return result;				
-	}
-/**
- * @param aBeanTypeProxy
- * @return Map of cache'd methods
- */
-private Map getMethods(IProxyBeanType aBeanTypeProxy) {
-	Map methods = (Map) methodsCache.get(aBeanTypeProxy.getTypeName());
-	if(methods == null){
-		methods = new HashMap(20);
-		methodsCache.put(aBeanTypeProxy.getTypeName(),methods);
-	}
-	return methods;
-}
-/**
- * @param aBeanTypeProxy
- * @return Map of cache'd invokables
- */
-private Map getInvokables(IBeanTypeProxy aBeanTypeProxy) {
-	Map invokables = (Map) invokablesCache.get(aBeanTypeProxy);
-	if(invokables == null){
-		invokables = new HashMap(20);
-		invokablesCache.put(aBeanTypeProxy,invokables);
-	}
-	return invokables;
-}
-/**
- * @param aBeanTypeProxy
- * @return Map of cache'd fields
- */
-private Map getFields(IProxyBeanType aBeanTypeProxy) {
-	Map fields = (Map) fieldsCache.get(aBeanTypeProxy.getTypeName());
-	if(fields == null){
-		fields = new HashMap(20);
-		fieldsCache.put(aBeanTypeProxy.getTypeName(),fields);
-	}
-	return fields;
-}
-/**
- * @param aBeanTypeProxy = BeanTypeProxy for the method
- * @param methodName = methodName to be looked for
- * @param parmTypes = array of qualified type names for the method arguments, null if no arguments
- */ 
-	public IInvokable getInvokable(IBeanTypeProxy aBeanTypeProxy, String invokableName, String[] parmTypeNames){
-		
-		REMINVOKABLECOUNT++;
-		// The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
-		Map invokables = getInvokables(aBeanTypeProxy);	
-		
-		Object key = null; 
-		if(parmTypeNames == null || parmTypeNames.length == 0){
-			key = invokableName;
-		} else {
-			key = new MethodKeyStringParms(invokableName, parmTypeNames);
-		}			
-		
-		IInvokable result = (IInvokable) invokables.get(key);
-		if(result != null) return result;
-		
-		UNIQUEINVOKABLECOUNT++;
-		// Get the method proxy and cache this before returning it
-		// Get the method proxy and cache this before returning it
-		REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) aBeanTypeProxy.getProxyFactoryRegistry().getMethodProxyFactory();
-		result = proxyFactory.getInvokable((IREMBeanTypeProxy)aBeanTypeProxy,invokableName,parmTypeNames);
-		invokables.put(key,result);		
-		return result;				
-				
-	}
-	/**
-	 * @param aBeanTypeProxy = BeanTypeProxy for the method
-	 * @param methodName = methodName to be looked for
-	 * @param parmTypes = array of IBeanTypeProxy types for the method arguments, null if no arguments
-	 */ 
-		public IInvokable getInvokable(IBeanTypeProxy aBeanTypeProxy, String invokableName, IBeanTypeProxy[] parmTypes){
-			
-			REMINVOKABLECOUNT++;
-			// The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
-			Map invokables = getInvokables(aBeanTypeProxy);	
-			
-			Object key = null; 
-			if(parmTypes == null || parmTypes.length == 0){
-				key = invokableName;
-			} else {
-				key = new MethodKeyProxyParms(invokableName, parmTypes);
-			}			
-			
-			IInvokable result = (IInvokable) invokables.get(key);
-			if(result != null) return result;
-			
-			UNIQUEINVOKABLECOUNT++;
-			// Get the method proxy and cache this before returning it
-			// Get the method proxy and cache this before returning it
-			REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) aBeanTypeProxy.getProxyFactoryRegistry().getMethodProxyFactory();
-			result = proxyFactory.getInvokable((IREMBeanTypeProxy)aBeanTypeProxy,invokableName,parmTypes);
-			invokables.put(key,result);		
-			return result;				
-					
-		}	
-/**
- * @param aBeanTypeProxy = BeanTypeProxy for the method
- * @param methodName = methodName to be looked for
- * @param parmTypes = array of qualified type names for the method arguments, null if no methods
- */ 
-	public IMethodProxy getMethodProxy(IBeanTypeProxy aBeanTypeProxy, String methodName, IBeanTypeProxy[] parmTypes){
-		if (!registry.isValid())
-			return null;
-		
-		REMMETHODCOUNT++;		
-		// The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
-		Map methods;
-		Object key;
-		synchronized (this) {
-			methods = getMethods(aBeanTypeProxy);
-
-			key = null;
-			if (parmTypes == null || parmTypes.length == 0) {
-				key = methodName;
-			} else {
-				key = new MethodKeyProxyParms(methodName, parmTypes);
-			}
-
-			IMethodProxy result = (IMethodProxy) methods.get(key);
-			if (result != null)
-				return result;
-		}
-		
-		UNIQUEMETHODCOUNT++;
-		// Get the method proxy and cache this before returning it
-		// Get the method proxy and cache this before returning it
-		REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) registry.getMethodProxyFactory();
-		IMethodProxy result = proxyFactory.getMethodProxy((IREMBeanTypeProxy)aBeanTypeProxy,methodName,parmTypes);
-		synchronized (this) {
-			// Get it again to make sure it hasn't changed due to a race condition. We don't sync for the getMethodProxy because that goes to the remote vm and could deadlock.
-			IMethodProxy mValue = (IMethodProxy) methods.get(key);
-			if (mValue != null && mValue != result) {
-				registry.releaseProxy(result); // Don't need result now, got it already through a race condition.
-				return mValue; // We have a real value now.
-			}
-			methods.put(key, result);
-		}		
-
-		return result;				
-	}
-
-	/**
-	 * Return the proxy method for the method through the expression. 
-	 * @param expression
-	 * @param aBeanTypeProxy
-	 * @param methodName
-	 * @param parmTypes
-	 * @return either the IMethodProxy if already resolved or an ExpressionProxy if not yet resolved.
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, String methodName, IProxyBeanType[] parmTypes){
-		if (!registry.isValid())
-			return null;
-		
-		REMMETHODCOUNT++;	
-		Map methods;
-		Map epMethods;
-		Object key;
-		boolean isKey;
-		synchronized (this) {
-			// The classCache map is keyed by the BeanTypeProxy name and holds a further map of cache'd methods
-			methods = getMethods(aBeanTypeProxy);
-
-			if (parmTypes == null || parmTypes.length == 0) {
-				key = methodName;
-				isKey = false;
-			} else {
-				key = new MethodKeyProxyParms(methodName, parmTypes);
-				isKey = true;
-			}
-
-			IProxyMethod result = (IProxyMethod) methods.get(key);
-			if (result != null)
-				return result;
-			
-			// See if stored in the expression.
-			epMethods = ((REMExpression) expression).getMethods(aBeanTypeProxy);
-			result = (IProxyMethod) epMethods.get(key);
-			if (result != null)
-				return result;
-		}
-		
-		UNIQUEMETHODCOUNT++;
-		// Get the method expression proxy and cache this before returning it
-		IProxyMethod result = ((Expression) expression).createMethodExpressionProxy(aBeanTypeProxy,methodName,parmTypes);
-		epMethods.put(key, result);
-		final Object epKey = key;
-		final Map rMethods = methods; 
-		final Map fepMethods = epMethods;
-		final boolean isKeyType = isKey;
-		((ExpressionProxy) result).addProxyListener(new ExpressionProxy.ProxyAdapter() {
-			public void proxyResolved(ProxyEvent event) {
-				synchronized (REMProxyConstants.this) {
-					if (rMethods.containsKey(epKey))
-						return;	// We already have a true method proxy in there. A race condition occurred.
-					
-					// Now put this resolved guy into the methods.
-					// We don't want the key to contain expression proxies in the final map, so if it is a key type
-					// we will turn it into a string type key.
-					Object key;
-					if (isKeyType) {
-						key = ((MethodKeyProxyParms) epKey).toMethodKeyStringParms();	// So that we don't put a ket that contains expression proxy parm types into the main map.
-					} else
-						key = epKey;
-					
-					rMethods.put(key, event.getProxy());
-				}
-			}
-			
-			public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
-				synchronized (REMProxyConstants.this) {
-					fepMethods.remove(epKey);
-				}
-				}
-			
-		});
-		return result;				
-	}
-
-	/**
-	 * @param proxy
-	 */
-	static void methodInvoked(REMMethodProxy proxy) {
-	
-		if (GATHER_COUNTS) {
-			Integer count = (Integer) METHODCOUNTMAP.get(proxy);
-			if (count == null) {
-				METHODCOUNTMAP.put(proxy, new Integer(1));
-			} else {
-				METHODCOUNTMAP.put(proxy, new Integer(count.intValue() + 1));
-			}
-		}
-	}
-
-	static void fieldGetInvoked(IBeanProxy proxy) {
-
-		if (GATHER_COUNTS) {
-			Integer count = (Integer) FIELDCOUNTMAP.get(proxy);
-			if (count == null) {
-				FIELDCOUNTMAP.put(proxy, new Integer(1));
-			} else {
-				FIELDCOUNTMAP.put(proxy, new Integer(count.intValue() + 1));
-			} 
-		}		
-	}
-
-	static void fieldSetInvoked(IBeanProxy proxy, IBeanProxy value) {
-
-		if (GATHER_COUNTS) {
-			Integer count = (Integer) FIELDSETCOUNTMAP.get(proxy);
-			if (count == null) {
-				FIELDSETCOUNTMAP.put(proxy, new Integer(1));
-			} else {
-				FIELDSETCOUNTMAP.put(proxy, new Integer(count.intValue() + 1));
-			} 
-		}				
-	}
-
-	/**
-	 * @param proxy for the BeanType of the field
-	 * @param fieldName of the field, e.g. (java.awt.Dimension, width) for the "width" field on Dimension
-	 * @return The field proxy that is cache'd for performance
-	 */
-	public IFieldProxy getFieldProxy(REMAbstractBeanTypeProxy aBeanTypeProxy, String fieldName) {
-		if (!registry.isValid())
-			return null;
-		
-		REMFIELDCOUNT++;
-		Map fields;
-		synchronized (this) {
-			// The field map is keyed by the BeanTypeProxy and holds a further map of cache'd fields
-			fields = getFields(aBeanTypeProxy);	
-				
-			// Lookup the cache'd Field proxy
-			IFieldProxy result = (IFieldProxy) fields.get(fieldName);
-			if (result != null)
-				return result;
-		}
-		
-		UNIQUEFIELDCOUNT++;
-		IFieldProxy result = (IFieldProxy) REMStandardBeanProxyConstants.getConstants(aBeanTypeProxy.getProxyFactoryRegistry()).getClassGetField().invokeCatchThrowableExceptions(
-				aBeanTypeProxy,
-				registry.getBeanProxyFactory().createBeanProxyWith(fieldName));	
-		synchronized (this) {
-			IFieldProxy fValue = (IFieldProxy) fields.get(fieldName);
-			if (fValue != null) {
-				registry.releaseProxy(result);	// Don't need it now. A race had put another one in.
-				return fValue;
-			}
-			fields.put(fieldName,result);
-		}
-		return result;				
-	}
-	
-	public IProxyField getFieldProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, final String fieldName){
-		if (!registry.isValid())
-			return null;
-		
-		REMFIELDCOUNT++;
-		Map fields;
-		Map epFields;
-		synchronized (this) {
-			// The classCache map is keyed by the BeanTypeProxy name and holds a further map of cache'd methods
-			fields = getFields(aBeanTypeProxy);	
-		
-			IProxyField result = (IProxyField) fields.get(fieldName);
-			if (result != null)
-				return result;
-			
-			// See if stored in the expression.
-			epFields = ((REMExpression) expression).getFields(aBeanTypeProxy);
-			result = (IProxyField) epFields.get(fieldName);
-			if (result != null)
-				return result;			
-		}
-		
-		UNIQUEFIELDCOUNT++;
-		// Get the field expression proxy and cache this before returning it
-		IProxyField result = ((REMExpression) expression).createFieldExpressionProxy(aBeanTypeProxy, fieldName);
-		epFields.put(fieldName, result);
-		final Map fpFields = fields;
-		final Map fepFields = epFields;
-		((ExpressionProxy) result).addProxyListener(new ExpressionProxy.ProxyAdapter() {
-
-			public void proxyResolved(ProxyEvent event) {
-				synchronized (REMProxyConstants.this) {
-					if (fpFields.containsKey(fieldName))
-						return;	// Already set to resolved value by someone else.
-					fpFields.put(fieldName, event.getProxy());
-				}
-			}
-			 public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
-				 synchronized (REMProxyConstants.this) {
-					 fepFields.remove(fieldName);
-				}
-			 }
-		});
-		
-		return result;				
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java
deleted file mode 100644
index db1e31ed3..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java
+++ /dev/null
@@ -1,476 +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.proxy.remote;
-/*
-
-
- */
-
-
-import java.io.IOException;
-import java.net.Socket;
-import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IStreamsProxy;
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * This is the factory registry to use for Remote VM.
- * It adds to the standard registry, connection specific information.
- *
- * This will always hold onto one connection open until termination is requested.
- * That way while the IDE is up, the remove vm won't time out.
- */
-
-public class REMProxyFactoryRegistry extends BaseProxyFactoryRegistry {
-	
-	public static final String REMOTE_REGISTRY_TYPE_ID = "org.eclipse.jem.REMOTE";	//$NON-NLS-1$
-	
-	protected int fServerPort = 0;	// The server port to use when making connections.
-	protected REMCallbackRegistry fCallbackServer;	// The callback server thread for this remote vm.
-	protected Stack fConnectionPool = new Stack();	// Stack of free connections.
-	protected static int NUMBER_FREE_CONNECTIONS = 5;	// Number of free connections to keep open.
-	protected IProcess fProcess;	// The process that is the server. If null and fServerPort is not zero, 
-									// then this registry is in test mode
-									// and the server is in same the process.
-	protected String fName;
-	protected int fCallbackServerPort;
-	protected Integer fRegistryKey;
-	protected REMRegistryController fRegistryController;
-	
-	protected final static Object TERMINATE_JOB_FAMILY = new Object();
-	
-	// Package protected because only the ProxyVMStarter should set this flag. It would set it if
-	// working with a debugger because we don't how long it will be to respond to requests when 
-	// someone is working with a debugger.
-	boolean fNoTimeouts = false;
-	
-	// This is set via the static setGlobalNoTimeouts() method, or via debug options flag. It is here so that
-	// when debugging callbacks, but not debugging remote vm, that no timeouts for any registry will occur.
-	// Or it can be set through the debug .options flag.
-	static boolean fGlobalNoTimeouts = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName()+ProxyRemoteUtil.NO_TIMEOUTS)); //$NON-NLS-1$;
-	
-	/**
-	 * Typicall set through the "expression" evaluation of the debugger.
-	 * @param noTimeouts
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void setGlobalNoTimeouts(boolean noTimeouts) {
-		fGlobalNoTimeouts = noTimeouts;
-	}
-	
-	// An internal thread that locks and waits for the remote vm to register itself. 
-	private WaitForRegistrationThread waitRegistrationThread;
-	
-	private class WaitForRegistrationThread extends Thread {
-		public WaitForRegistrationThread() {
-			super("Wait for remote vm registration thread"); //$NON-NLS-1$
-		}
-		
-		/**
-		 * @see java.lang.Thread#run()
-		 */
-		public void run() {
-			// Wait for registration. Put it into a thread so this
-			// can occur while other stuff goes on. It locks the fConnectionPool
-			// until done so that the first request for a connection by anyone
-			// else will wait until this thread is finished. 
-			
-			synchronized(fConnectionPool) {
-				synchronized(REMProxyFactoryRegistry.this) {
-					// Notify the main thread that we have the 
-					// connection pool locked.
-					REMProxyFactoryRegistry.this.notifyAll();
-				}
-				synchronized (this) {
-					// sync on self so that it can be notified when finally receive the registration
-					long stopTime = System.currentTimeMillis()+60000;
-					while (waitRegistrationThread != null && (fNoTimeouts || System.currentTimeMillis() < stopTime)) {
-						try {
-							Thread.currentThread().wait(60000);
-						} catch (InterruptedException e) {
-						}
-					}
-				}
-			}
-			
-			waitRegistrationThread = null;	// No longer exists.				
-		}
-	}
-
-	
-	public REMProxyFactoryRegistry(REMRegistryController registryController, String name) {
-		super(REMOTE_REGISTRY_TYPE_ID);
-		fRegistryController = registryController;		
-		fRegistryKey = fRegistryController.registerRegistry(this);	// Register the registry with the plugin.		
-		fName = name;		
-		
-		// Get the waitRegistrationThread started before we actually launch remote vm so
-		// that it is waiting when the callback comes in.
-		synchronized (this) {
-			waitRegistrationThread = new WaitForRegistrationThread();
-			waitRegistrationThread.start();
-			
-			// Now we will wait until the registration callback has been done. The thread will
-			// signal us when that is done. This is so that we don't continue on and let
-			// a work connection be requested before we even got a chance to start waiting
-			// for the registration.
-			while(true) {
-				try {
-					wait();
-					break;
-				} catch (InterruptedException e) {
-				}
-			};		
-		}		
-	}
-	
-	public Integer getRegistryKey() {
-		return fRegistryKey;
-	}
-	
-	public void initializeRegistry(IProcess process) {
-		fProcess = process;
-		processListener = new IDebugEventSetListener() {
-			/**
-			 * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(DebugEvent[])
-			 */
-			public void handleDebugEvents(DebugEvent[] events) {
-				for (int i = 0; i < events.length; i++) {
-					DebugEvent e = events[i];
-					if (e.getSource() == fProcess && e.getKind() == DebugEvent.TERMINATE) {
-						// We terminating too soon. Pop up a msg.
-						IStreamsProxy stProxy = fProcess.getStreamsProxy();
-						java.io.StringWriter s = new java.io.StringWriter();
-						java.io.PrintWriter w = new java.io.PrintWriter(s);
-		
-						String msg = MessageFormat.format(ProxyRemoteMessages.Proxy_Terminated_too_soon_ERROR_, new Object[] {fName}); 
-						w.println(msg);						
-						w.println(ProxyRemoteMessages.VM_TERMINATED_INFO_);
-						w.println(ProxyRemoteMessages.VM_COMMAND_LINE);
-						w.println(fProcess.getAttribute(IProcess.ATTR_CMDLINE));						
-						w.println(ProxyRemoteMessages.VM_TERMINATED_LINE1); 
-						w.println(stProxy.getErrorStreamMonitor().getContents());
-						w.println(ProxyRemoteMessages.VM_TERMINATED_LINE2); 
-						w.println(stProxy.getOutputStreamMonitor().getContents());
-						w.println(ProxyRemoteMessages.VM_TERMINATED_LINE3); 
-						w.close();
-		
-						DebugModeHelper dh = new DebugModeHelper();
-						dh.displayErrorMessage(ProxyRemoteMessages.Proxy_Error_Title, msg); 
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, s.toString(), null));
-						processListener = null;
-						DebugPlugin.getDefault().removeDebugEventListener(this);						
-						terminateRegistry();
-						break;
-					}
-				}
-			}
-		};
-		
-		DebugPlugin.getDefault().addDebugEventListener(processListener);
-	}
-	
-	private IDebugEventSetListener processListener = null;
-	
-	/**
-	 * Get the CallbackRegistry
-	 */
-	public ICallbackRegistry getCallbackRegistry() {
-		if (fCallbackServer == null)
-			fCallbackServer = new REMCallbackRegistry(fName, this);
-		return fCallbackServer;
-	}
-	
-	/**
-	 * This is called by the registry controller to tell
-	 * the registry to terminate with prejudice all 
-	 * pending TerminateJobs.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void cancelAllTerminateJobs() {
-		IJobManager jobManager = Job.getJobManager();
-		jobManager.cancel(TERMINATE_JOB_FAMILY);
-		try {
-			jobManager.join(TERMINATE_JOB_FAMILY, null);
-		} catch (OperationCanceledException e) {
-		} catch (InterruptedException e) {
-		}
-	}
-	
-	private static class TerminateProcess extends Job {
-		private IProcess process;
-		
-		public TerminateProcess(IProcess process) {
-			super(ProxyRemoteMessages.REMProxyFactoryRegistry_Job_TerminateProcess_Title);	 
-			this.process = process;
-		}
-		
-		public boolean belongsTo(Object family) {
-			return family == TERMINATE_JOB_FAMILY || super.belongsTo(family);
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Thread#run()
-		 */
-		public IStatus run(IProgressMonitor mon) {
-			try {
-				// There is no join on a process available, so we will have to
-				// busy wait. Give it 10 seconds in 1/10 second intervals.
-				for (int i=0; !process.isTerminated() && i<100; i++) {
-					try {
-						Thread.sleep(100);							
-					} catch (InterruptedException e) {
-					}
-				}
-				if (!process.isTerminated()) {
-					process.terminate();
-				} 
-			} catch (DebugException e) {
-			}
-			return Status.OK_STATUS;
-		}
-	}
-	
-	protected void registryTerminated(boolean wait) {
-		if (processListener != null) {
-			// Remove listener cause we are now going to terminate process and don't want premature terminate notice.
-			// Sometimes in shutdown we are called and the debug plugin may of already been shutdown. In that case the db
-			// will be null and there is nothing remove listener from.
-			DebugPlugin db = DebugPlugin.getDefault();
-			if (db != null)
-				db.removeDebugEventListener(processListener);
-			processListener = null;
-		}
-		
-		Job tjob = null;
-		if (waitRegistrationThread != null) {
-			synchronized (waitRegistrationThread) {
-				// Still waiting. close it out.
-				WaitForRegistrationThread wThread = waitRegistrationThread;
-				waitRegistrationThread = null;
-				wThread.notifyAll();
-			}
-		}		
-		if (fServerPort != 0) {					
-			IREMConnection closeCon = null;	// The connection we will use to close the remote vm.
-			synchronized(fConnectionPool) {
-				// Now we walk through all of the free connections and close them properly.
-				Iterator itr = fConnectionPool.iterator();
-				if (itr.hasNext())
-					closeCon = (IREMConnection) itr.next();
-				while (itr.hasNext()) {
-					IREMConnection con = (IREMConnection) itr.next();
-					con.close();
-				}
-			}
-				
-			// Now we terminate the server.
-			if (closeCon == null)
-				try {
-					closeCon = getFreeConnection();	// There weren't any free connections, so get a new one so that we can close it.
-				} catch (IllegalStateException e) {
-					// Do nothing, don't want to stop termination just because we can't get a connection.
-				}
-			if (closeCon != null) {
-				closeCon.terminateServer();	// We got a connection to terminate (process may of terminated early, so we would not have a conn then).
-			}
-			fConnectionPool.clear();
-			fServerPort = 0;
-			
-			if (fProcess != null && !fRegistryController.inShutDown()) {
-				tjob = new TerminateProcess(fProcess);
-				tjob.setSystem(true);
-				tjob.schedule();
-				fProcess = null;
-			}
-		}
-	
-		if (fCallbackServer != null) {
-			fCallbackServer.requestShutdown();
-			fCallbackServer = null;				
-		}
-		
-		fConnectionPool.clear();
-		fRegistryController.deregisterRegistry(fRegistryKey);	// De-register this registry.
-		
-		if (wait && tjob != null) {
-			try {
-				tjob.join();
-			} catch (InterruptedException e) {
-				// It timed out, so we'll just go on.
-			}
-		}
-	}
-			
-	/**
-	 * Return the server port number.
-	 */
-	public int getServerPort() {
-		return fServerPort;
-	}
-	
-	/*
-	 * set the server port.
-	 */
-	void setServerPort(int serverport) {
-		fServerPort = serverport;
-		if (waitRegistrationThread != null) {
-				synchronized (waitRegistrationThread) {
-					// Close it out, we are now registered
-					WaitForRegistrationThread wThread = waitRegistrationThread;
-					waitRegistrationThread = null;
-					wThread.notifyAll();
-				}
-		}
-	}
-	
-	/**
-	 * Get a free connection
-	 * @return
-	 * @throws IllegalStateException - Thrown if a connection cannot be created.
-	 * 
-	 * @since 1.0.0
-	 */
-	public IREMConnection getFreeConnection() throws IllegalStateException {
-		Thread thread = Thread.currentThread();
-		if (thread instanceof REMCallbackThread) {
-			// The current thread is a call back thread, so just reuse the connection.
-			// But this thread could actually be trying to access another registry.
-			// So if this thread is for this registry, use it, if not for this registry, create a new connection.
-			// But if for this registry AND is already in a transaction, we need a fresh connection.
-			REMCallbackThread callbackThread = (REMCallbackThread) thread;
-			if (callbackThread.registry == this && !callbackThread.inTransaction()) {
-				// This way any calls out to the remote vm will be on same thread as callback caller
-				// on remote vm because that thread is waiting on this connection for commands.
-				IREMConnection c = (callbackThread).getConnection();
-				if (c.isConnected())
-					return c;
-				else
-					throw new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_CallbackConnectionNotWorking_EXC_); 
-			}
-		}
-		synchronized(fConnectionPool) {
-			if (!fConnectionPool.isEmpty())
-				return (IREMConnection) fConnectionPool.pop();
-			// else we need to allocate one.			
-			return createConnection();
-		}
-	}
-	
-
-	/**
-	 * Make a new connection.
-	 * @return
-	 * @throws IllegalStateException - Thrown if connection cannot be created.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected IREMConnection createConnection() throws IllegalStateException {
-		// If we have a server port, then the server is probably open. If we don't then there is no server.
-		if (fServerPort != 0) {
-			// We are putting it off into a thread because there are no timeout capabilities on getting a socket.
-			// So we need to allow for that.
-			final Socket[] scArray = new Socket[1];
-			final boolean[] waiting = new boolean[] {true};
-			Thread doIt = new Thread(new Runnable() {
-				public void run() {
-					try {
-						Socket sc = new Socket("localhost", fServerPort); //$NON-NLS-1$
-						synchronized (this) {
-							if (waiting[0])
-								scArray[0] = sc;
-							else
-								sc.close();	// We are no longer waiting on this thread so close the socket since no one will use it.
-						}
-					} catch (IOException e) {
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-					}
-				}
-			});
-			
-			doIt.start();
-			while (true) {
-				try {
-					doIt.join(!fNoTimeouts ? 60000 : 0);
-					synchronized (doIt) {
-						waiting[0] = false;	// To let it know we are no longer waiting
-					}
-					break;
-				} catch (InterruptedException e) {
-				}
-			}
-			
-			if (scArray[0] == null)  {
-				// Log where we are at so we can know where it was we down.
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_ConnectionCreationFailed_INFO_)));	 //$NON-NLS-1$
-				throw new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_CouldNotCreateSocketConnectionToRemoteVM_EXC_);	// Couldn't get one, probably server is down. //$NON-NLS-1$
-			}
-
-			REMConnection connection = new REMConnection(scArray[0], fNoTimeouts);
-			if (connection.isConnected())
-				return connection;
-				
-			// Failed, close the socket. 
-			try {
-				scArray[0].close();
-			} catch (IOException e) {
-			}
-		} else
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "No Server to retrieve a connection.", null));	///$NON-NLS-1$
-		
-		throw new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_CouldNotCreateSocketConnectionToRemoteVM_EXC_); 
-	}
-		 
-	/**
-	 * Free the connection
-	 */
-	public void returnConnection(IREMConnection connection) {
-		if (connection.isConnected()) {
-			Thread thread = Thread.currentThread();
-			if (!(thread instanceof REMCallbackThread) || ((REMCallbackThread) thread).getConnection() != connection) {
-				// We are not a callback thread, or we are but the connection is not for the thread, then the connection
-				// can be returned.
-				synchronized (fConnectionPool) {
-					if (fConnectionPool.size() < NUMBER_FREE_CONNECTIONS)
-						fConnectionPool.push(connection);
-					else
-						connection.close();	// We don't need to maintain more than five free connections.
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Release this connection. This means close it out.
-	 */
-	public void closeConnection(IREMConnection connection) {
-		connection.close();
-	}
-	
-	
-	public int connectionCount() {
-		synchronized (fConnectionPool) {
-			return fConnectionPool.size();
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java
deleted file mode 100644
index 8405d6fc5..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java
+++ /dev/null
@@ -1,198 +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.proxy.remote;
-/*
-
-
- */
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
-
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-
-/**
- * This class is a controller for all of the registries.
- * @author richkulp
- */
-public class REMRegistryController {
-	
-	private Map fActiveRegistries = new HashMap();	// Access to this must be sync(REMRegistryController)
-	private static final long CLEANUP_INTERVAL = 60000l;	// The interval between clean up job execution.
-	
-	protected boolean inShutdown;	// Are we in shutdown mode. Terminate registries runs differently in shutdown mode.
-	
-	// Thread to clean up GC'd proxies. Runs as a daemon at the lowest priority
-	private Job processQueueJob= new Job(ProxyRemoteMessages.CleanupJob_title) { 
-		public IStatus run(IProgressMonitor m) {
-				REMProxyFactoryRegistry[] registries = null;
-				synchronized (REMRegistryController.this) {
-					// This list may be updated by others, so we need to make a copy
-					// or else we could get a failure.
-					registries = 
-						(REMProxyFactoryRegistry[]) fActiveRegistries.values().toArray(
-							new REMProxyFactoryRegistry[fActiveRegistries.size()]);
-				}
-				for (int i = 0; i < registries.length; i++) {
-					try {
-						((REMStandardBeanProxyFactory) registries[i].getBeanProxyFactory()).processQueue();					
-					} catch (RuntimeException e) {
-						// When debugging, getBeanProxyFactory can throw exception because it hasn't been initialized
-						// yet when the thread wakes up, though the registry has been registered. It has to do with it 
-						// can take significant time for the user to start up the debugger, and during that time this
-						// thread could kick in.
-					}
-				}
-			synchronized(this) {
-				if (!m.isCanceled())
-					this.schedule(CLEANUP_INTERVAL);	// Schedule to start again in one minute.
-			}
-			return Status.OK_STATUS;
-		}
-
-	}; //$NON-NLS-1$	
-	
-	public REMRegistryController() {
-
-		ProxyPlugin.getPlugin().addProxyShutdownListener(new ProxyPlugin.IProxyPluginShutdownListener() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jem.internal.proxy.core.ProxyPlugin.IProxyPluginShutdownListener#shutdown()
-			 */
-			public void shutdown() {
-				REMRegistryController.this.shutdown();
-			}
-		});
-
-		masterThread = new REMMasterServerThread(this);
-		masterThread.start();
-
-		processQueueJob.setSystem(true);	// So that it won't show processing in process view. Not of interest to general users.
-		processQueueJob.setPriority(Job.SHORT);
-		processQueueJob.schedule(CLEANUP_INTERVAL);
-
-	}
-	
-	/**
-	 * Answer whether we are shutting down or not.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean inShutDown() {
-		return inShutdown;
-	}
-	
-	/*
-	 * Add registry to list of active. Return a unique number to be the key.
-	 * Package-protected so that only locals can access it.
-	 */
-	synchronized Integer registerRegistry(REMProxyFactoryRegistry registry) {
-			
-		Integer hashcode = new Integer(registry.hashCode());		
-		while (true) {
-			REMProxyFactoryRegistry existing = (REMProxyFactoryRegistry) fActiveRegistries.get(hashcode);
-			if (existing == null)
-				break;	// Not yet registered, use use the hashcode
-			else if (existing != registry)
-				hashcode = new Integer(hashcode.intValue()+1);						
-			else
-				return hashcode;	// Same guy, use the hashcode.
-		}
-		
-		fActiveRegistries.put(hashcode, registry);
-		return hashcode;
-	}
-	
-	/*
-	 * deregister the registry.
-	 */
-	synchronized void deregisterRegistry(Integer key) {
-		fActiveRegistries.remove(key);
-	}
-	
-	/*
-	 * Return the registry for the given key
-	 */
-	synchronized REMProxyFactoryRegistry getRegistry(Integer key) {
-		return (REMProxyFactoryRegistry) fActiveRegistries.get(key);
-	}
-	
-	/**
-	 * Master server thread. Handles keep-alive requests and register remote server threads.
-	 * It will be created when needed.
-	 */
-	protected REMMasterServerThread masterThread;
-
-	/*
-	 * Shuts down this plug-in and discards all plug-in state.
-	 *
-	 * In this case, terminate all of the active registries so that they can be shutdown.
-	 * Don't want them hanging around after termination of the desktop.
-	 */
-	void shutdown() {
-		
-		synchronized(processQueueJob) {
-			processQueueJob.cancel();
-		}
-			
-		REMProxyFactoryRegistry[] registries = null;
-		synchronized (this) {
-			// This list will be updated in the terminateRegistry, so we need to make a copy
-			// or else we get a failure.
-			registries = 
-				(REMProxyFactoryRegistry[]) fActiveRegistries.values().toArray(
-					new REMProxyFactoryRegistry[fActiveRegistries.size()]);
-		}
-		
-		inShutdown = true;	// We are now in shutdown mode.
-		// In shutdown mode the registries will not create the job that waits for the process
-		// to terminate, and if it doesn't in 1.5 secs it does a force.
-		// Instead what we will do is shutdown all of the registries. If they don't
-		// shutdown on their own then they stay out there. But they do have an
-		// internal timer that checks every five minutes to see if the host is 
-		// still there, and if it isn't they will shut themselves down. They
-		// would have to be really hosed if the suicide timer wasn't working.
-		
-		for (int i = 0; i < registries.length; i++)
-			registries[i].terminateRegistry();
-			
-		if (masterThread != null) {
-			try {
-				masterThread.requestShutdown();
-				masterThread.join(20000);	// Wait 20 seconds for everything to go down.
-				masterThread = null;				
-			} catch (InterruptedException e) {
-			}
-		}
-		
-		try {
-			processQueueJob.join();
-		} catch(InterruptedException e) {
-		}
-		
-		REMProxyFactoryRegistry.cancelAllTerminateJobs();
-	}
-	
-	/**
-	 * Return the master socket port number.
-	 */
-	public int getMasterSocketPort() {
-		return masterThread != null ? masterThread.getMasterSocket().getLocalPort() : -1;
-	}	
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanProxy.java
deleted file mode 100644
index 27ea767c6..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanProxy.java
+++ /dev/null
@@ -1,44 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Short.class.
- */
-class REMShortClassBeanProxy extends REMNumberBeanProxy {
-
-REMShortClassBeanProxy(REMProxyFactoryRegistry aRegistry, Short aShort) {
-	super(aRegistry, aShort);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).shortClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Short) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanTypeProxy.java
deleted file mode 100644
index d93e66fc8..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanTypeProxy.java
+++ /dev/null
@@ -1,84 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Short.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMShortClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMShortClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.SHORT_CLASS), Short.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)0));	
-	oneProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)1));
-	twoProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)2));
-	threeProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)3));		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createShortBeanProxy(Short aShort) {
-	switch(aShort.shortValue()) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMShortClassBeanProxy(fRegistry, aShort);
-	}
-}
-
-/**
- * Generic way to create a Short proxy, however, the Number must be a Short.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createShortBeanProxy((Short) aNumber);
-}	
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createShortBeanProxy(new Short(value.aShort));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanProxy.java
deleted file mode 100644
index d2bc1e2d8..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanProxy.java
+++ /dev/null
@@ -1,132 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for the primitive "short".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMShortTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final short fShort;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMShortTypeBeanProxy(REMProxyFactoryRegistry aRegistry, short aShort) {
-	super(aRegistry);
-	fShort = aShort;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMShortTypeBeanProxy)
-		return fShort == ((REMShortTypeBeanProxy) anObject).shortValue();
-	if (anObject instanceof Short)
-		return fShort == ((Short) anObject).shortValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMShortTypeBeanProxy)
-		return fShort == ((REMShortTypeBeanProxy) aBeanProxy).shortValue();
-	return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return (byte) fShort;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fShort;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fShort;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return fShort;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return fShort;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Short(fShort);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return fShort;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fShort);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).shortType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fShort);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanTypeProxy.java
deleted file mode 100644
index 8dbbd7f48..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,109 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Short.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMShortTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMShortTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.SHORT_TYPE), Short.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMShortTypeBeanProxy(aRegistry, (short) 0);	
-	oneProxy = new REMShortTypeBeanProxy(aRegistry, (short) 1);
-	twoProxy = new REMShortTypeBeanProxy(aRegistry, (short) 2);
-	threeProxy = new REMShortTypeBeanProxy(aRegistry, (short) 3);		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createShortBeanProxy(short aShort) {
-	switch(aShort) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMShortTypeBeanProxy(fRegistry, aShort);
-	}
-}
-
-/**
- * newInstance method. short is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}	
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createShortBeanProxy(value.aShort);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (short) validNumber - number can be any number because (byte) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of short to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);	
-	short aShort;
-	if (trim.startsWith("(short)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(short)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			aShort = v.shortValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		try {
-			aShort = Short.decode(trim).shortValue();	// See if valid short format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aShort);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java
deleted file mode 100644
index 70faa919e..000000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java
+++ /dev/null
@@ -1,514 +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.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.IMethodProxy;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-/**
- * REM Standard Proxy constants.
- *
- * Use the static accessor method (getConstants()) to get the appropriate 
- * constants instance for the registry. This is done so that until the
- * the constants are needed, they aren't registered.
- *
- * There are some standard utility functions too.
- *
- * This is final because this can't be extended. This specific one
- * will be registered with the factory for this key. Any extensions
- * must be done in their own constants and registry key.
- *
- * Creation date: (4/7/00 4:47:48 PM)
- * @author: Administrator
- */
-public final class REMStandardBeanProxyConstants {
-	public static final Object REGISTRY_KEY = new Object();
-		
-	private final ProxyFactoryRegistry fRegistry;
-	
-	private IMethodProxy fClassNewInstance;
-	private IMethodProxy fClassGetField;
-	private IMethodProxy fClassGetDeclaredField;
-	private IMethodProxy fClassGetDeclaredFields;	
-	private IMethodProxy fClassGetFields;	
-	private IMethodProxy fClassGetConstructor;
-	private IMethodProxy fClassGetConstructors;
-	private IMethodProxy fClassGetDeclaredConstructor;
-	private IMethodProxy fClassGetDeclaredConstructors;
-	private IMethodProxy fClassGetMethods;
-	private IMethodProxy fClassGetDeclaredMethods;
-	private IMethodProxy fClassGetDeclaredMethod;
-	
-	private IMethodProxy fMethodHelperFindCompatibleConstructor;
-	private IMethodProxy fMethodHelperFindCompatibleMethod;
-	
-	private IMethodProxy fClassIsAssignableFrom;
-	
-	private IMethodProxy fObjectToString;
-	private IMethodProxy fObjectEquals;
-	
-	private IMethodProxy fThrowableLocalizedMessage;
-	private IMethodProxy fThrowableMessage;
-	
-	private IMethodProxy fMethodDeclaringClassMessage;
-	private IMethodProxy fMethodMethodNameMessage;
-	private IMethodProxy fMethodParameterTypesMessage;
-	private IMethodProxy fMethodReturnTypeMessage;
-	
-	private IMethodProxy fAccessibleIsAccessible;
-	private IMethodProxy fAccessibleSetAccessible;
-	
-	private IMethodProxy fFieldGet;
-	private IMethodProxy fFieldGetType;
-	private IMethodProxy fFieldGetByte;
-	private IMethodProxy fFieldGetBoolean;
-	private IMethodProxy fFieldGetChar;
-	private IMethodProxy fFieldGetDouble;
-	private IMethodProxy fFieldGetFloat;
-	private IMethodProxy fFieldGetInt;
-	private IMethodProxy fFieldGetShort;
-	private IMethodProxy fFieldGetLong;	
-	private IMethodProxy fFieldSet;
-	
-	private IMethodProxy fConstructorNewInstance;	
-	private IMethodProxy fConstructorParameterTypesMessage;
-	
-	private IMethodProxy fArrayNewInstanceOneDimension;
-	private IMethodProxy fArrayNewInstanceMultiDimensions;
-	private IMethodProxy fArrayGetLength;
-	private IMethodProxy fArrayGet;
-	private IMethodProxy fArrayGetByte;
-	private IMethodProxy fArrayGetBoolean;
-	private IMethodProxy fArrayGetChar;
-	private IMethodProxy fArrayGetDouble;
-	private IMethodProxy fArrayGetFloat;
-	private IMethodProxy fArrayGetInt;
-	private IMethodProxy fArrayGetShort;
-	private IMethodProxy fArrayGetLong;	
-	private IMethodProxy fArraySet;	
-	
-	private IMethodProxy fArrayHelperGet;
-	private IMethodProxy fArrayHelperGetByte;
-	private IMethodProxy fArrayHelperGetBoolean;
-	private IMethodProxy fArrayHelperGetChar;
-	private IMethodProxy fArrayHelperGetDouble;
-	private IMethodProxy fArrayHelperGetFloat;
-	private IMethodProxy fArrayHelperGetInt;
-	private IMethodProxy fArrayHelperGetShort;
-	private IMethodProxy fArrayHelperGetLong;	
-	private IMethodProxy fArrayHelperSet;
-	private IMethodProxy fArrayHelperEquals;
-	
-/**
- * Get the constants instance for the specified registry.
- */
-public static REMStandardBeanProxyConstants getConstants(ProxyFactoryRegistry registry) {
-	REMStandardBeanProxyConstants constants = (REMStandardBeanProxyConstants) registry.getConstants(REGISTRY_KEY);
-	if (constants == null)
-		registry.registerConstants(REGISTRY_KEY, constants = new REMStandardBeanProxyConstants(registry));	
-	return constants;
-}
-
-
-private REMStandardBeanProxyConstants(ProxyFactoryRegistry registry) {
-	super();
-	fRegistry = registry;
-}
-
-public IMethodProxy getClassNewInstance() {
-	// We actually need a special new instance because we want to be able to access outside of security. For our purposes security doesn't matter for construction.
-	if (fClassNewInstance == null)
-		fClassNewInstance = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ClassHelper", "newInstance", new String[] {"java.lang.Class"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fClassNewInstance;
-}
-
-public IMethodProxy getClassGetField() {
-	if (fClassGetField == null)
-		fClassGetField = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getField", new String[] {"java.lang.String"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fClassGetField;
-}
-
-public IMethodProxy getClassConstructor() {
-	if (fClassGetConstructor == null)
-		fClassGetConstructor = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getConstructor", new String[] {"[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fClassGetConstructor;
-}
-
-public IMethodProxy getClassConstructors() {
-	if (fClassGetConstructors == null)
-		fClassGetConstructors = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getConstructors", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fClassGetConstructors;
-}
-
-public IMethodProxy getDeclaredClassConstructor() {
-	if (fClassGetDeclaredConstructor == null)
-		fClassGetDeclaredConstructor = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredConstructor", new String[] {"[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fClassGetDeclaredConstructor;
-}
-
-public IMethodProxy getDeclaredClassConstructors() {
-	if (fClassGetDeclaredConstructors == null)
-		fClassGetDeclaredConstructors = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredConstructors", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fClassGetDeclaredConstructors;
-}
-
-public IMethodProxy getClassIsAssignableFrom() {
-	if (fClassIsAssignableFrom == null)
-		fClassIsAssignableFrom = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "isAssignableFrom", new String[] {"java.lang.Class"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fClassIsAssignableFrom;
-}
-
-public IMethodProxy getObjectToString() {
-	if (fObjectToString == null)
-		fObjectToString = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Object", "toString", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fObjectToString;
-}
-
-public IMethodProxy getObjectEquals() {
-	if (fObjectEquals == null)
-		fObjectEquals = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Object", "equals", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fObjectEquals;
-}
-public IMethodProxy getThrowableLocalizedMessage() {
-	if (fThrowableLocalizedMessage == null)
-		fThrowableLocalizedMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Throwable", "getLocalizedMessage", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fThrowableLocalizedMessage;
-}
-
-public IMethodProxy getThrowableMessage() {
-	if (fThrowableMessage == null)
-		fThrowableMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Throwable", "getMessage", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fThrowableMessage;
-}
-
-public IMethodProxy getMethodDeclaringClassMessage() {
-	if (fMethodDeclaringClassMessage == null)
-		fMethodDeclaringClassMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getDeclaringClass", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fMethodDeclaringClassMessage;
-}
-
-public IMethodProxy getMethodMethodNameMessage() {
-	if (fMethodMethodNameMessage == null)
-		fMethodMethodNameMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getName", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fMethodMethodNameMessage;
-}	
-
-public IMethodProxy getMethodParameterTypesMessage() {
-	if (fMethodParameterTypesMessage == null)
-		fMethodParameterTypesMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getParameterTypes", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fMethodParameterTypesMessage;
-}
-
-public IMethodProxy getMethodReturnTypeMessage() {
-	if (fMethodReturnTypeMessage == null)
-		fMethodReturnTypeMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getReturnType", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fMethodReturnTypeMessage;
-}
-
-public IMethodProxy getAccessibleIsAccessible() {
-	if (fAccessibleIsAccessible == null)
-		fAccessibleIsAccessible = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.AccessibleObject", "isAccessible", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fAccessibleIsAccessible;
-}
-
-public IMethodProxy getAccessibleSetAccessible() {
-	if (fAccessibleSetAccessible == null)
-		fAccessibleSetAccessible = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.AccessibleObject", "setAccessible", new String[] {"boolean"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fAccessibleSetAccessible;
-}
-
-public IMethodProxy getFieldGetType() {
-	if (fFieldGetType == null)
-		fFieldGetType = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getType", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fFieldGetType;
-}
-
-public IMethodProxy getFieldGet() {
-	if (fFieldGet == null)
-		fFieldGet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "get", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGet;
-}
-
-public IMethodProxy getFieldGetByte() {
-	if (fFieldGetByte == null)
-		fFieldGetByte = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getByte", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetByte;
-}
-
-public IMethodProxy getFieldGetBoolean() {
-	if (fFieldGetBoolean == null)
-		fFieldGetBoolean = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getBoolean", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetBoolean;
-}
-
-public IMethodProxy getFieldGetChar() {
-	if (fFieldGetChar == null)
-		fFieldGetChar = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getChar", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetChar;
-}
-
-public IMethodProxy getFieldGetDouble() {
-	if (fFieldGetDouble == null)
-		fFieldGetDouble = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getDouble", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetDouble;
-}
-
-public IMethodProxy getFieldGetFloat() {
-	if (fFieldGetFloat == null)
-		fFieldGetFloat = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getFloat", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetFloat;
-}
-
-public IMethodProxy getFieldGetInt() {
-	if (fFieldGetInt == null)
-		fFieldGetInt = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getInt", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetInt;
-}
-
-public IMethodProxy getFieldGetLong() {
-	if (fFieldGetLong == null)
-		fFieldGetLong = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getLong", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetLong;
-}
-
-public IMethodProxy getFieldGetShort() {
-	if (fFieldGetShort == null)
-		fFieldGetShort = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getShort", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetShort;
-}
-
-public IMethodProxy getFieldSet() {
-	if (fFieldSet == null)
-		fFieldSet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "set", new String[] {"java.lang.Object", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fFieldSet;
-}
-
-public IMethodProxy getConstructorNewInstance() {
-	if (fConstructorNewInstance == null)
-		fConstructorNewInstance = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Constructor", "newInstance", new String[] {"[Ljava.lang.Object;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fConstructorNewInstance;
-}
-
-public IMethodProxy getConstructorParameterTypesMessage() {
-	if (fConstructorParameterTypesMessage == null)
-		fConstructorParameterTypesMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Constructor", "getParameterTypes", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fConstructorParameterTypesMessage;
-}
-
-public IMethodProxy getArrayNewInstanceOneDimension() {
-	if (fArrayNewInstanceOneDimension == null)
-		fArrayNewInstanceOneDimension = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "newInstance", new String[] {"java.lang.Class", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayNewInstanceOneDimension;
-}
-
-public IMethodProxy getArrayNewInstanceMultiDimension() {
-	if (fArrayNewInstanceMultiDimensions == null)
-		fArrayNewInstanceMultiDimensions = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "newInstance", new String[] {"java.lang.Class", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayNewInstanceMultiDimensions;
-}
-
-public IMethodProxy getArrayGetLength() {
-	if (fArrayGetLength == null)
-		fArrayGetLength = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getLength", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fArrayGetLength;
-}
-
-public IMethodProxy getArrayGet() {
-	if (fArrayGet == null)
-		fArrayGet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "get", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGet;
-}
-
-public IMethodProxy getArrayGetByte() {
-	if (fArrayGetByte == null)
-		fArrayGetByte = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getByte", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetByte;
-}
-
-public IMethodProxy getArrayGetBoolean() {
-	if (fArrayGetBoolean == null)
-		fArrayGetBoolean = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getBoolean", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetBoolean;
-}
-
-public IMethodProxy getArrayGetChar() {
-	if (fArrayGetChar == null)
-		fArrayGetChar = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getChar", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetChar;
-}
-
-public IMethodProxy getArrayGetDouble() {
-	if (fArrayGetDouble == null)
-		fArrayGetDouble = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getDouble", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetDouble;
-}
-
-public IMethodProxy getArrayGetFloat() {
-	if (fArrayGetFloat == null)
-		fArrayGetFloat = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getFloat", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetFloat;
-}
-
-public IMethodProxy getArrayGetInt() {
-	if (fArrayGetInt == null)
-		fArrayGetInt = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getInt", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetInt;
-}
-
-public IMethodProxy getArrayGetLong() {
-	if (fArrayGetLong == null)
-		fArrayGetLong = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getLong", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetLong;
-}
-
-public IMethodProxy getArrayGetShort() {
-	if (fArrayGetShort == null)
-		fArrayGetShort = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getShort", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetShort;
-}
-
-public IMethodProxy getArraySet() {
-	if (fArraySet == null)
-		fArraySet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "set", new String[] {"java.lang.Object", "int", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	return fArraySet;
-}
-
-public IMethodProxy getArrayHelperGet() {
-	if (fArrayHelperGet == null)
-		fArrayHelperGet = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "get", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGet;
-}
-
-public IMethodProxy getArrayHelperGetByte() {
-	if (fArrayHelperGetByte == null)
-		fArrayHelperGetByte = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getByte", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetByte;
-}
-
-public IMethodProxy getArrayHelperGetBoolean() {
-	if (fArrayHelperGetBoolean == null)
-		fArrayHelperGetBoolean = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getBoolean", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetBoolean;
-}
-
-public IMethodProxy getArrayHelperGetChar() {
-	if (fArrayHelperGetChar == null)
-		fArrayHelperGetChar = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getChar", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetChar;
-}
-
-public IMethodProxy getArrayHelperGetDouble() {
-	if (fArrayHelperGetDouble == null)
-		fArrayHelperGetDouble = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getDouble", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetDouble;
-}
-
-public IMethodProxy getArrayHelperGetFloat() {
-	if (fArrayHelperGetFloat == null)
-		fArrayHelperGetFloat = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getFloat", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetFloat;
-}
-
-public IMethodProxy getArrayHelperGetInt() {
-	if (fArrayHelperGetInt == null)
-		fArrayHelperGetInt = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getInt", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetInt;
-}
-
-public IMethodProxy getArrayHelperGetLong() {
-	if (fArrayHelperGetLong == null)
-		fArrayHelperGetLong = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getLong", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetLong;
-}
-
-public IMethodProxy getArrayHelperGetShort() {
-	if (fArrayHelperGetShort == null)
-		fArrayHelperGetShort = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getShort", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetShort;
-}
-
-public IMethodProxy getArrayHelperSet() {
-	if (fArrayHelperSet == null)
-		fArrayHelperSet = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "set", new String[] {"java.lang.Object", "[I", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	return fArrayHelperSet;
-}
-
-public IMethodProxy getArrayHelperEquals() {
-	if (fArrayHelperEquals == null)
-		fArrayHelperEquals = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "equals", new String[] {"java.lang.Object", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperEquals;
-}
-