This commit was manufactured by cvs2svn to create tag 'R3_0_0'.
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/.classpath b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/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.jst.j2ee.xdoclet.runtime/.cvsignore b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/.cvsignore
deleted file mode 100644
index 51e1008..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-temp.folder
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/.project b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/.project
deleted file mode 100644
index 3096307..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.xdoclet.runtime</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index c949756..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.j2ee.xdoclet.runtime; singleton:=true
-Bundle-Version: 1.1.102.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletRuntimePlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Require-Bundle:  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.ejb.annotations.xdoclet;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.ejb.annotation.model;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.jst.j2ee.xdoclet.runtime.internal;x-internal:=true,
- org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;x-internal:=true,
- org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/about.html b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the 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/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/build.properties b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/build.properties
deleted file mode 100644
index 2293cda..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-               
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/plugin.properties b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/plugin.properties
deleted file mode 100644
index 56c85db..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/plugin.properties
+++ /dev/null
@@ -1,70 +0,0 @@
-name_xdoclet=XDocletRuntime Plug-in
-
-xdoclet.121=XDoclet 1.2.1
-xdoclet.122=XDoclet 1.2.2
-xdoclet.123=XDoclet 1.2.3
-
-webdoclet.deploymentdesc=DeploymentDescriptor Webdoclet Task Provider
-webdoclet.deploymentdesc.desc=Adds DeploymentDescriptor task to webdoclet
-webdoclet.deploymentdesc.useIds=If this attribute is set to true, XDoclet will generate id attributes in the XML document. Note that this is only available in some subtasks.
-webdoclet.deploymentdesc.servletspec=The Servlet spec version to which the web application conforms. Valid values: 2.2, 2.3, 2.4
-webdoclet.deploymentdesc.displayname=Sets the Displayname attribute of the WebXmlSubTask object
-webdoclet.deploymentdesc.validatexml=If this is set to true, the generated XML will be validated against its DTD or XML Schema.
-webdoclet.deploymentdesc.mergedir=Specifies the location of the merge directory. This is where XDoclet will look for merge files.
-webdoclet.deploymentdesc.destdir=Sets the directory where the generated file(s) will be written.
-
-ejbdoclet.deploymentdesc=DeploymentDescriptor Ejbdoclet Task Provider
-ejbdoclet.deploymentdesc.desc=Adds DeploymentDescriptor task to ejbdoclet
-ejbdoclet.deploymentdesc.useIds=If this attribute is set to true, XDoclet will generate id attributes in the XML document. Note that this is only available in some subtasks.
-ejbdoclet.deploymentdesc.description=Sets the Description attribute of the EjbDotXmlSubTask object
-ejbdoclet.deploymentdesc.displayname=Sets the Displayname attribute of the EjbDotXmlSubTask object
-ejbdoclet.deploymentdesc.clientjar=Sets the Clientjar attribute of the EjbDotXmlSubTask object. Automatically excluded if there is no ejb client project.
-ejbdoclet.deploymentdesc.validatexml=If this is set to true, the generated XML will be validated against its DTD or XML Schema.
-ejbdoclet.deploymentdesc.mergedir=Specifies the location of the merge directory. This is where XDoclet will look for merge files.
-ejbdoclet.deploymentdesc.destdir=Sets the directory where the generated file(s) will be written.
-
-ejbdoclet.RemoteInterface=remoteinterface Ejbdoclet Task Provider
-ejbdoclet.RemoteInterface.desc=Adds remoteinterface task to ejbdoclet
-
-ejbdoclet.HomeInterface=homeinterface Ejbdoclet Task Provider
-ejbdoclet.HomeInterface.desc=Adds homeinterface task to ejbdoclet
-
-ejbdoclet.LocalInterface=localinterface Ejbdoclet Task Provider
-ejbdoclet.LocalInterface.desc=Adds localinterface task to ejbdoclet
-
-ejbdoclet.LocalHomeInterface=localhomeinterface Ejbdoclet Task Provider
-ejbdoclet.LocalHomeInterface.desc=Adds localhomeinterface task to ejbdoclet
-
-ejbdoclet.UtilObject=UtilObject Ejbdoclet Task Provider
-ejbdoclet.UtilObject.desc=Adds UtilObject task to ejbdoclet
-ejbdoclet.utilobject.cacheHomes=Cache the homes
-ejbdoclet.utilobject.includeGUID=Include a performant GUID generator in the util object.
-ejbdoclet.utilobject.kind=Sets the Kind attribute of the UtilObjectSubTask object Valid values: physical, logical
-
-ejbdoclet.DataObject=DataObject Ejbdoclet Task Provider
-ejbdoclet.DataObject.desc=Adds DataObject task to ejbdoclet
-
-ejbdoclet.Dao=Dao Ejbdoclet Task Provider
-ejbdoclet.Dao.desc=Adds Dao task to ejbdoclet
-
-ejbdoclet.valueobject=ValueObject Ejbdoclet Task Provider
-ejbdoclet.valueobject.desc=Adds ValueObject task to ejbdoclet
-
-ejbdoclet.Entitypk=Entitypk Ejbdoclet Task Provider
-ejbdoclet.Entitypk.desc=Adds Entitypk task to ejbdoclet
-
-ejbdoclet.Entitycmp=Entitycmp Ejbdoclet Task Provider
-ejbdoclet.Entitycmp.desc=Adds Entitycmp task to ejbdoclet
-
-ejbdoclet.Entitybmp=Entitybmp Ejbdoclet Task Provider
-ejbdoclet.Entitybmp.desc=Adds Entitybmp task to ejbdoclet
-
-ejbdoclet.Session=Entitybmp Ejbdoclet Task Provider
-ejbdoclet.Session.desc=Adds Entitybmp task to ejbdoclet
-
-ejbdoclet.Mdb=Mdb Ejbdoclet Task Provider
-ejbdoclet.Mdb.desc=Adds Mdb task to ejbdoclet
-
-
-Bundle-Name.0 = XDocletRuntime Plug-in
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/plugin.xml b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/plugin.xml
deleted file mode 100644
index d9caac8..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/plugin.xml
+++ /dev/null
@@ -1,937 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.xdocletRuntime.121"
-         name="%xdoclet.121"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.xdocletRuntime">
-      <RuntimeVersion
-            ejb="2.0"
-            jsp="1.1"
-            servlet="2.3"
-            xdoclet="1.2.1"/>
-      <RuntimeLib
-            location="xdoclet-1.2.1.jar"
-            name="xdoclet-1.2.1.jar"/>
-      <RuntimeLib
-            location="xjavadoc-1.0.3.jar"
-            name="xjavadoc-1.0.3.jar"/>
-   </extension>
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.xdocletRuntime.122"
-         name="%xdoclet.122"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.xdocletRuntime">
-      <RuntimeVersion
-            ejb="2.1"
-            jsp="1.2"
-            servlet="2.4"
-            xdoclet="1.2.2"/>
-      <RuntimeLib
-            location="xdoclet-1.2.2.jar"
-            name="xdoclet-1.2.2.jar"/>
-      <RuntimeLib
-            location="xjavadoc-1.1.jar"
-            name="xjavadoc-1.1.jar"/>   
-   </extension>
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.xdocletRuntime.123"
-         name="%xdoclet.123"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.xdocletRuntime">
-      <RuntimeVersion
-            ejb="2.1"
-            jsp="1.2"
-            servlet="2.4"
-            xdoclet="1.2.3"/>
-      <RuntimeLib
-            location="xdoclet-1.2.3.jar"
-            name="xdoclet-1.2.3.jar"/>
-      <RuntimeLib
-            location="xjavadoc-1.1.jar"
-            name="xjavadoc-1.1.jar"/>   
-   </extension>
-   
-   
-   <!-- Deployment Descriptor (EJB)/WEB -->
-
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.webdocletTaskProvider.deploymentdescriptor"
-         name="%webdoclet.deploymentdesc"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.webdocletTaskProvider">
-      <WebdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.DeploymentDescriptorWebdocletTaskProvider"
-            defaultSelection="true"
-            description="%webdoclet.deploymentdesc.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.DeploymentDescriptorWebdocletTaskProvider"
-            name="DeploymentDescriptor"/>
-
-      <TaskProperty
-            default="true"
-            id="webdoclet.deploymentdescriptor.useIds"
-            include="true"
-            label="useIds"
-            type="boolean"
-            description="%webdoclet.deploymentdesc.useIds" />
-      <TaskProperty
-            default="${servlet.spec.version}"
-            id="webdoclet.deploymentdescriptor.servletspec"
-            include="true"
-            label="servletspec"
-            type="string"
-            description="%webdoclet.deploymentdesc.servletspec" />
-     <TaskProperty
-            default="${web}"
-            id="webdoclet.deploymentdescriptor.displayname"
-            include="true"
-            label="displayname"
-            type="string"
-            description="%webdoclet.deploymentdesc.displayname"/>
-            
-      <TaskProperty
-            default="false"
-            id="webdoclet.deploymentdescriptor.validatexml"
-            include="true"
-            label="validatexml"
-            type="boolean"
-            description="%webdoclet.deploymentdesc.validatexml"/>
-
-      <TaskProperty
-            default="${web.module.webinf}"
-            id="webdoclet.deploymentdescriptor.mergedir"
-            include="true"
-            label="mergedir"
-            type="string"
-            description="%webdoclet.deploymentdesc.mergedir"/>
-      <TaskProperty
-            default="${web.module.webinf}"
-            id="weboclet.deploymentdescriptor.destdir"
-            include="true"
-            label="destdir"
-            type="string"
-            description="%webdoclet.deploymentdesc.destdir"/>
-   </extension>   
-   
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.deploymentdescriptor"
-         name="%ejbdoclet.deploymentdesc"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.DeploymentDescriptorEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.deploymentdesc.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.DeploymentDescriptorEjbdocletTaskProvider"
-            name="DeploymentDescriptor"/>
-
-      <TaskProperty
-            default="true"
-            id="ejbdoclet.deploymentdescriptor.useIds"
-            include="true"
-            label="useIds"
-            type="boolean"
-            description="%ejbdoclet.deploymentdesc.useIds" />
-     <TaskProperty
-            default="${ejb.dd.displayname}"
-            id="ejbdoclet.deploymentdescriptor.displayname"
-            include="true"
-            label="displayname"
-            type="string"
-            description="%ejbdoclet.deploymentdesc.displayname"/>
-     <TaskProperty
-            default="${ejb.dd.description}"
-            id="ejbdoclet.deploymentdescriptor.description"
-            include="true"
-            label="description"
-            type="string"
-            description="%ejbdoclet.deploymentdesc.description"/>
-            
-     <TaskProperty
-            default="${ejb.dd.clientjar}"
-            id="ejbdoclet.deploymentdescriptor.clientjar"
-            include="true"
-            label="clientjar"
-            type="string"
-            description="%ejbdoclet.deploymentdesc.clientjar"/>
-            
-      <TaskProperty
-            default="false"
-            id="ejbdoclet.deploymentdescriptor.validatexml"
-            include="true"
-            label="validatexml"
-            type="boolean"
-            description="%ejbdoclet.deploymentdesc.validatexml"/>
-
-      <TaskProperty
-            default="${ejb.dd.dir}"
-            id="ejbdoclet.deploymentdescriptor.mergedir"
-            include="true"
-            label="mergedir"
-            type="string"
-            description="%ejbdoclet.deploymentdesc.mergedir"/>
-      <TaskProperty
-            default="${ejb.dd.dir}"
-            id="ejbdoclet.deploymentdescriptor.destdir"
-            include="true"
-            label="destdir"
-            type="string"
-            description="%ejbdoclet.deploymentdesc.destdir"/>
-   </extension>   
- 
-   <!-- remoteinterface -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.remoteinterface"
-         name="%ejbdoclet.RemoteInterface"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.RemoteInterfaceEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.RemoteInterface.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.RemoteInterfaceEjbdocletTaskProvider"
-            name="RemoteInterface"/>
-   </extension>   
-
-   <!-- homeinterface -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.homeinterface"
-         name="%ejbdoclet.HomeInterface"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.HomeInterfaceEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.HomeInterface.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.HomeInterfaceEjbdocletTaskProvider"
-            name="HomeInterface"/>
-   </extension>   
-
-   <!-- localinterface -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.localinterface"
-         name="%ejbdoclet.LocalInterface"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.LocalInterfaceEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.LocalInterface.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.LocalInterfaceEjbdocletTaskProvider"
-            name="LocalInterface"/>
-   </extension>   
-
-   <!-- localhomeinterface -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.localhomeinterface"
-         name="%ejbdoclet.LocalHomeInterface"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.LocalHomeInterfaceEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.LocalHomeInterface.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.LocalHomeInterfaceEjbdocletTaskProvider"
-            name="LocalHomeInterface"/>
-   </extension>   
-
-   <!-- utilobject -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.utilobject"
-         name="%ejbdoclet.UtilObject"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.UtilObjectEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.UtilObject.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.UtilObjectEjbdocletTaskProvider"
-            name="UtilObject"/>
-      <TaskProperty
-            default="true"
-            id="ejbdoclet.utilobject.cacheHomes"
-            label="cacheHomes"
-            include="true"            
-            type="boolean"
-            description="%ejbdoclet.utilobject.cacheHomes"/>            
-      <TaskProperty
-            default="true"
-            id="ejbdoclet.utilobject.includeGUID"
-            label="includeGUID"
-            include="true"            
-            type="boolean"
-            description="%ejbdoclet.utilobject.includeGUID"/> 
-      <TaskProperty
-            default="physical"
-            id="ejbdoclet.utilobject.kind"
-            label="kind"
-            include="true"            
-            restriction="physical,logical"
-            type="enum"
-            description="%ejbdoclet.utilobject.kind"/>                       
-   </extension>   
-
-   <!-- dataobject -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.dataobject"
-         name="%ejbdoclet.DataObject"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.DataObjectEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.DataObject"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.DataObjectEjbdocletTaskProvider"
-            name="DataObject"/>
-   </extension>   
-
-   <!-- dao -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.dao"
-         name="%ejbdoclet.Dao"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.DaoEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.Dao.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.DaoEjbdocletTaskProvider"
-            name="Dao"/>
-   </extension>   
-
-   <!-- valueobject -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.valueobject"
-         name="%ejbdoclet.valueobject"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.ValueObjectEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.valueobject.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.ValueObjectEjbdocletTaskProvider"
-            name="valueobject"/>
-       <TaskProperty
-            default="false"
-            id="ejbdoclet.valueobject.generatePKConstructor"
-            label="generatePKConstructor"
-            include="false"            
-            type="boolean"
-            description="Whether to generate a single-parameter constructor in the ValueObject, which only sets up the PK"/>
-   </extension>   
-
-   <!-- entitypk -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.entitypk"
-         name="ejbdoclet.Entitypk"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.EntitypkEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.Entitypk.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.EntitypkEjbdocletTaskProvider"
-            name="Entitypk"/>
-   </extension>   
-
-
-   <!-- entitycmp -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.entitycmp"
-         name="%ejbdoclet.Entitycmp"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.EntitycmpEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.Entitycmp.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.EntitycmpEjbdocletTaskProvider"
-            name="Entitycmp"/>
-      <TaskProperty
-            default="2.x"
-            id="ejbdoclet.Entitycmp.cmpSpec"
-            label="cmpSpec"
-            include="false"            
-            restriction="1.x,2.x"
-            type="enum"
-            description="Sets the CmpSpec attribute of the EntityCmpSubTask object Valid values: 1.x, 2.x"/>
-   </extension>   
-
-   <!-- entitybmp -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.entitybmp"
-         name="%ejbdoclet.Entitybmp"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.EntitybmpEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.Entitybmp.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.EntitybmpEjbdocletTaskProvider"
-            name="Entitybmp"/>
-   </extension>   
-
-
-   <!-- session -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.session"
-         name="%ejbdoclet.Session"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.SessionEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.Session.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.SessionEjbdocletTaskProvider"
-            name="Session"/>
-   </extension>   
-
-   <!-- mdb -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.mdb"
-         name="%ejbdoclet.Mdb"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.MdbEjbdocletTaskProvider"
-            defaultSelection="true"
-            description="%ejbdoclet.Mdb.desc"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks.MdbEjbdocletTaskProvider"
-            name="Mdb"/>
-   </extension>   
-
-   <!-- Server Extensions -->  
-
-   <!-- WEBLOGIC -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.webDocletTaskProvider.weblogic"
-         name="WebLogic WebDoclet Task Provider"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.webdocletTaskProvider">
-      <WebdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.WeblogicWebdocletTaskProvider"
-            defaultSelection="false"
-            description="Adds weblogic task to webdoclet"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.WeblogicWebdocletTaskProvider"
-            name="WebLogic"/>
-      <TaskProperty
-            default="8.1"
-            id="webdoclet.weblogic.version"
-            label="version"
-            include="true"            
-            restriction="6.0, 6.1, 7.0, 8.1, 9.0"
-            type="enum"
-            description="Sets the target WebLogic version to generate for. Possible values are 6.1, 7.0 and 8.1 Valid values: 6.0, 6.1, 7.0, 8.1"/>
-      <TaskProperty
-            default="${web}"
-            id="webdoclet.weblogic.contextroot"
-            include="true"
-            label="contextroot"
-            type="string"
-            description="The context-root element specifies the context root for the web application."/>
-      <TaskProperty
-            default="UTF-8"
-            id="webdoclet.weblogic.xmlencoding"
-            include="true"
-            label="xmlencoding"
-            type="string"
-            description="The encoding of the produced xml file. If your XML file uses international characters, you might want to set this to UTF-8."/>
-      <TaskProperty
-            default="false"
-            id="webdoclet.weblogic.validatexml"
-            include="true"
-            label="validatexml"
-            type="boolean"
-            description="If this is set to true, the generated XML will be validated against its DTD or XML Schema."/>
-
-      <TaskProperty
-            default="${web.dd.dir}"
-            id="webdoclet.weblogic.mergedir"
-            include="true"
-            label="mergedir"
-            type="string"
-            description="Specifies the location of the merge directory. This is where XDoclet will look for merge files."/>
-      <TaskProperty
-            default="${web.dd.dir}"
-            id="webdoclet.weblogic.destdir"
-            include="true"
-            label="destdir"
-            type="string"
-            description="Sets the directory where the generated file(s) will be written."/>        
-   </extension>
-       
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.weblogic"
-         name="WebLogic Ejbdoclet Task Provider"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.WeblogicEjbdocletTaskProvider"
-            defaultSelection="false"
-            description="Adds weblogic task to ejbdoclet"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.WeblogicEjbdocletTaskProvider"
-            name="Weblogic"/>
-      <AnnotationProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.annotation.WeblogicAnnotationProvider"
-            type="entity" 
-            include="true" />          
-      <TaskProperty
-            default="8.1"
-            id="ejbdoclet.weblogic.version"
-            label="version"
-            include="true"            
-            restriction="6.0, 6.1, 7.0, 8.1, 9.0"
-            type="enum"
-            description="Sets the target WebLogic version to generate for. Possible values are 6.1, 7.0 and 8.1 Valid values: 6.0, 6.1, 7.0, 8.1"/>
-      <TaskProperty
-            default="UTF-8"
-            id="ejbdoclet.weblogic.xmlencoding"
-            include="true"
-            label="xmlencoding"
-            type="string"
-            description="The encoding of the produced xml file. If your XML file uses international characters, you might want to set this to UTF-8."/>
-      <TaskProperty
-            default="false"
-            id="ejbdoclet.weblogic.validatexml"
-            include="true"
-            label="validatexml"
-            type="boolean"
-            description="If this is set to true, the generated XML will be validated against its DTD or XML Schema."/>
-     <TaskProperty
-            default="${data.source.name}"
-            id="ejbdoclet.weblogic.datasource"
-            include="true"
-            label="datasource"
-            type="string"
-            description="Specifies a default value for the data-source-name element in the CMP descriptor, to use if no weblogic.data-source-name tag appears on a bean." />
-     <TaskProperty
-            default="POINTBASE"
-            id="ejbdoclet.weblogic.databaseType"
-            include="false"
-            label="databaseType"
-            type="string"
-            description="Sets the database type specified in the weblogic-cmp-rdbms-jar.xml deployment descriptor. This is a WLS 7.0 and higher feature. Possible values: DB2 INFORMIX ORACLE SQL_SERVER SYBASE POINTBASE Valid values: DB2, INFORMIX, ORACLE, SQL_SERVER, SYBASE, POINTBASE" />
-      <TaskProperty
-            default="Disabled"
-            id="ejbdoclet.weblogic.createtables"
-            label="createtables"
-            include="true"            
-            restriction="True, False, Disabled, CreateOnly, DropAndCreate, DropAndCreateAlways, AlterOrCreate"
-            type="enum"
-            description="If True or CreateOnly, then at deployment time\nif there is no Table in the Database for a CMP Bean,\n the Container will attempt to CREATE the Table \n(based on information found in the deployment files \n and in the Bean Class). Valid values are \n True and False for WLS Servers for versions older than 8.1 \n and CreateOnly, DropAndCreate, DropAndCreateAlways, AlterOrCreate \n and Disabled for WLS Servers  8.1 and above"/>            
-    <TaskProperty
-            default="weblogic"
-            id="ejbdoclet.weblogic.persistence"
-            include="true"
-            label="persistence"
-            type="string"
-            description="Sets the persistence type to use. Default is weblogic. Useful if you're using a different persistence manager like MVCSoft" />
-
-      <TaskProperty
-            default="${ejb.dd.dir}"
-            id="ejbdoclet.weblogic.mergedir"
-            include="true"
-            label="mergedir"
-            type="string"
-            description="Specifies the location of the merge directory. This is where XDoclet will look for merge files."/>
-      <TaskProperty
-            default="${ejb.dd.dir}"
-            id="ejbdoclet.weblogic.destdir"
-            include="true"
-            label="destdir"
-             type="string"
-            description="Sets the directory where the generated file(s) will be written."/>
-            
-   </extension>
-
-   <!-- JBOSS -->
-  
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.webDocletTaskProvider.jboss"
-         name="JBoss WebDoclet Task Provider"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.webdocletTaskProvider">
-      <WebdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.JBossWebdocletTaskProvider"
-            defaultSelection="false"
-            description="Adds jboss task to webdoclet"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.JBossWebdocletTaskProvider"
-            name="JBoss"/>
-      <TaskProperty
-            default="3.2"
-            id="webdoclet.jboss.version"
-            label="version"
-            include="true"            
-            restriction="2.4, 3.0, 3.0.1, 3.0.2, 3.0.3, 3.2, 4.0"
-            type="enum"
-            description="The version of JBoss. Supported versions are 2.4, 3.0, 3.0.1, 3.0.2, 3.0.3, 3.2 and 4.0."/>
-      <TaskProperty
-            default="${web}"
-            id="webdoclet.jboss.contextroot"
-            include="true"
-            label="contextroot"
-            type="string"
-            description="	The context-root element specifies the context root for the web application."/>
-       <TaskProperty
-            default="java:/jaas/MySecurityDomain"
-            id="webdoclet.jboss.securitydomain"
-            include="false"
-            label="securitydomain"
-            type="string"
-            description="Security domain"/> 
-       <TaskProperty
-            default="UTF-8"
-            id="webdoclet.jboss.xmlencoding"
-            include="true"
-            label="xmlencoding"
-            type="string"
-            description="The encoding of the produced xml file. If your XML file uses international characters, you might want to set this to UTF-8."/>
-      <TaskProperty
-            default="false"
-            id="webdoclet.jboss.validatexml"
-            include="true"
-            label="validatexml"
-            type="boolean"
-            description="If this is set to true, the generated XML will be validated against its DTD or XML Schema."/>
-
-      <TaskProperty
-            default="${web.dd.dir}"
-            id="webdoclet.jboss.mergedir"
-            include="true"
-            label="mergedir"
-            type="string"
-            description="Specifies the location of the merge directory. This is where XDoclet will look for merge files."/>
-      <TaskProperty
-            default="${web.dd.dir}"
-            id="webdoclet.jboss.destdir"
-            include="true"
-            label="destdir"
-            type="string"
-            description="Sets the directory where the generated file(s) will be written."/>        
-   </extension>
-   
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.jboss"
-         name="JBoss Ejbdoclet Task Provider"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.JBossEjbdocletTaskProvider"
-            defaultSelection="false"
-            description="Adds jboss task to ejbdoclet"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.JBossEjbdocletTaskProvider"
-            name="JBoss"/>
-      <AnnotationProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.annotation.JBossAnnotationProvider"
-            type="entity" 
-            include="true" />          
-      <TaskProperty
-            default="3.2"
-            id="ejbdoclet.jboss.version"
-            label="version"
-            include="true"            
-            restriction="2.4, 3.0, 3.0.1, 3.0.2, 3.0.3, 3.2, 4.0"
-            type="enum"
-            description="The version of JBoss. Supported versions are 2.4, 3.0, 3.0.1, 3.0.2, 3.0.3, 3.2 and 4.0."/>
-      <TaskProperty
-            default="UTF-8"
-            id="ejbdoclet.jboss.xmlencoding"
-            include="true"
-            label="xmlencoding"
-            type="string"
-            description="The encoding of the produced xml file. If your XML file uses international characters, you might want to set this to UTF-8."/>
-      <TaskProperty
-            default="false"
-            id="ejbdoclet.jboss.validatexml"
-            include="true"
-            label="validatexml"
-            type="boolean"
-            description="If this is set to true, the generated XML will be validated against its DTD or XML Schema."/>
-
-      <TaskProperty
-            default="${ejb.dd.dir}"
-            id="ejbdoclet.jboss.mergedir"
-            include="true"
-            label="mergedir"
-            type="string"
-            description="Specifies the location of the merge directory. This is where XDoclet will look for merge files."/>
-      <TaskProperty
-            default="${ejb.dd.dir}"
-            id="ejbdoclet.jboss.destdir"
-            include="true"
-            label="destdir"
-            type="string"
-            description="Sets the directory where the generated file(s) will be written."/>
-
-       <TaskProperty
-            default="java:/DefaultDS"
-            id="webdoclet.jboss.securitydomain"
-            include="false"
-            label="securitydomain"
-            type="string"
-            description="Security domain"/>           
-       <TaskProperty
-            default="java:/DefaultDS"
-            id="ejbdoclet.jboss.datasource"
-            include="true"
-            label="datasource"
-            type="string"
-            description="JNDI name for the datasource"/>           
-      <TaskProperty
-            default="Hypersonic SQL"
-            id="ejbdoclet.jboss.datasourcemapping"
-            include="true"
-            label="datasourcemapping"
-            type="string"
-            description="One of the type-mapping's name that are defined in the conf/standardjbosscmp-jdbc.xml file (the default value is Hypersonic SQL)"/>
-      <TaskProperty
-            default="foreign-key"
-            id="ejbdoclet.jboss.preferredrelationmapping"
-            include="true"
-            label="preferredrelationmapping"
-            type="string"
-            description="preferredRelationMapping "/>
-      <TaskProperty
-            default="false"
-            id="ejbdoclet.jboss.generaterelations"
-            include="true"
-            label="generateRelations"
-            type="boolean"
-            description="generate relations "/>
-      <TaskProperty
-            default="false"
-            id="ejbdoclet.jboss.createtable"
-            include="true"
-            label="createtable"
-            type="boolean"
-            description="Create a table for the entity"/>
-      <TaskProperty
-            default="false"
-            id="ejbdoclet.jboss.removetable"
-            include="true"
-            label="removetable"
-            type="boolean"
-            description="Whether the JBossCMP should remove tables when the application is undeployed. "/>
-      <TaskProperty
-            default="false"
-            id="ejbdoclet.jboss.altertable"
-            include="true"
-            label="altertable"
-            type="boolean"
-            description="Whether the JBossCMP should alter tables when the application is deployed. "/>
-   </extension>
- 
-
-   <!-- JONAS -->
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.webDocletTaskProvider.jonas"
-         name="JOnAS WebDoclet Task Provider"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.webdocletTaskProvider">
-      <WebdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.JonasWebdocletTaskProvider"
-            defaultSelection="false"
-            description="Adds jonas task to webdoclet"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.JonasWebdocletTaskProvider"
-            name="JOnAS"/>
-      <TaskProperty
-            default="2.6"
-            id="webdoclet.jonas.version"
-            label="version"
-            include="true"            
-            restriction="2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 4.0, 4.1, 4.5"
-            type="enum"
-            description="Sets the version of JOnAS. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 4.0, 4.1, 4.5"/>
-      <TaskProperty
-            default="${web}"
-            id="webdoclet.jonas.contextroot"
-            include="true"
-            label="contextroot"
-            type="string"
-            description="	The context-root element specifies the context root for the web application."/>
-      <TaskProperty
-            default="UTF-8"
-            id="webdoclet.jonas.xmlencoding"
-            include="true"
-            label="xmlencoding"
-            type="string"
-            description="The encoding of the produced xml file. If your XML file uses international characters, you might want to set this to UTF-8."/>
-      <TaskProperty
-            default="false"
-            id="webdoclet.jonas.validatexml"
-            include="true"
-            label="validatexml"
-            type="boolean"
-            description="If this is set to true, the generated XML will be validated against its DTD or XML Schema."/>
-
-      <TaskProperty
-            default="${web.dd.dir}"
-            id="webdoclet.jonas.mergedir"
-            include="true"
-            label="mergedir"
-            type="string"
-            description="Specifies the location of the merge directory. This is where XDoclet will look for merge files."/>
-      <TaskProperty
-            default="${web.dd.dir}"
-            id="webdoclet.jonas.destdir"
-            include="true"
-            label="destdir"
-            type="string"
-            description="Sets the directory where the generated file(s) will be written."/>        
- 
-       <TaskProperty
-            default="java:/DefaultDS"
-            id="ejbdoclet.jonas.datasource"
-            include="false"
-            label="datasource"
-            type="string"
-            description="JNDI name for the datasource"/>           
-       <TaskProperty
-            default="false"
-            id="ejbdoclet.jonas.automatic-pk"
-            include="false"
-            label="automatic-pk"
-            type="boolean"
-            description="True or False for use automatic generation of primary"/>           
-   </extension>
-      
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.jonas"
-         name="JOnAS Ejbdoclet Task Provider"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.JonasEjbdocletTaskProvider"
-            defaultSelection="false"
-            description="Adds JOnAS task to ejbdoclet"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.JonasEjbdocletTaskProvider"
-            name="JOnAS"/>
-      <AnnotationProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.annotation.JonasAnnotationProvider"
-            type="entity" 
-            include="true" />          
-      <TaskProperty
-            default="2.4"
-            id="ejbdoclet.jonas.version"
-            label="version"
-            include="true"            
-            restriction="2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 4.0, 4.1, 4.5"
-            type="enum"
-            description="Sets the version of JOnAS. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0"/>
-      <TaskProperty
-            default="UTF-8"
-            id="ejbdoclet.jonas.xmlencoding"
-            include="true"
-            label="xmlencoding"
-            type="string"
-            description="The encoding of the produced xml file. If your XML file uses international characters, you might want to set this to UTF-8."/>
-      <TaskProperty
-            default="false"
-            id="ejbdoclet.jonas.validatexml"
-            include="true"
-            label="validatexml"
-            type="boolean"
-            description="If this is set to true, the generated XML will be validated against its DTD or XML Schema."/>
-
-      <TaskProperty
-            default="${ejb.dd.dir}"
-            id="ejbdoclet.jonas.mergedir"
-            include="true"
-            label="mergedir"
-            type="string"
-            description="Specifies the location of the merge directory. This is where XDoclet will look for merge files."/>
-      <TaskProperty
-            default="${ejb.dd.dir}"
-            id="ejbdoclet.jonas.destdir"
-            include="true"
-            label="destdir"
-            type="string"
-            description="Sets the directory where the generated file(s) will be written."/>
-            
-   </extension>
-
-   <!-- WEBPSHERE -->
-      <extension
-         id="org.eclipse.jst.j2ee.xdoclet.webDocletTaskProvider.websphere"
-         name="Websphere WebDoclet Task Provider"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.webdocletTaskProvider">
-      <WebdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.WebsphereWebdocletTaskProvider"
-            defaultSelection="false"
-            description="Adds websphere task to webdoclet"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.WebsphereWebdocletTaskProvider"
-            name="Websphere"/>
- 
- 
-      <TaskProperty
-            default="UTF-8"
-            id="webdoclet.websphere.xmlencoding"
-            include="true"
-            label="xmlencoding"
-            type="string"
-            description="The encoding of the produced xml file. If your XML file uses international characters, you might want to set this to UTF-8."/>
-      <TaskProperty
-            default="false"
-            id="webdoclet.websphere.validatexml"
-            include="true"
-            label="validatexml"
-            type="boolean"
-            description="If this is set to true, the generated XML will be validated against its DTD or XML Schema."/>
-
-      <TaskProperty
-            default="${web.dd.dir}"
-            id="webdoclet.websphere.mergedir"
-            include="true"
-            label="mergedir"
-            type="string"
-            description="Specifies the location of the merge directory. This is where XDoclet will look for merge files."/>
-      <TaskProperty
-            default="${web.dd.dir}"
-            id="webdoclet.websphere.destdir"
-            include="true"
-            label="destdir"
-            type="string"
-            description="Sets the directory where the generated file(s) will be written."/>        
-   </extension>
-   
-   <extension
-         id="org.eclipse.jst.j2ee.xdoclet.ejbDocletTaskProvider.webpshere"
-         name="WebSphere Ejbdoclet Task Provider"
-         point="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider">
-      <EjbdocletTaskProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.WebsphereEjbdocletTaskProvider"
-            defaultSelection="false"
-            description="Adds WebSphere task to ejbdoclet"
-            id="org.eclipse.jst.j2ee.xdoclet.runtime.internal.server.WebsphereEjbdocletTaskProvider"
-            name="WebSphere"/>
-      <AnnotationProvider
-            class="org.eclipse.jst.j2ee.xdoclet.runtime.internal.annotation.WebsphereAnnotationProvider"
-            type="entity" 
-            include="true" />          
-
-      <TaskProperty
-            default="UTF-8"
-            id="ejbdoclet.websphere.xmlencoding"
-            include="true"
-            label="xmlencoding"
-            type="string"
-            description="The encoding of the produced xml file. If your XML file uses international characters, you might want to set this to UTF-8."/>
-      <TaskProperty
-            default="false"
-            id="ejbdoclet.websphere.validatexml"
-            include="true"
-            label="validatexml"
-            type="boolean"
-            description="If this is set to true, the generated XML will be validated against its DTD or XML Schema."/>
-
-      <TaskProperty
-            default="${ejb.dd.dir}"
-            id="ejbdoclet.websphere.mergedir"
-            include="true"
-            label="mergedir"
-            type="string"
-            description="Specifies the location of the merge directory. This is where XDoclet will look for merge files."/>
-      <TaskProperty
-            default="${ejb.dd.dir}"
-            id="ejbdoclet.websphere.destdir"
-            include="true"
-            label="destdir"
-            type="string"
-            description="Sets the directory where the generated file(s) will be written."/>
-      <TaskProperty
-            default="MyDataSourceJNDIName"
-            id="ejbdoclet.websphere.datasource"
-            include="false"
-            label="datasource"
-            type="string"
-            description="Sets the default CMP Datasource"/>
-     <TaskProperty
-            default="xxxxx"
-            id="ejbdoclet.websphere.currentBackendId"
-            include="false"
-            label="currentBackendId"
-            type="string"
-            description="Sets the current backend id. This parameter is used to point out the id of the current CMP mapping"/>
-            
-   </extension>   
-   
-
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/XDocletRuntimeAnnotationImpl.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/XDocletRuntimeAnnotationImpl.java
deleted file mode 100644
index f2956a7..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/XDocletRuntimeAnnotationImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal;
-
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.IXDocletRuntimeAnnotation;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-
-public abstract class XDocletRuntimeAnnotationImpl implements
-		IXDocletRuntimeAnnotation {
-
-	XDocletPreferenceStore preferenceStore;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#setPreferenceStore(org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore)
-	 */
-	public void setPreferenceStore(XDocletPreferenceStore preferenceStore) {
-		this.preferenceStore = preferenceStore;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#getPreferenceStore()
-	 */
-	public XDocletPreferenceStore getPreferenceStore() {
-		return preferenceStore;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/XDocletRuntimePlugin.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/XDocletRuntimePlugin.java
deleted file mode 100644
index 747c95a..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/XDocletRuntimePlugin.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class XDocletRuntimePlugin extends Plugin {
-
-	//The shared instance.
-	private static XDocletRuntimePlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public XDocletRuntimePlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static XDocletRuntimePlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/XDocletTaskProviderImpl.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/XDocletTaskProviderImpl.java
deleted file mode 100644
index 3e77b34..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/XDocletTaskProviderImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal;
-
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletTaskProvider;
-
-public abstract class XDocletTaskProviderImpl implements XDocletTaskProvider {
-
-	IExtension extension;
-	Properties properties;
-	XDocletPreferenceStore preferenceStore;
-	IProject project;
-	IProject clientProject;
-
-	protected static String INCLUDE = ".include";
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#getNamespace()
-	 */
-	public abstract String getNamespace();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#getTask()
-	 */
-	public abstract String getTask();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#validate()
-	 */
-	public IStatus validate() {
-		return Status.OK_STATUS;
-	}
-
-	protected void buildAttributes(StringBuffer stringBuffer) {
-
-		String[] attributes = getAttributeNames();
-		if (attributes == null)
-			return;
-		for (int i = 0; i < attributes.length; i++) {
-			String attribute = attributes[i];
-			boolean include = getPreferenceStore().getBooleanProperty(getNamespace() + attribute + INCLUDE);
-			if (include) {
-				addAttribute(attribute,stringBuffer);
-			}
-		}
-
-	}
-
-	protected void addAttribute(String attribute, StringBuffer stringBuffer) {
-		stringBuffer.append(" " + attribute + "=\"");
-		stringBuffer.append(getPreferenceStore().getProperty(getNamespace() + attribute).replaceAll("\\$","\\\\\\$"));
-		stringBuffer.append('"');
-	}
-
-	protected String[] getAttributeNames() {
-		IExtension taskConfig = getExtension();
-		IConfigurationElement[] properties = taskConfig.getConfigurationElements();
-		if (properties == null || properties.length == 1)
-			return null;
-		String attributeNames[] = new String[properties.length];
-		for (int i = 1; i < properties.length; i++) {
-			IConfigurationElement property = properties[i];
-			attributeNames[i] = property.getAttribute("label");
-		}
-		return attributeNames;
-
-	}
-
-	
-	public IExtension getExtension() {
-		return extension;
-	}
-
-	
-	public void setExtension(IExtension extension) {
-		this.extension = extension;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#getProperties()
-	 */
-	public Properties getProperties() {
-		return properties;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#setProperties(java.util.Properties)
-	 */
-	public void setProperties(Properties properties) {
-		this.properties = properties;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#setPreferenceStore(org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore)
-	 */
-	public void setPreferenceStore(XDocletPreferenceStore preferenceStore) {
-		this.preferenceStore = preferenceStore;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#getPreferenceStore()
-	 */
-	public XDocletPreferenceStore getPreferenceStore() {
-		return preferenceStore;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#getClientProject()
-	 */
-	public IProject getClientProject() {
-		return clientProject;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#setClientProject(org.eclipse.core.resources.IProject)
-	 */
-	public void setClientProject(IProject clientProject) {
-		this.clientProject = clientProject;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#getProject()
-	 */
-	public IProject getProject() {
-		return project;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.xdoclet.runtime.internal.Xdoc#setProject(org.eclipse.core.resources.IProject)
-	 */
-	public void setProject(IProject project) {
-		this.project = project;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/JBossAnnotationProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/JBossAnnotationProvider.java
deleted file mode 100644
index 27fcc5e..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/JBossAnnotationProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.annotation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IContainerManagedEntityBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletRuntimeAnnotationImpl;
-
-public class JBossAnnotationProvider extends XDocletRuntimeAnnotationImpl {
-
-	public String getTypeAnnotations(IProject project, IEnterpriseBean bean) {
-		if (!IContainerManagedEntityBean.class.isAssignableFrom(bean.getClass()))
-			return "";
-		IContainerManagedEntityBean cmp = (IContainerManagedEntityBean) bean;
-		XDocletPreferenceStore ps = getPreferenceStore();
-		StringBuffer annotation = new StringBuffer();
-		annotation.append(" * @jboss.persistence ");
-		annotation.append("datasource=\"" + ps.getProperty("ejbdoclet.jboss.datasource") + "\" ");
-		annotation.append("datasource-mapping=\"" + ps.getProperty("ejbdoclet.jboss.datasourcemapping") + "\" ");
-		annotation.append("table-name=\"" + cmp.getTable() + "\" ");
-		annotation.append("create-table=\"" + ps.getBooleanProperty("ejbdoclet.jboss.createtable") + "\" ");
-		annotation.append("remove-table=\"" + ps.getBooleanProperty("ejbdoclet.jboss.removetable") + "\" ");
-		annotation.append("alter-table=\"" + ps.getBooleanProperty("ejbdoclet.jboss.altertable") + "\"" );
-		return annotation.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/JonasAnnotationProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/JonasAnnotationProvider.java
deleted file mode 100644
index 6cf6049..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/JonasAnnotationProvider.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.annotation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IContainerManagedEntityBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletRuntimeAnnotationImpl;
-
-public class JonasAnnotationProvider extends XDocletRuntimeAnnotationImpl {
-
-	public String getTypeAnnotations(IProject project, IEnterpriseBean bean) {
-		if (!IContainerManagedEntityBean.class.isAssignableFrom(bean.getClass()))
-			return "";
-		IContainerManagedEntityBean cmp = (IContainerManagedEntityBean) bean;
-		XDocletPreferenceStore ps = getPreferenceStore();
-		StringBuffer annotation = new StringBuffer();
-		annotation.append(" * @jonas.jdbc-mapping ");
-		annotation.append("jndi-name=\"" + ps.getProperty("ejbdoclet.jonas.datasource") + "\" ");
-		annotation.append("automatic-pk=\"" + ps.getBooleanProperty("ejbdoclet.jonas.automatic-pk") + "\" ");
-		annotation.append("jdbc-table-name=\"" + cmp.getTable() + "\"");
-		return annotation.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/WeblogicAnnotationProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/WeblogicAnnotationProvider.java
deleted file mode 100644
index 2121c76..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/WeblogicAnnotationProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.annotation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IContainerManagedEntityBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletRuntimeAnnotationImpl;
-
-public class WeblogicAnnotationProvider extends XDocletRuntimeAnnotationImpl {
-
-	public String getTypeAnnotations(IProject project, IEnterpriseBean bean) {
-		if (!IContainerManagedEntityBean.class.isAssignableFrom(bean.getClass()))
-			return "";
-		IContainerManagedEntityBean cmp = (IContainerManagedEntityBean) bean;
-		XDocletPreferenceStore ps = getPreferenceStore();
-		StringBuffer annotation = new StringBuffer();
-		annotation.append(" * @weblogic.data-source-name " + ps.getProperty("ejbdoclet.weblogic.datasource"));
-		return annotation.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/WebsphereAnnotationProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/WebsphereAnnotationProvider.java
deleted file mode 100644
index cb7eefe..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/annotation/WebsphereAnnotationProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.annotation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IContainerManagedEntityBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletRuntimeAnnotationImpl;
-
-public class WebsphereAnnotationProvider extends XDocletRuntimeAnnotationImpl {
-
-	public String getTypeAnnotations(IProject project, IEnterpriseBean bean) {
-		if (!IContainerManagedEntityBean.class.isAssignableFrom(bean.getClass()))
-			return "";
-		IContainerManagedEntityBean cmp = (IContainerManagedEntityBean) bean;
-		XDocletPreferenceStore ps = getPreferenceStore();
-		StringBuffer annotation = new StringBuffer();
-		annotation.append(" * @websphere.cmp ");
-		annotation.append("datasource=\"" + ps.getProperty("ejbdoclet.websphere.datasource") + "\" ");
-		return annotation.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JBossEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JBossEjbdocletTaskProvider.java
deleted file mode 100644
index 12c295b..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JBossEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class JBossEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.jboss.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<jboss ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-
-	public IStatus validate() {
-		return Status.OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JBossWebdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JBossWebdocletTaskProvider.java
deleted file mode 100644
index 986f6dc..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JBossWebdocletTaskProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class JBossWebdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "webdoclet.jboss.";
-
-	public String getTask() {
-
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<jbosswebxml ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-
-	public IStatus validate() {
-		return Status.OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasEjbdocletTaskProvider.java
deleted file mode 100644
index fda961f..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class JonasEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.jonas.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<jonas ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-
-	public IStatus validate() {
-		return Status.OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasWebdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasWebdocletTaskProvider.java
deleted file mode 100644
index d04e732..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasWebdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class JonasWebdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "webdoclet.jonas.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<jonaswebxml ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-
-	public IStatus validate() {
-		return Status.OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicEjbdocletTaskProvider.java
deleted file mode 100644
index 7b59917..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class WeblogicEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.weblogic.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<weblogic ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-
-	public IStatus validate() {
-		return Status.OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicWebdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicWebdocletTaskProvider.java
deleted file mode 100644
index 80a04f0..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicWebdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class WeblogicWebdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "webdoclet.weblogic.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<weblogicwebxml ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-
-	public IStatus validate() {
-		return Status.OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereEjbdocletTaskProvider.java
deleted file mode 100644
index ead9643..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class WebsphereEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.websphere.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<webSphere ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-
-	public IStatus validate() {
-		return Status.OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereWebdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereWebdocletTaskProvider.java
deleted file mode 100644
index c931815..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereWebdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class WebsphereWebdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "webdoclet.websphere.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<webspherewebxml ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-
-	public IStatus validate() {
-		return Status.OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DaoEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DaoEjbdocletTaskProvider.java
deleted file mode 100644
index b320cc2..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DaoEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class DaoEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.dao.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<dao ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DataObjectEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DataObjectEjbdocletTaskProvider.java
deleted file mode 100644
index 4902a0d..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DataObjectEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class DataObjectEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.dataobject.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<dataobject ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorEjbdocletTaskProvider.java
deleted file mode 100644
index d935596..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class DeploymentDescriptorEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.deploymentdescriptor.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<deploymentdescriptor ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-
-	protected void addAttribute(String attribute, StringBuffer stringBuffer) {
-		if ("clientjar".equals(attribute)) {
-			if (getClientProject() != null) {
-				super.addAttribute(attribute, stringBuffer);
-			}
-		} else {
-			super.addAttribute(attribute, stringBuffer);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorWebdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorWebdocletTaskProvider.java
deleted file mode 100644
index a1c3522..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorWebdocletTaskProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class DeploymentDescriptorWebdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "webdoclet.deploymentdescriptor.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<deploymentdescriptor ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-
-	protected void addAttribute(String attribute, StringBuffer stringBuffer) {
-		if ("clientjar".equals(attribute)) {
-			if (getClientProject() != null) {
-				super.addAttribute(attribute, stringBuffer);
-			}
-		} else {
-			super.addAttribute(attribute, stringBuffer);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitybmpEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitybmpEjbdocletTaskProvider.java
deleted file mode 100644
index 2f74062..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitybmpEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class EntitybmpEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.entitybmp.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<entitybmp ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitycmpEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitycmpEjbdocletTaskProvider.java
deleted file mode 100644
index 2981f16..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitycmpEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class EntitycmpEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.entitycmp.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<entitycmp ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitypkEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitypkEjbdocletTaskProvider.java
deleted file mode 100644
index 86cae79..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitypkEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class EntitypkEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.entitypk.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<entitypk ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/HomeInterfaceEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/HomeInterfaceEjbdocletTaskProvider.java
deleted file mode 100644
index 5b8bf66..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/HomeInterfaceEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class HomeInterfaceEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.homeinterface.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<homeinterface ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalHomeInterfaceEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalHomeInterfaceEjbdocletTaskProvider.java
deleted file mode 100644
index 569eca3..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalHomeInterfaceEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class LocalHomeInterfaceEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.localhomeinterface.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<localhomeinterface ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalInterfaceEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalInterfaceEjbdocletTaskProvider.java
deleted file mode 100644
index 8f37da9..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalInterfaceEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class LocalInterfaceEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.localinterface.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<localinterface ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/MdbEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/MdbEjbdocletTaskProvider.java
deleted file mode 100644
index ddf15d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/MdbEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class MdbEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.mdb.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<mdb ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/RemoteInterfaceEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/RemoteInterfaceEjbdocletTaskProvider.java
deleted file mode 100644
index 2aa43fe..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/RemoteInterfaceEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class RemoteInterfaceEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.remoteinterface.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<remoteinterface ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/SessionEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/SessionEjbdocletTaskProvider.java
deleted file mode 100644
index 9882c47..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/SessionEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class SessionEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.session.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<session ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/UtilObjectEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/UtilObjectEjbdocletTaskProvider.java
deleted file mode 100644
index e65dc74..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/UtilObjectEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class UtilObjectEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.utilobject.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<utilobject ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/ValueObjectEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/ValueObjectEjbdocletTaskProvider.java
deleted file mode 100644
index 0acd13c..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/ValueObjectEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class ValueObjectEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
-	public static String NAMESPACE = "ejbdoclet.valueobject.";
-
-	public String getTask() {
-		StringBuffer buffer = new StringBuffer(256);
-		buffer.append("<valueobject ");
-		buildAttributes(buffer);
-		buffer.append(" />");
-		return buffer.toString();
-	}
-
-	public String getNamespace() {
-		return NAMESPACE;
-	}
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.classpath b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.cvsignore b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.project b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.project
deleted file mode 100644
index 93e1bac..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.ejb.generation.tests</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/tests/org.eclipse.jst.j2ee.ejb.generation.tests/about.html b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/about.html
deleted file mode 100644
index 4ec5989..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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/tests/org.eclipse.jst.j2ee.ejb.generation.tests/build.properties b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/build.properties
deleted file mode 100644
index 357dfc4..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.annotationtests.jar = src/
-output.annotationtests.jar = bin/
-bin.includes = plugin.xml,\
-               annotationtests.jar,\
-               about.html,\
-               test.xml
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/plugin.xml b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/plugin.xml
deleted file mode 100644
index b54b35e..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/plugin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jst.j2ee.ejb.generation.tests"
-   name="Tests Plug-in"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   class="org.eclipse.jst.j2ee.ejb.generation.tests.TestsPlugin">
-
-   <runtime>
-      <library name="annotationtests.jar"/>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb.annotation.model"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb.annotations.emitter"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb.annotations.ui"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb.annotations.xdoclet"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jst.j2ee.core"/>
-      <import plugin="org.eclipse.jst.ejb.ui"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb"/>
-      <import plugin="org.eclipse.jst.j2ee.ui"/>
-      <import plugin="org.eclipse.jst.j2ee"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.eclipse.jst.server.core"/>
-      <import plugin="org.eclipse.jst.server.generic.core"/>
-      <import plugin="org.eclipse.jst.server.generic.ui"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.emf"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jst.common.frameworks"/>
-   </requires>
-
-</plugin>
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/AllTests.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/AllTests.java
deleted file mode 100644
index cb9216a..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/AllTests.java
+++ /dev/null
@@ -1,54 +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.jst.j2ee.ejb.generation.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.ejb.generation.tests.common.EjbModuleCreationTest;
-import org.eclipse.jst.j2ee.ejb.generation.tests.common.EnterpriseBeanModelTest;
-import org.eclipse.jst.j2ee.ejb.generation.tests.common.ExistenceTest;
-import org.eclipse.jst.j2ee.ejb.generation.tests.common.TestSettings;
-
-public class AllTests {
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.jst.j2ee.ejb.generation.tests");
-		//$JUnit-BEGIN$
-		System.setProperty("wtp.autotest.noninteractive", "true");
-		
-		//$JUnit-BEGIN$
-		String s = System.getProperty(TestSettings.runtimeid); 
-		//s = "D:\\Tools\\tomcat\\jakarta-tomcat-3.2.4";
-		if (s != null && s.length() > 0) {
-			TestSettings.serverlocation = s;
-		}
-		s = System.getProperty("org.eclipse.jst.xdoclet.version"); 
-		//s = "1.2.3";
-		if (s != null && s.length() > 0) {
-			TestSettings.xdocletversion = s;
-		}
-		
-		s = System.getProperty("org.eclipse.jst.xdoclet.location"); 
-		//s = "D:\\Tools\\tomcat\\jakarta-tomcat-3.2.4";
-		if (s != null && s.length() > 0) {
-			TestSettings.xdocletlocation = s;
-		}
-
-		suite.addTestSuite(EnterpriseBeanModelTest.class);
-		suite.addTest(new OrderedTestSuite(EjbModuleCreationTest.class));
-		suite.addTestSuite(ExistenceTest.class);
-		
-		s = System.getProperty("org.eclipse.jst.server.generic.jonas4"); 
-		if (s != null && s.length() > 0) {
-		} 
-		return suite;
-	}
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/OrderedTestSuite.java
deleted file mode 100644
index dd96fb8..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/OrderedTestSuite.java
+++ /dev/null
@@ -1,92 +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.jst.j2ee.ejb.generation.tests;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class OrderedTestSuite extends TestSuite {
-	public OrderedTestSuite(Class theClass, String name) {
-		this(theClass);
-		setName(name);
-	}
-
-	public OrderedTestSuite(final Class theClass) {
-		super();
-		setName(theClass.getName());
-		try {
-			getTestConstructor(theClass); // Avoid generating multiple error messages
-		} catch (NoSuchMethodException e) {
-			addTest(warning("Class " + theClass.getName()
-					+ " has no public constructor TestCase(String name) or TestCase()"));
-			return;
-		}
-		if (!Modifier.isPublic(theClass.getModifiers())) {
-			addTest(warning("Class " + theClass.getName() + " is not public"));
-			return;
-		}
-		Class superClass = theClass;
-		Vector names = new Vector();
-		
-		Method[] methods = superClass.getMethods();
-		int size = methods.length;
-		for (int i = 0; i < size - 1; i++) {
-			for (int j = i + 1; j < size; j++) {
-				if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
-					Method m = methods[i];
-					methods[i] = methods[j];
-					methods[j] = m;
-				}
-			}
-		}
-		for (int i = 0; i < size; i++) {
-			addTestMethod(methods[i], names, theClass);
-		}
-		if (!tests().hasMoreElements())
-			addTest(warning("No tests found in " + theClass.getName()));
-	}
-
-	private void addTestMethod(Method m, Vector names, Class theClass) {
-		String name = m.getName();
-		if (names.contains(name))
-			return;
-		if (!isPublicTestMethod(m)) {
-			if (isTestMethod(m))
-				addTest(warning("Test method isn't public: " + m.getName()));
-			return;
-		}
-		names.addElement(name);
-		addTest(createTest(theClass, name));
-	}
-
-	private boolean isPublicTestMethod(Method m) {
-		return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
-	}
-
-	private boolean isTestMethod(Method m) {
-		String name = m.getName();
-		Class[] parameters = m.getParameterTypes();
-		Class returnType = m.getReturnType();
-		return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
-	}
-
-	private Test warning(final String message) {
-		return new TestCase("warning") {
-			protected void runTest() {
-				fail(message);
-			}
-		};
-	}
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/TestsPlugin.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/TestsPlugin.java
deleted file mode 100644
index 03ccdd4..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/TestsPlugin.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.generation.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestsPlugin extends Plugin {
-	//The shared instance.
-	private static TestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public TestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static TestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = TestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.j2ee.ejb.generation.tests.TestsPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/AnnotationTest.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/AnnotationTest.java
deleted file mode 100644
index 86cfef5..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/AnnotationTest.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Eteration Bilisim A.S., Naci Dai and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the GNU Lesser General Public License (LGPL)
- * which accompanies this distribution, and is available at
- *  http://www.gnu.org/licenses/lgpl.html
- * 
- * Contributors:
- *     Eteration Bilisim A.S. - initial API and implementation
- *     Naci M. Dai
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        Eteration Bilisim A.S and Naci Dai (http://www.eteration.com/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "Lomboz", "ObjectLearn" and "Eteration" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact info@eteration.com.
- *
- * 5. Products derived from this software may not be called "Lomboz"
- *    nor may "Lomboz" appear in their names without prior written
- *    permission of the Eteration Bilisim A.S.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S.  For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.generation.tests.common;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.servertarget.J2EEProjectServerTargetDataModelProvider;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.RuntimeDelegate;
-
-public abstract class AnnotationTest extends TestCase {
-
-	protected static final String EJB_NAME = "Cow";
-	protected static final String MODULE_NAME = "zoo";
-	protected static final String PROJECT_NAME = "TestEjbProject";
-	protected static final String SOURCE_FOLDER = "/"+MODULE_NAME+"/ejbModule";
-	public static final String BEAN_PACKAGE = "com.farm";
-	public static final String BEAN_CLASS = "CowBean";
-
-	/**
-	 * 
-	 */
-	public AnnotationTest() {
-		super();
-	}
-
-	/**
-	 * @param name
-	 */
-	public AnnotationTest(String name) {
-		super(name);
-	}
-
-	public static final String XDOCLET = "XDoclet";
-
-	protected IDataModelOperation createFlexibleProject() throws Exception {
-		FlexibleJavaProjectCreationDataModelProvider provider = new FlexibleJavaProjectCreationDataModelProvider();
-		DataModelFactory.createDataModel(provider);
-
-		IDataModel creationDataModel = provider.getDataModel();
-		creationDataModel.setProperty(FlexibleJavaProjectCreationDataModelProvider.PROJECT_NAME, PROJECT_NAME);
-		creationDataModel.setProperty(JavaProjectCreationDataModelProvider.SOURCE_FOLDERS, new String[] { "ejbModules" });
-		IRuntime runtime = getRuntimeTarget();
-		creationDataModel.setProperty(J2EEProjectServerTargetDataModelProvider.RUNTIME_TARGET_ID, runtime.getId());
-
-		return provider.getDefaultOperation();
-	}
-
-	public IRuntime getRuntimeTarget() throws Exception {
-
-		// Finds the generic server type
-		IServerType[] sTypes = ServerCore.getServerTypes();
-		IServerType serverType = null;
-		for (int i = 0; i < sTypes.length; i++) {
-			IServerType sType = sTypes[i];
-			if (TestSettings.runtimeid.equals(sType.getId()))
-				serverType = sType;
-		}
-		assertNotNull("Could not find " + TestSettings.runtimeid + " server type", serverType);
-
-		// Finds the generic server runtime type
-		IRuntimeType runtimeType = serverType.getRuntimeType();
-		assertNotNull("Could not find runtime type for the generic server type", runtimeType);
-
-		// Create a new server instance from the type
-		IServerWorkingCopy server = serverType.createServer(TestSettings.runtimeid + ".Jonas.Server", null, (IRuntime) null, null);
-		assertNotNull("Could not create server", server);
-
-		// Create a new runtime instance from the type
-		IRuntime runtime = runtimeType.createRuntime(TestSettings.runtimeid + ".Jonas.Runtime", null);
-
-		assertNotNull("Could not create runtime", runtime);
-
-		// Set the runtime for the server
-		server.setRuntime(runtime);
-
-		// Save the server
-		server.save(false, null);
-
-		// Set properties for the runtime
-		IRuntimeWorkingCopy runtimeWorkingCopy = runtime.createWorkingCopy();
-		assertNotNull("Could not create runtime working copy", runtimeWorkingCopy);
-
-		// Set the JONAS runtime as the default runtime
-		ServerUtil.setRuntimeDefaultName(runtimeWorkingCopy);
-		assertNotNull("Runtime working copy has no name", runtimeWorkingCopy.getName());
-
-		// Set properties for the JONAS runtime
-		GenericServerRuntime runtimeDelegate = (GenericServerRuntime) runtimeWorkingCopy.loadAdapter(RuntimeDelegate.class,
-				new NullProgressMonitor());
-		assertNotNull("Could not obtain runtime delegate", runtimeDelegate);
-
-		HashMap props = new HashMap();
-		props.put("mappernames", "");
-		props.put("classPathVariableName", "JONAS");
-		props.put("serverAddress", "127.0.0.1");
-		props.put("jonasBase", TestSettings.serverlocation);
-		props.put("jonasRoot", TestSettings.serverlocation);
-		props.put("classPath", TestSettings.serverlocation);
-		props.put("protocols", TestSettings.serverlocation);
-		props.put("port", "9000");
-		runtimeDelegate.setServerInstanceProperties(props);
-
-		// Save the runtime working copy
-		runtimeWorkingCopy.save(false, null);
-
-		return runtime;
-	}
-
-	protected IDataModel createDefaultSessionModel() {
-		SessionBeanDataModelProvider provider = new SessionBeanDataModelProvider();
-		DataModelFactory.createDataModel(provider);
-		IDataModel model = provider.getDataModel();
-		model.setProperty(SessionBeanDataModelProvider.ANNOTATIONPROVIDER, XDOCLET);
-
-		model.setBooleanProperty(SessionBeanDataModelProvider.MODIFIER_ABSTRACT, true);
-		model.setProperty(SessionBeanDataModelProvider.CLASS_NAME, BEAN_CLASS);
-		model.setProperty(SessionBeanDataModelProvider.JAVA_PACKAGE, BEAN_PACKAGE);
-
-		model.setProperty(SessionBeanDataModelProvider.PROJECT_NAME, PROJECT_NAME);
-		model.setProperty(SessionBeanDataModelProvider.SOURCE_FOLDER, SOURCE_FOLDER);
-		//model.setProperty(SessionBeanDataModelProvider.JAVA_SOURCE_FOLDER, SOURCE_FOLDER);
-		model.setProperty(SessionBeanDataModelProvider.COMPONENT_NAME, MODULE_NAME);
-		model.setProperty(SessionBeanDataModelProvider.EJB_NAME, EJB_NAME);
-		model.setProperty(SessionBeanDataModelProvider.JNDI_NAME, EJB_NAME);
-		model.setProperty(SessionBeanDataModelProvider.DISPLAY_NAME, EJB_NAME);
-		return model;
-	}
-
-	protected IDataModelOperation createEjbModuleAndProject() throws Exception {
-
-		//IDataModelOperation flexibleJavaProjectCreationOperation = createFlexibleProject();
-		//flexibleJavaProjectCreationOperation.execute(new NullProgressMonitor(), null);
-		EjbComponentCreationDataModelProvider aProvider = new EjbComponentCreationDataModelProvider();
-		DataModelFactory.createDataModel(aProvider);
-		IDataModel a = aProvider.getDataModel();
-		IRuntime runtime = getRuntimeTarget();
-		
-		a.setProperty(J2EEProjectServerTargetDataModelProvider.RUNTIME_TARGET_ID, runtime.getId());
-		a.setBooleanProperty(EjbComponentCreationDataModelProvider.ADD_TO_EAR, false);
-		a.setProperty(EjbComponentCreationDataModelProvider.JAVASOURCE_FOLDER, SOURCE_FOLDER);
-		a.setProperty(EjbComponentCreationDataModelProvider.COMPONENT_NAME, MODULE_NAME);
-		a.setProperty(EjbComponentCreationDataModelProvider.PROJECT_NAME, PROJECT_NAME);
-
-		a.setProperty(EjbComponentCreationDataModelProvider.COMPONENT_DEPLOY_NAME, MODULE_NAME);
-		a.setBooleanProperty(EjbComponentCreationDataModelProvider.CREATE_CLIENT, false);
-		a.getDefaultOperation().execute(new NullProgressMonitor(), null);
-
-		return a.getDefaultOperation();
-	}
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EjbModuleCreationTest.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EjbModuleCreationTest.java
deleted file mode 100644
index 766a593..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EjbModuleCreationTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * 
- */
-package org.eclipse.jst.j2ee.ejb.generation.tests.common;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.operations.AddSessionBeanOperation;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.preferences.AnnotationPreferenceStore;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAntProjectBuilder;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author naci
- */
-public class EjbModuleCreationTest extends AnnotationTest {
-	
-	
-	public void test01CreateEjbModule() throws Exception {
-		this.createEjbModuleAndProject();
-		IProject project = (IProject) ResourcesPlugin.getWorkspace().getRoot().findMember(PROJECT_NAME); // Project.ge.getProject(PROJECT_NAME);
-		assertNotNull(project);
-	}
-	
-	public void test04TestXDocletBuilder(){
-		
-		IProject project = (IProject) ResourcesPlugin.getWorkspace().getRoot().findMember(PROJECT_NAME); // Project.ge.getProject(PROJECT_NAME);
-		assertNotNull(project);
-		IFile bean = project.getFile(new Path(SOURCE_FOLDER+"/com/farm/CowBean.java"));
-		assertNotNull(bean);
-
-		IVirtualResource[] vResources = ComponentCore.createResources(bean);
-		assertTrue(vResources.length > 0);
-		assertNotNull(vResources[0].getComponent());
-
-		XDocletAntProjectBuilder antProjectBuilder = XDocletAntProjectBuilder.Factory.newInstance(bean);
-		antProjectBuilder.buildUsingAnt(bean, new NullProgressMonitor());
-
-		IFile bean2 = project.getFile(new Path(SOURCE_FOLDER+"/com/farm/CowUtilities.java"));
-		assertNotNull(bean2);
-	}	
-	public void test02SetXDocletPreferences() throws Exception {
-		IProject project = (IProject) ResourcesPlugin.getWorkspace().getRoot().findMember(PROJECT_NAME); // Project.ge.getProject(PROJECT_NAME);
-		assertNotNull(project);
-
-		XDocletPreferenceStore store = new XDocletPreferenceStore(project);
-		AnnotationPreferenceStore.setProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER, XDOCLET);
-		store.setProperty(XDocletPreferenceStore.XDOCLETBUILDERACTIVE, true);
-		store.setProperty(XDocletPreferenceStore.XDOCLETUSEGLOBAL,false);
-		store.setProperty(XDocletPreferenceStore.XDOCLETVERSION, TestSettings.xdocletversion);
-		store.setProperty(XDocletPreferenceStore.XDOCLETHOME, TestSettings.xdocletlocation);
-		store.save();
-		assertEquals(store.getProperty(XDocletPreferenceStore.XDOCLETHOME),TestSettings.xdocletlocation);
-	}
-	
-	
-	public void test03CreateSessionBean() throws Exception {
-		IProject project = (IProject) ResourcesPlugin.getWorkspace().getRoot().findMember(PROJECT_NAME); // Project.ge.getProject(PROJECT_NAME);
-		assertNotNull(project);
-		IDataModel commonDataModel = createDefaultSessionModel();
-		AddSessionBeanOperation sessionBeanOperation = new AddSessionBeanOperation(commonDataModel);
-		sessionBeanOperation.execute(new NullProgressMonitor(), null);
-
-		IFile bean = project.getFile(new Path(SOURCE_FOLDER+"/com/farm/CowBean.java"));
-		assertNotNull(bean);
-	}
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EnterpriseBeanModelTest.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EnterpriseBeanModelTest.java
deleted file mode 100644
index 041c3e4..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EnterpriseBeanModelTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.generation.tests.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author naci
- *
- */
-public class EnterpriseBeanModelTest extends AnnotationTest {
-	
-	
-	public void testSessionBeanDataModel() throws Exception
-	{
-		createEjbModuleAndProject();
-		
-		IDataModel dataModel = createDefaultSessionModel();
-		
-		assertNotNull(dataModel);
-		IStatus status = dataModel.validate();
-		assertTrue(status.isOK() );
-		
-		assertEquals(PROJECT_NAME,dataModel.getStringProperty(SessionBeanDataModelProvider.PROJECT_NAME));
-		
-		
-		assertEquals(BEAN_CLASS, dataModel.getProperty(SessionBeanDataModelProvider.CLASS_NAME));
-		String[] interfaces = (String[])dataModel.getProperty(SessionBeanDataModelProvider.EJB_INTERFACES);
-		assertEquals(1, interfaces.length);
-		assertEquals("javax.ejb.SessionBean", interfaces[0]);
-		
-		
-	}
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/ExistenceTest.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/ExistenceTest.java
deleted file mode 100644
index 2536474..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/ExistenceTest.java
+++ /dev/null
@@ -1,33 +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.jst.j2ee.ejb.generation.tests.common;
-
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.ModelPlugin;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.EjbEmitterPlugin;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAnnotationPlugin;
-
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
-	public void testModelPluginExists() {
-		assertNotNull(ModelPlugin.getDefault());
-	}
-	public void testEmitterPluginExists() {
-		assertNotNull(EjbEmitterPlugin.getDefault());
-	}
-	public void testEjbUIPluginExists() {
-		assertNotNull(EjbAnnotationsUiPlugin.getDefault());
-	}
-	public void testXDocletPluginExists() {
-		assertNotNull(XDocletAnnotationPlugin.getDefault());
-	}
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/TestSettings.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/TestSettings.java
deleted file mode 100644
index f533306..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/TestSettings.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.generation.tests.common;
-
-/**
- * @author naci
- *
- */
-public class TestSettings {
-	
-	public static String runtimeid = "org.eclipse.jst.server.generic.jonas4";
-	public static String serverlocation = "C:\\nmd\\dev\\java\\appservers\\JOnAS-4.1.4";
-	public static String xdocletlocation = "c:\\downloads\\xdoclet-1.2.2";
-	public static String xdocletversion = "1.2.2";
-	
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/test.xml b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/test.xml
deleted file mode 100644
index 6fdd602..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/test.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
-  <echo message="basedir ${basedir}" />
-  <echo message="eclipse place ${eclipse-home}" />
-  <!-- sets the properties plugin-name, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jst.j2ee.ejb.generation.tests"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-  <property name="extraVMargs" value="-Dorg.eclipse.jst.server.generic.jonas414=${testDir}/${jonas432DirName} -Dorg.eclipse.jst.xdoclet.location=${testDir}/${xdocletDirName} -Dorg.eclipse.jst.xdoclet.version=${xdocletVersion}"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="jst-folder" value="${eclipse-home}/jst_folder"/>
-    <delete dir="${jst-folder}" quiet="true"/>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jst-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.j2ee.ejb.generation.tests.common.AllEJBGenerationTests"/>
-   	  <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-   	  <property name="extraVMargs" value="${extraVMargs}"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-</project>
\ No newline at end of file