This commit was manufactured by cvs2svn to create tag 'v200808122330'.
diff --git a/docs/org.eclipse.jst.ejb.doc.user/.cvsignore b/docs/org.eclipse.jst.ejb.doc.user/.cvsignore
deleted file mode 100644
index 758f3e3..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-org.eclipse.jst.ejb.doc.user_1.0.0.jar
-temp
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/.project b/docs/org.eclipse.jst.ejb.doc.user/.project
deleted file mode 100644
index 8435ece..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ejb.doc.user</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/DocBuild.xml b/docs/org.eclipse.jst.ejb.doc.user/DocBuild.xml
deleted file mode 100644
index 0d50f56..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-
- This script build the Help plug-in by transforming the DITA source files into HTML.
-
- To use this script, you must install DITA-OT on your machine in the directory
- defined by the dita.ot.dir property.
-
- Run the default target after you edit the DITA source files to regenerate the HTML.
-
- To customize this script for other Help plug-ins, modify the value of the args.input property
- to be the DITA map file for the plug-in.
-
- NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
- output directory structure will be shifted incorrectly.
-
- NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
- will be copied over the generated plugin.xml which is currently not being generated correctly
- by DITA-OT.
-
- ChangeLog:
- 2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
- - Created.
- 2008-01-09 Kate Price <katep@ca.ibm.com>
- - modified for new DITA-OT version
- 2008-05-05 Kate Price <katep@ca.ibm.com>
- - modified to add generation of pre-built help index.
- - Must delete /index folder before running build
--->
-<project name="eclipsehelp" default="all">
-
- <property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
- <path id="dost.class.path">
- <pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
- </path>
-
- <taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
- <classpath refid="dost.class.path" />
- </taskdef>
- <target name="all" depends="integrate, eclipsehelp">
- </target>
- <target name="integrate">
- <integrate ditadir="${dita.ot.dir}" />
- </target>
-
- <!-- revise below here -->
- <target name="eclipsehelp">
- <ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
- <property name="args.copycss" value="no" />
- <property name="args.csspath" value="../org.eclipse.wst.doc.user" />
- <property name="args.eclipse.provider" value="Eclipse.org" />
- <property name="args.eclipse.version" value="3.3.0" />
- <property name="args.input" location="ejb_toc.ditamap" />
- <property name="clean.temp" value="true" />
- <property name="dita.extname" value=".dita" />
- <property name="dita.temp.dir" location="temp" />
- <property name="output.dir" location="" />
- <property name="transtype" value="eclipsehelp" />
- </ant>
- <copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
- </target>
- <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
- <help.buildHelpIndex manifest="plugin.xml" destination="."/>
- </target>
-
-</project>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ejb.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 10eeece..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.jst.ejb.doc.user; singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
diff --git a/docs/org.eclipse.jst.ejb.doc.user/about.html b/docs/org.eclipse.jst.ejb.doc.user/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/build.properties b/docs/org.eclipse.jst.ejb.doc.user/build.properties
deleted file mode 100644
index 243771d..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-bin.includes = ejb_toc.xml,\
- org.eclipse.jst.ejb.doc.userindex.xml,\
- images/,\
- plugin.xml,\
- topics/*.htm*,\
- about.html,\
- index/,\
- META-INF/,\
- plugin.properties
-src.includes = build.properties,\
- *.maplist,\
- *.ditamap,\
- topics/*.dita
-bin.excludes = DocBuild.xml,\
- myPlugin*.xml
-
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/ejb_toc.ditamap b/docs/org.eclipse.jst.ejb.doc.user/ejb_toc.ditamap
deleted file mode 100644
index c7099c9..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/ejb_toc.ditamap
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map id="ejbtoc" title="Developing EJB applications">
-<topicref href="topics/ceover.dita" locktitle="yes" navtitle="Developing EJB applications">
-<topicref href="topics/ejbarch.dita" navtitle="EJB 3.0 architecture" type="concept">
-<topicref href="topics/cpojosandee5.dita" navtitle="POJOs (Plain old Java objects)">
-</topicref>
-<topicref href="topics/cejb3vejb21.dita" navtitle="EJB 3.0 versus EJB 2.1">
-</topicref>
-</topicref>
-<topicref href="topics/cejb3.dita" navtitle="Developing EJB 3.0 Applications">
-<topicref href="topics/tecrtpro.dita" navtitle="Creating EJB projects">
-<topicref href="topics/tcreatingentitybeans3.dita" navtitle="Creating an entity bean">
-</topicref>
-<topicref href="topics/tcreatingsessbeans3.dita" navtitle="Creating a session bean">
-</topicref>
-<topicref href="topics/tcreatinmessbeans3.dita" navtitle="Creating a message-driven bean">
-</topicref>
-</topicref>
-<topicref href="topics/ccontentassist3.dita" navtitle="Content assist and EJB 3.0">
-</topicref>
-</topicref>
-<topicref href="topics/cearch.dita" navtitle="EJB 2.x architecture" type="concept">
-</topicref>
-<topicref href="topics/ceresrc.dita" navtitle="EJB 2.x development resources"
-type="concept">
-<topicref href="topics/tecrtpro.dita" navtitle="Creating EJB projects" type="task">
-</topicref>
-<topicref href="topics/ceclientjars.dita" navtitle="EJB 2.x client JAR projects"
-type="concept"></topicref>
-<topicref href="topics/teimp.dita" navtitle="Importing EJB 2.x JAR files"
-type="task"></topicref>
-<topicref href="topics/teexp.dita" navtitle="Exporting EJB 2.x projects to EJB JAR files"
-type="task"></topicref>
-</topicref>
-<topicref href="topics/tecrte.dita" navtitle="Creating enterprise beans with XDoclet annotation support"
-type="task">
-<topicref href="topics/tesessb.dita" navtitle="Creating session beans with XDoclet annotation support">
-</topicref>
-<topicref href="topics/teentityb.dita" navtitle="Creating CMP entity beans with XDoclet annotation support">
-</topicref>
-<topicref href="topics/temessb.dita" navtitle="Creating message-driven beans with XDoclet annotation support"
-type="task"></topicref>
-<topicref href="topics/txdocletconf.dita" navtitle="Configuring XDoclet annotation support"
-type="task"></topicref>
-</topicref>
-</topicref>
-</map>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/ejb_toc.xml b/docs/org.eclipse.jst.ejb.doc.user/ejb_toc.xml
deleted file mode 100644
index 5116ed9..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/ejb_toc.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Developing EJB applications" topic="topics/ceover.html">
-<topic label="Developing EJB applications" href="topics/ceover.html">
-<topic label="EJB 3.0 architecture" href="topics/ejbarch.html">
-<topic label="POJOs (Plain old Java objects)" href="topics/cpojosandee5.html"/>
-<topic label="EJB 3.0 versus EJB 2.1" href="topics/cejb3vejb21.html"/>
-</topic>
-<topic label="Developing EJB 3.0 Applications" href="topics/cejb3.html">
-<topic label="Creating EJB projects" href="topics/tecrtpro.html">
-<topic label="Creating an entity bean" href="topics/tcreatingentitybeans3.html"/>
-<topic label="Creating a session bean" href="topics/tcreatingsessbeans3.html"/>
-<topic label="Creating a message-driven bean" href="topics/tcreatinmessbeans3.html"/>
-</topic>
-<topic label="Content assist and EJB 3.0" href="topics/ccontentassist3.html"/>
-</topic>
-<topic label="EJB 2.x architecture" href="topics/cearch.html"/>
-<topic label="EJB 2.x development resources" href="topics/ceresrc.html">
-<topic label="Creating EJB projects" href="topics/tecrtpro.html"/>
-<topic label="EJB 2.x client JAR projects" href="topics/ceclientjars.html"/>
-<topic label="Importing EJB 2.x JAR files" href="topics/teimp.html"/>
-<topic label="Exporting EJB 2.x projects to EJB JAR files" href="topics/teexp.html"/>
-</topic>
-<topic label="Creating enterprise beans with XDoclet annotation support" href="topics/tecrte.html">
-<topic label="Creating session beans with XDoclet annotation support" href="topics/tesessb.html"/>
-<topic label="Creating CMP entity beans with XDoclet annotation support" href="topics/teentityb.html"/>
-<topic label="Creating message-driven beans with XDoclet annotation support" href="topics/temessb.html"/>
-<topic label="Configuring XDoclet annotation support" href="topics/txdocletconf.html"/>
-</topic>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/images/contentAssist.gif b/docs/org.eclipse.jst.ejb.doc.user/images/contentAssist.gif
deleted file mode 100644
index b960d06..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/images/contentAssist.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ejb.doc.user/images/errorquickfix.gif b/docs/org.eclipse.jst.ejb.doc.user/images/errorquickfix.gif
deleted file mode 100644
index c51d5a5..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/images/errorquickfix.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ejb.doc.user/images/ycwin.gif b/docs/org.eclipse.jst.ejb.doc.user/images/ycwin.gif
deleted file mode 100644
index 895f9ca..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/images/ycwin.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ejb.doc.user/index/_m.cfs b/docs/org.eclipse.jst.ejb.doc.user/index/_m.cfs
deleted file mode 100644
index 6a37198..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/index/_m.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ejb.doc.user/index/deletable b/docs/org.eclipse.jst.ejb.doc.user/index/deletable
deleted file mode 100644
index 593f470..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ejb.doc.user/index/indexed_contributions b/docs/org.eclipse.jst.ejb.doc.user/index/indexed_contributions
deleted file mode 100644
index 1682fb2..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 13 21:31:58 EDT 2008
-org.eclipse.jst.ejb.doc.user=org.eclipse.jst.ejb.doc.user\n1.1.0.qualifier
diff --git a/docs/org.eclipse.jst.ejb.doc.user/index/indexed_dependencies b/docs/org.eclipse.jst.ejb.doc.user/index/indexed_dependencies
deleted file mode 100644
index 6634213..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 13 21:31:58 EDT 2008
-lucene=1.9.1.v200803061811
-analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en
diff --git a/docs/org.eclipse.jst.ejb.doc.user/index/indexed_docs b/docs/org.eclipse.jst.ejb.doc.user/index/indexed_docs
deleted file mode 100644
index 9874064..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,22 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 13 21:31:58 EDT 2008
-/org.eclipse.jst.ejb.doc.user/topics/ceover.html=0
-/org.eclipse.jst.ejb.doc.user/topics/cejb3.html=0
-/org.eclipse.jst.ejb.doc.user/topics/cpojosandee5.html=0
-/org.eclipse.jst.ejb.doc.user/topics/cearch.html=0
-/org.eclipse.jst.ejb.doc.user/topics/tcreatingsessbeans3.html=0
-/org.eclipse.jst.ejb.doc.user/topics/tesessb.html=0
-/org.eclipse.jst.ejb.doc.user/topics/temessb.html=0
-/org.eclipse.jst.ejb.doc.user/topics/tcreatinmessbeans3.html=0
-/org.eclipse.jst.ejb.doc.user/topics/teexp.html=0
-/org.eclipse.jst.ejb.doc.user/topics/cejb3vejb21.html=0
-/org.eclipse.jst.ejb.doc.user/topics/ejbarch.html=0
-/org.eclipse.jst.ejb.doc.user/topics/teimp.html=0
-/org.eclipse.jst.ejb.doc.user/topics/txdocletconf.html=0
-/org.eclipse.jst.ejb.doc.user/topics/teentityb.html=0
-/org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html=0
-/org.eclipse.jst.ejb.doc.user/topics/ceresrc.html=0
-/org.eclipse.jst.ejb.doc.user/topics/tecrte.html=0
-/org.eclipse.jst.ejb.doc.user/topics/ccontentassist3.html=0
-/org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html=0
-/org.eclipse.jst.ejb.doc.user/topics/tcreatingentitybeans3.html=0
diff --git a/docs/org.eclipse.jst.ejb.doc.user/index/segments b/docs/org.eclipse.jst.ejb.doc.user/index/segments
deleted file mode 100644
index 0d843b8..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ejb.doc.user/myplugin.xml b/docs/org.eclipse.jst.ejb.doc.user/myplugin.xml
deleted file mode 100644
index 3da95b6..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/myplugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-
-<plugin>
-
- <extension point="org.eclipse.help.toc">
- <toc file="ejb_toc.xml" />
- <index path="index/"/>
- </extension>
-
- <extension point="org.eclipse.help.index">
- <index file="org.eclipse.jst.ejb.doc.userindex.xml"/>
- </extension>
- <extension point="org.eclipse.help.base.luceneSearchParticipants">
- <binding participantId="org.eclipse.help.base.xhtml"/>
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/org.eclipse.jst.ejb.doc.user.maplist b/docs/org.eclipse.jst.ejb.doc.user/org.eclipse.jst.ejb.doc.user.maplist
deleted file mode 100644
index 4085950..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/org.eclipse.jst.ejb.doc.user.maplist
+++ /dev/null
@@ -1,8 +0,0 @@
-<maplist version="3.6.2">
- <nav>
- <map file="ejb_toc.ditamap"/>
- </nav>
- <link>
- <map file="ejb_toc.ditamap"/>
- </link>
-</maplist>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/org.eclipse.jst.ejb.doc.userindex.xml b/docs/org.eclipse.jst.ejb.doc.user/org.eclipse.jst.ejb.doc.userindex.xml
deleted file mode 100644
index b128bc2..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/org.eclipse.jst.ejb.doc.userindex.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
- <entry keyword="architecture">
- <entry keyword="EJB 3.0">
- <topic href="topics/ejbarch.html#ejbarch" title="EJB 3.0 architecture"/>
- </entry>
- <entry keyword="EJB 2.x">
- <topic href="topics/cearch.html#cearch" title="EJB 2.x architecture"/>
- </entry>
- </entry>
- <entry keyword="EJB 3.0">
- <entry keyword="architecture">
- <entry keyword="3.0">
- <topic href="topics/ejbarch.html#ejbarch" title="EJB 3.0 architecture"/>
- </entry>
- </entry>
- <entry keyword="entity bean">
- <entry keyword="creating">
- <topic href="topics/tcreatingentitybeans3.html#tcreateejbproj" title="Creating an EJB 3.0 entity bean"/>
- </entry>
- </entry>
- <entry keyword="session bean">
- <entry keyword="creating">
- <topic href="topics/tcreatingsessbeans3.html#tsessbeanwiz" title="Creating a, EJB 3.0 session bean using the wizard"/>
- </entry>
- </entry>
- <entry keyword="message-driven bean">
- <entry keyword="creating">
- <topic href="topics/tcreatinmessbeans3.html#tcreatingsessionbean" title="Creating a message-driven bean using the wizard"/>
- </entry>
- </entry>
- <entry keyword="content assist">
- <topic href="topics/ccontentassist3.html#cejb3" title="Content assist and EJB 3.0"/>
- </entry>
- </entry>
- <entry keyword="Enterprise JavaBeans 3.0">
- <topic href="topics/cpojosandee5.html#cejb3" title="Plain old Java objects"/>
- <topic href="topics/cejb3vejb21.html#compareejb2" title="Differences between EJB 3.0 and EJB 2.1"/>
- <topic href="topics/cejb3.html#cejb3" title="Developing EJB 3.0 Applications"/>
- </entry>
- <entry keyword="EJB">
- <entry keyword="projects">
- <entry keyword="creating">
- <topic href="topics/tecrtpro.html#tecrtpro" title="Creating EJB projects"/>
- </entry>
- </entry>
- <entry keyword="developing">
- <entry keyword="applications">
- <topic href="topics/ceover.html#ceover" title="EJB 2.x application development"/>
- </entry>
- <entry keyword="resources">
- <topic href="topics/ceresrc.html#ceresrc" title="EJB 2.x development resources"/>
- </entry>
- </entry>
- <entry keyword="architecture">
- <entry keyword="2.x">
- <topic href="topics/cearch.html#cearch" title="EJB 2.x architecture"/>
- </entry>
- </entry>
- <entry keyword="client JAR projects">
- <topic href="topics/ceclientjars.html#ceclientjars" title="EJB 2.x client JAR projects"/>
- </entry>
- <entry keyword="importing JAR files">
- <topic href="topics/teimp.html#teimp" title="Importing EJB 2.x JAR files"/>
- </entry>
- <entry keyword="JAR files">
- <entry keyword="exporting projects">
- <topic href="topics/teexp.html#teexp" title="Exporting EJB 2.x projects to EJB JAR files"/>
- </entry>
- </entry>
- <entry keyword="exporting projects">
- <topic href="topics/teexp.html#teexp" title="Exporting EJB 2.x projects to EJB JAR files"/>
- </entry>
- <entry keyword="XDoclet annotation support">
- <topic href="topics/tecrte.html#tecrte" title="Creating enterprise beans with XDoclet annotation support"/>
- </entry>
- </entry>
- <entry keyword="Entity bean">
- <entry keyword="EJB 3.0">
- <entry keyword="creating">
- <topic href="topics/tcreatingentitybeans3.html#tcreateejbproj" title="Creating an EJB 3.0 entity bean"/>
- </entry>
- </entry>
- </entry>
- <entry keyword="Session bean">
- <entry keyword="EJB 3.0">
- <entry keyword="creating">
- <topic href="topics/tcreatingsessbeans3.html#tsessbeanwiz" title="Creating a, EJB 3.0 session bean using the wizard"/>
- </entry>
- </entry>
- </entry>
- <entry keyword="Message-driven bean">
- <entry keyword="EJB 3.0">
- <entry keyword="creating">
- <topic href="topics/tcreatinmessbeans3.html#tcreatingsessionbean" title="Creating a message-driven bean using the wizard"/>
- </entry>
- </entry>
- </entry>
- <entry keyword="content assist">
- <entry keyword="EJB 3.0">
- <entry keyword="enhancements">
- <topic href="topics/ccontentassist3.html#cejb3" title="Content assist and EJB 3.0"/>
- </entry>
- </entry>
- </entry>
- <entry keyword="Java EE 5">
- <entry keyword="EJB 3.0">
- <entry keyword="content assist">
- <topic href="topics/ccontentassist3.html#cejb3" title="Content assist and EJB 3.0"/>
- </entry>
- </entry>
- </entry>
- <entry keyword="applications">
- <entry keyword="EJB development">
- <topic href="topics/ceover.html#ceover" title="EJB 2.x application development"/>
- </entry>
- </entry>
- <entry keyword="resources">
- <entry keyword="EJB development">
- <topic href="topics/ceresrc.html#ceresrc" title="EJB 2.x development resources"/>
- </entry>
- </entry>
- <entry keyword="JAR files">
- <entry keyword="importing EJB">
- <topic href="topics/teimp.html#teimp" title="Importing EJB 2.x JAR files"/>
- </entry>
- </entry>
- <entry keyword="XDoclet annotation support">
- <entry keyword="EJBs">
- <topic href="topics/tecrte.html#tecrte" title="Creating enterprise beans with XDoclet annotation support"/>
- </entry>
- <entry keyword="session beans">
- <topic href="topics/tesessb.html#tesessb" title="Creating session beans with XDoclet annotation support"/>
- </entry>
- <entry keyword="entity beans">
- <topic href="topics/teentityb.html#temessb" title="Creating container-managed persistence (CMP) entity beans with XDoclet annotation support"/>
- </entry>
- <entry keyword="message-driven beans">
- <topic href="topics/temessb.html#temessb" title="Creating message-driven beans with XDoclet annotation support"/>
- </entry>
- <entry keyword="configuring">
- <topic href="topics/txdocletconf.html#configuringxdocletannotationsupport" title="Configuring XDoclet annotation support"/>
- </entry>
- </entry>
- <entry keyword="session beans">
- <entry keyword="XDoclet annotation support">
- <topic href="topics/tesessb.html#tesessb" title="Creating session beans with XDoclet annotation support"/>
- </entry>
- </entry>
- <entry keyword="CMP entity beans">
- <entry keyword="XDoclet annotation support">
- <topic href="topics/teentityb.html#temessb" title="Creating container-managed persistence (CMP) entity beans with XDoclet annotation support"/>
- </entry>
- </entry>
- <entry keyword="message-driven beans">
- <entry keyword="XDoclet annotation support">
- <topic href="topics/temessb.html#temessb" title="Creating message-driven beans with XDoclet annotation support"/>
- </entry>
- </entry>
- <entry keyword="Java annotation">
- <entry keyword="XDoclet annotation support">
- <topic href="topics/txdocletconf.html#configuringxdocletannotationsupport" title="Configuring XDoclet annotation support"/>
- </entry>
- </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/plugin.properties b/docs/org.eclipse.jst.ejb.doc.user/plugin.properties
deleted file mode 100644
index b8c17de..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/plugin.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-Plugin.name = EJB docs
diff --git a/docs/org.eclipse.jst.ejb.doc.user/plugin.xml b/docs/org.eclipse.jst.ejb.doc.user/plugin.xml
deleted file mode 100644
index 3da95b6..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-
-<plugin>
-
- <extension point="org.eclipse.help.toc">
- <toc file="ejb_toc.xml" />
- <index path="index/"/>
- </extension>
-
- <extension point="org.eclipse.help.index">
- <index file="org.eclipse.jst.ejb.doc.userindex.xml"/>
- </extension>
- <extension point="org.eclipse.help.base.luceneSearchParticipants">
- <binding participantId="org.eclipse.help.base.xhtml"/>
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/ccontentassist3.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/ccontentassist3.dita
deleted file mode 100644
index 1690365..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ccontentassist3.dita
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cejb3" xml:lang="en-us">
-<title>Content assist and EJB 3.0</title>
-<shortdesc>The content assist tool is a feature of the workbench. You can
-type code in your <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> editor and the content assist tool recommends possibilities
-to complete your code.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>content assist<indexterm>EJB 3.0<indexterm>enhancements</indexterm></indexterm></indexterm>
-<indexterm>EJB 3.0<indexterm>content assist</indexterm></indexterm><indexterm>Java
-EE 5<indexterm>EJB 3.0<indexterm>content assist</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p>With the introduction of <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5, the content assist tool in the
-application development workbench has been enhanced. Content assist now recognizes
-EJB 3.0 structures, providing content assist content when the project targets
-a server that supports EJB 3.0 structures.</p>
-<p>Content assist template support also exists for some of the EJB 3.0 annotations,
-such as @Resource, to provide an annotation with initial attribute values.</p>
-<fig><title>Content assist for an @Stateless</title>
-<image href="../images/contentAssist.gif" placement="break"></image>
-</fig>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/ccontentassist3.html b/docs/org.eclipse.jst.ejb.doc.user/topics/ccontentassist3.html
deleted file mode 100644
index 9a1318f..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ccontentassist3.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Content assist and EJB 3.0" />
-<meta name="abstract" content="The content assist tool is a feature of the workbench. You can type code in your Java editor and the content assist tool recommends possibilities to complete your code." />
-<meta name="description" content="The content assist tool is a feature of the workbench. You can type code in your Java editor and the content assist tool recommends possibilities to complete your code." />
-<meta content="content assist, EJB 3.0, enhancements, Java EE 5" name="DC.subject" />
-<meta content="content assist, EJB 3.0, enhancements, Java EE 5" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cejb3.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cejb3" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Content assist and EJB 3.0</title>
-</head>
-<body id="cejb3"><a name="cejb3"><!-- --></a>
-
-
-<h1 class="topictitle1">Content assist and EJB 3.0</h1>
-
-
-
-<div><p>The content assist tool is a feature of the workbench. You can
-type code in your Java™ editor and the content assist tool recommends possibilities
-to complete your code.</p>
-
-<p>With the introduction of Java EE 5, the content assist tool in the
-application development workbench has been enhanced. Content assist now recognizes
-EJB 3.0 structures, providing content assist content when the project targets
-a server that supports EJB 3.0 structures.</p>
-
-<p>Content assist template support also exists for some of the EJB 3.0 annotations,
-such as @Resource, to provide an annotation with initial attribute values.</p>
-
-<div class="fignone"><span class="figcap">Figure 1. Content assist for an @Stateless</span>
-<br /><img src="../images/contentAssist.gif" /><br />
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cejb3.html" title="You can use the workbench to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) 3.0 specification.">Developing EJB 3.0 Applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/cearch.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/cearch.dita
deleted file mode 100644
index 32e6180..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/cearch.dita
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cearch" xml:lang="en-us">
-<title>EJB 2.x architecture</title>
-<shortdesc>This topic provides a high-level overview of the distributed component
-architecture defined in the Sun Microsystems Enterprise <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm> (EJB)
-version 2.x architecture specification.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>architecture<indexterm>EJB 2.x</indexterm></indexterm>
-<indexterm>EJB<indexterm>architecture<indexterm>2.x</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p>The complete Enterprise <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="JavaBeans">JavaBeans</tm> specifications and descriptions
-of the technology are available from the <xref format="html" href="http://java.sun.com/products/ejb/docs.html#specs"
-scope="external">java.sun.com<desc></desc></xref> Web site.</p>
-<p>Enterprise beans provide several benefits for application developers. They
-do the following: </p>
-<ul>
-<li>Allow you to build distributed applications by combining components developed
-using tools from different vendors. </li>
-<li>Make it easy to write applications. You do not have to deal with low-level
-details of transaction and state management, multithreading, resource pooling,
-and other complex low-level APIs. However, if necessary, expert programmers
-can still gain direct access to the low-level APIs.</li>
-<li>Are developed once and then deployed on multiple platforms without recompilation
-or source code modification. </li>
-<li>Offer compatibility between the EJB specification that governs the use
-of enterprise beans and other <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> APIs and CORBA. This also provides
-for interoperability between enterprise beans and non-Java applications.</li>
-</ul>
-<dl><dlentry>
-<dt><b>Enterprise beans</b></dt>
-<dd>An enterprise bean is a non-visual component of a distributed, transaction-oriented
-enterprise application. Enterprise beans are typically deployed in EJB containers
-and run on EJB servers. You can customize them by changing their deployment
-descriptors and you can assemble them with other beans to create new applications.
-There are three types of enterprise beans: session beans, entity beans, and
-message-driven beans. Session beans and message-driven beans are coarse-grained
-components designed to model business process while entity beans are used
-to model fine-grained data objects.<p> <ul>
-<li><b>Session beans</b>: Session beans are non-persistent enterprise beans.
-They can be stateful or stateless.<ul>
-<li><b>Stateful session beans</b>: Act on behalf of a single client and maintain
-client-specific session information (called conversational state) across multiple
-method calls and transactions. They exist for the duration of a single client/server
-session.</li>
-<li><b>Stateless session beans</b>: Do not maintain any conversational state
-and are pooled by their container to handle multiple requests from multiple
-clients.</li>
-</ul></li>
-<li><b>Entity beans</b>: Entity beans are enterprise beans that contain persistent
-data and that can be saved in various persistent data stores. Each entity
-bean carries its own identity. Entity beans that manage their own persistence
-are called bean-managed persistence (BMP) entity beans. Entity beans that
-delegate their persistence to their EJB container are called container-managed
-persistence (CMP) entity beans.</li>
-<li><b>Message-driven beans</b>: Message-driven beans are enterprise beans
-that receive and process JMS messages. Unlike session or entity beans, message-driven
-beans have no interfaces. They can be accessed only through messaging and
-they do not maintain any conversational state. Message-driven beans allow
-asynchronous communication between the queue and the listener, and provide
-separation between message processing and business logic.</li>
-</ul></p></dd>
-</dlentry></dl>
-<dl><dlentry>
-<dt><b>Remote client view</b></dt>
-<dd>The remote client view specification became available beginning with EJB
-1.1. The remote client view of an enterprise bean is location independent.
-A client running in the same JVM as a bean instance uses the same API to access
-the bean as a client running in a different JVM on the same or different machine.
-The remote client view consists of two interfaces<ul>
-<li><b>Remote interface</b>: The remote interface specifies the remote business
-methods that a client can call on an enterprise bean.</li>
-<li><b>Remote home interface</b>: The remote home interface specifies the
-methods used by remote clients for locating, creating, and removing instances
-of enterprise bean classes.</li>
-</ul></dd>
-</dlentry></dl>
-<dl><dlentry>
-<dt><b>Local client view</b></dt>
-<dd>The local client view specification is available in EJB 2.0 or later.
-Unlike the remote client view, the local client view of a bean is location
-dependent. Local client view access to an enterprise bean requires both the
-local client and the enterprise bean that provides the local client view to
-be in the same JVM. The local client view therefore does not provide the location
-transparency provided by the remote client view. Local interfaces and local
-home interfaces provide support for lightweight access from enterprise beans
-that are local clients. Session and entity beans can be tightly coupled with
-their clients, allowing access without the overhead typically associated with
-remote method calls. The local client view consists of two interfaces:<ul>
-<li><b>Local interface</b>: The local interface is a lightweight version of
-the remote interface, but for local clients. It includes business logic methods
-that can be called by a local client.</li>
-<li><b>Local home interface</b>: The local home interface specifies the methods
-used by local clients for locating, creating, and removing instances of enterprise
-bean classes.</li>
-</ul></dd>
-</dlentry><dlentry>
-<dt><b>Web service client view</b></dt>
-<dd>In the EJB 2.1 specification, the EJB architecture introduced the support
-for Web services. A client for a session bean can be a Web service client.
-A Web service client can make use of the Web service client view of a stateless
-session bean, which has a corresponding service endpoint interface.<dl><dlentry>
-<dt><b>Service endpoint interface</b></dt>
-<dd>The service endpoint interface for a stateless session bean exposes the
-functionality of the session bean as a Web service endpoint. The Web Service
-Description Language (WSDL) document for a Web service describes the Web service
-as a set of endpoints operating on messages. A WSDL document can include the
-service endpoint interface of a stateless session bean as one of its endpoints.
-An existing stateless session bean can be modified to include a Web service
-client view, or a service endpoint interface can be mapped from an existing
-WSDL to provide the correct interface.<p>A Web service client view is independent
-of location and can be accessed through remote calls.</p></dd>
-</dlentry></dl></dd>
-</dlentry></dl>
-<dl><dlentry>
-<dt><b>EJB client JAR file</b></dt>
-<dd>An EJB client JAR file is an optional JAR file that can contain the client
-interfaces that a client program needs to use and the client views of the
-enterprise beans that are contained in the EJB JAR file. If you decide not
-to create an EJB client JAR file for an EJB module, all of the client interface
-classes will be in the EJB JAR file. By default, the workbench creates EJB
-client JAR projects for each corresponding EJB project.</dd>
-</dlentry></dl>
-<dl><dlentry>
-<dt><b>EJB container</b></dt>
-<dd>An EJB container is a runtime environment that manages one or more enterprise
-beans. The EJB container manages the life cycles of enterprise bean objects,
-coordinates distributed transactions, and implements object security. Generally,
-each EJB container is provided by an EJB server and contains a set of enterprise
-beans that run on the server.</dd>
-</dlentry><dlentry>
-<dt><b>Deployment descriptor</b></dt>
-<dd>A deployment descriptor is an XML file packaged with the enterprise beans
-in an EJB JAR file or an EAR file. It contains metadata describing the contents
-and structure of the enterprise beans, and runtime transaction and security
-information for the EJB container.</dd>
-</dlentry><dlentry>
-<dt><b>EJB server</b></dt>
-<dd>An EJB server is a high-level process or application that provides a runtime
-environment to support the execution of server applications that use enterprise
-beans. An EJB server provides a JNDI-accessible naming service, manages and
-coordinates the allocation of resources to client applications, provides access
-to system resources, and provides a transaction service. An EJB server could
-be provided by, for example, a database or application server.</dd>
-</dlentry></dl>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/cearch.html b/docs/org.eclipse.jst.ejb.doc.user/topics/cearch.html
deleted file mode 100644
index 777acad..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/cearch.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="EJB 2.x architecture" />
-<meta name="abstract" content="This topic provides a high-level overview of the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version 2.x architecture specification." />
-<meta name="description" content="This topic provides a high-level overview of the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version 2.x architecture specification." />
-<meta content="architecture, EJB 2.x, EJB, 2.x" name="DC.subject" />
-<meta content="architecture, EJB 2.x, EJB, 2.x" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceover.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cearch" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>EJB 2.x architecture</title>
-</head>
-<body id="cearch"><a name="cearch"><!-- --></a>
-
-
-<h1 class="topictitle1">EJB 2.x architecture</h1>
-
-
-
-<div><p>This topic provides a high-level overview of the distributed component
-architecture defined in the Sun Microsystems Enterprise JavaBeans™ (EJB)
-version 2.x architecture specification.</p>
-
-<p>The complete Enterprise JavaBeans specifications and descriptions
-of the technology are available from the <a href="http://java.sun.com/products/ejb/docs.html#specs" target="_blank" title="">java.sun.com</a> Web site.</p>
-
-<p>Enterprise beans provide several benefits for application developers. They
-do the following: </p>
-
-<ul>
-<li>Allow you to build distributed applications by combining components developed
-using tools from different vendors. </li>
-
-<li>Make it easy to write applications. You do not have to deal with low-level
-details of transaction and state management, multithreading, resource pooling,
-and other complex low-level APIs. However, if necessary, expert programmers
-can still gain direct access to the low-level APIs.</li>
-
-<li>Are developed once and then deployed on multiple platforms without recompilation
-or source code modification. </li>
-
-<li>Offer compatibility between the EJB specification that governs the use
-of enterprise beans and other Java™ APIs and CORBA. This also provides
-for interoperability between enterprise beans and non-Java applications.</li>
-
-</ul>
-
-<dl>
-<dt class="dlterm"><strong>Enterprise beans</strong></dt>
-
-<dd>An enterprise bean is a non-visual component of a distributed, transaction-oriented
-enterprise application. Enterprise beans are typically deployed in EJB containers
-and run on EJB servers. You can customize them by changing their deployment
-descriptors and you can assemble them with other beans to create new applications.
-There are three types of enterprise beans: session beans, entity beans, and
-message-driven beans. Session beans and message-driven beans are coarse-grained
-components designed to model business process while entity beans are used
-to model fine-grained data objects.<div class="p"> <ul>
-<li><strong>Session beans</strong>: Session beans are non-persistent enterprise beans.
-They can be stateful or stateless.<ul>
-<li><strong>Stateful session beans</strong>: Act on behalf of a single client and maintain
-client-specific session information (called conversational state) across multiple
-method calls and transactions. They exist for the duration of a single client/server
-session.</li>
-
-<li><strong>Stateless session beans</strong>: Do not maintain any conversational state
-and are pooled by their container to handle multiple requests from multiple
-clients.</li>
-
-</ul>
-</li>
-
-<li><strong>Entity beans</strong>: Entity beans are enterprise beans that contain persistent
-data and that can be saved in various persistent data stores. Each entity
-bean carries its own identity. Entity beans that manage their own persistence
-are called bean-managed persistence (BMP) entity beans. Entity beans that
-delegate their persistence to their EJB container are called container-managed
-persistence (CMP) entity beans.</li>
-
-<li><strong>Message-driven beans</strong>: Message-driven beans are enterprise beans
-that receive and process JMS messages. Unlike session or entity beans, message-driven
-beans have no interfaces. They can be accessed only through messaging and
-they do not maintain any conversational state. Message-driven beans allow
-asynchronous communication between the queue and the listener, and provide
-separation between message processing and business logic.</li>
-
-</ul>
-</div>
-</dd>
-
-</dl>
-
-<dl>
-<dt class="dlterm"><strong>Remote client view</strong></dt>
-
-<dd>The remote client view specification became available beginning with EJB
-1.1. The remote client view of an enterprise bean is location independent.
-A client running in the same JVM as a bean instance uses the same API to access
-the bean as a client running in a different JVM on the same or different machine.
-The remote client view consists of two interfaces<ul>
-<li><strong>Remote interface</strong>: The remote interface specifies the remote business
-methods that a client can call on an enterprise bean.</li>
-
-<li><strong>Remote home interface</strong>: The remote home interface specifies the
-methods used by remote clients for locating, creating, and removing instances
-of enterprise bean classes.</li>
-
-</ul>
-</dd>
-
-</dl>
-
-<dl>
-<dt class="dlterm"><strong>Local client view</strong></dt>
-
-<dd>The local client view specification is available in EJB 2.0 or later.
-Unlike the remote client view, the local client view of a bean is location
-dependent. Local client view access to an enterprise bean requires both the
-local client and the enterprise bean that provides the local client view to
-be in the same JVM. The local client view therefore does not provide the location
-transparency provided by the remote client view. Local interfaces and local
-home interfaces provide support for lightweight access from enterprise beans
-that are local clients. Session and entity beans can be tightly coupled with
-their clients, allowing access without the overhead typically associated with
-remote method calls. The local client view consists of two interfaces:<ul>
-<li><strong>Local interface</strong>: The local interface is a lightweight version of
-the remote interface, but for local clients. It includes business logic methods
-that can be called by a local client.</li>
-
-<li><strong>Local home interface</strong>: The local home interface specifies the methods
-used by local clients for locating, creating, and removing instances of enterprise
-bean classes.</li>
-
-</ul>
-</dd>
-
-
-<dt class="dlterm"><strong>Web service client view</strong></dt>
-
-<dd>In the EJB 2.1 specification, the EJB architecture introduced the support
-for Web services. A client for a session bean can be a Web service client.
-A Web service client can make use of the Web service client view of a stateless
-session bean, which has a corresponding service endpoint interface.<dl>
-<dt class="dlterm"><strong>Service endpoint interface</strong></dt>
-
-<dd>The service endpoint interface for a stateless session bean exposes the
-functionality of the session bean as a Web service endpoint. The Web Service
-Description Language (WSDL) document for a Web service describes the Web service
-as a set of endpoints operating on messages. A WSDL document can include the
-service endpoint interface of a stateless session bean as one of its endpoints.
-An existing stateless session bean can be modified to include a Web service
-client view, or a service endpoint interface can be mapped from an existing
-WSDL to provide the correct interface.<p>A Web service client view is independent
-of location and can be accessed through remote calls.</p>
-</dd>
-
-</dl>
-</dd>
-
-</dl>
-
-<dl>
-<dt class="dlterm"><strong>EJB client JAR file</strong></dt>
-
-<dd>An EJB client JAR file is an optional JAR file that can contain the client
-interfaces that a client program needs to use and the client views of the
-enterprise beans that are contained in the EJB JAR file. If you decide not
-to create an EJB client JAR file for an EJB module, all of the client interface
-classes will be in the EJB JAR file. By default, the workbench creates EJB
-client JAR projects for each corresponding EJB project.</dd>
-
-</dl>
-
-<dl>
-<dt class="dlterm"><strong>EJB container</strong></dt>
-
-<dd>An EJB container is a runtime environment that manages one or more enterprise
-beans. The EJB container manages the life cycles of enterprise bean objects,
-coordinates distributed transactions, and implements object security. Generally,
-each EJB container is provided by an EJB server and contains a set of enterprise
-beans that run on the server.</dd>
-
-
-<dt class="dlterm"><strong>Deployment descriptor</strong></dt>
-
-<dd>A deployment descriptor is an XML file packaged with the enterprise beans
-in an EJB JAR file or an EAR file. It contains metadata describing the contents
-and structure of the enterprise beans, and runtime transaction and security
-information for the EJB container.</dd>
-
-
-<dt class="dlterm"><strong>EJB server</strong></dt>
-
-<dd>An EJB server is a high-level process or application that provides a runtime
-environment to support the execution of server applications that use enterprise
-beans. An EJB server provides a JNDI-accessible naming service, manages and
-coordinates the allocation of resources to client applications, provides access
-to system resources, and provides a transaction service. An EJB server could
-be provided by, for example, a database or application server.</dd>
-
-</dl>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ceover.html" title="The workbench provides a specialized environment that you can use to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version specification. This product supports the Enterprise JavaBeans 1.1, 2.0, 2.1, and 3.0 specification levels.">EJB 2.x application development</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/ceclientjars.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/ceclientjars.dita
deleted file mode 100644
index ced90d2..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceclientjars.dita
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="ceclientjars" xml:lang="en-us">
-<title>EJB 2.x client JAR projects</title>
-<shortdesc>An EJB client JAR project contains all the class files that a client
-program needs to use the client view of the enterprise beans that are contained
-in the EJB module.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EJB<indexterm>client JAR projects</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p>With the EJB tooling, you can create an EJB project with a corresponding
-EJB client JAR project. The EJB project will depend on the EJB client JAR
-project. The EJB client JAR project contains all necessary classes for a client
-of the enterprise beans, including all interface classes, key classes, and
-supporting classes. Because these classes are not duplicated in the EJB project,
-the EJB project depends on its EJB client JAR project. Any project that has
-a reference to an enterprise bean in the EJB project will need a reference
-to the EJB client JAR project. If the EJB client JAR project is in another
-enterprise application, the EJB client JAR file must be added to the referencing
-EAR file as a utility JAR file. </p>
-<p>After the EJB client JAR project is created, it is up to you to add any
-necessary value objects to this project that are needed by the home or component
-interfaces. If the objects are not present, compilation errors will result. </p>
-<p><b>EJB client JAR files</b></p>
-<p>EJB client projects are exported as EJB client JAR files when the application
-is exported. The EJB client JAR file is specified in the deployment descriptor
-of the EJB JAR file using the optional <codeph>ejb-client-jar</codeph> element.
-The value of the <codeph>ejb-client-jar</codeph> element is the path name
-specifying the location of the EJB client JAR file in the containing Java
-EE Enterprise Application Archive (.ear) file. The value of the path name
-is a URI relative to the EJB JAR file within the application. <note>The relative
-URI path for the EJB client JAR file should be the same in all applications
-that the EJB project belongs to.</note></p>
-<p>When you create an EJB client JAR project for an EJB project, the EJB client
-JAR file is added to the containing enterprise application as a project utility
-JAR. The reference to this EJB client JAR file cannot be removed from the
-enterprise application as long as the EJB project is defined as a module for
-the application.</p>
-<note conref="teexp.dita#teexp/exportEJBClientJAR"></note>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html b/docs/org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html
deleted file mode 100644
index 05b4bb8..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="EJB 2.x client JAR projects" />
-<meta name="abstract" content="An EJB client JAR project contains all the class files that a client program needs to use the client view of the enterprise beans that are contained in the EJB module." />
-<meta name="description" content="An EJB client JAR project contains all the class files that a client program needs to use the client view of the enterprise beans that are contained in the EJB module." />
-<meta content="EJB, client JAR projects" name="DC.subject" />
-<meta content="EJB, client JAR projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceresrc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ceclientjars" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>EJB 2.x client JAR projects</title>
-</head>
-<body id="ceclientjars"><a name="ceclientjars"><!-- --></a>
-
-
-<h1 class="topictitle1">EJB 2.x client JAR projects</h1>
-
-
-
-<div><p>An EJB client JAR project contains all the class files that a client
-program needs to use the client view of the enterprise beans that are contained
-in the EJB module.</p>
-
-<p>With the EJB tooling, you can create an EJB project with a corresponding
-EJB client JAR project. The EJB project will depend on the EJB client JAR
-project. The EJB client JAR project contains all necessary classes for a client
-of the enterprise beans, including all interface classes, key classes, and
-supporting classes. Because these classes are not duplicated in the EJB project,
-the EJB project depends on its EJB client JAR project. Any project that has
-a reference to an enterprise bean in the EJB project will need a reference
-to the EJB client JAR project. If the EJB client JAR project is in another
-enterprise application, the EJB client JAR file must be added to the referencing
-EAR file as a utility JAR file. </p>
-
-<p>After the EJB client JAR project is created, it is up to you to add any
-necessary value objects to this project that are needed by the home or component
-interfaces. If the objects are not present, compilation errors will result. </p>
-
-<p><strong>EJB client JAR files</strong></p>
-
-<div class="p">EJB client projects are exported as EJB client JAR files when the application
-is exported. The EJB client JAR file is specified in the deployment descriptor
-of the EJB JAR file using the optional <samp class="codeph">ejb-client-jar</samp> element.
-The value of the <samp class="codeph">ejb-client-jar</samp> element is the path name
-specifying the location of the EJB client JAR file in the containing Java
-EE Enterprise Application Archive (.ear) file. The value of the path name
-is a URI relative to the EJB JAR file within the application. <div class="note"><span class="notetitle">Note:</span> The relative
-URI path for the EJB client JAR file should be the same in all applications
-that the EJB project belongs to.</div>
-</div>
-
-<p>When you create an EJB client JAR project for an EJB project, the EJB client
-JAR file is added to the containing enterprise application as a project utility
-JAR. The reference to this EJB client JAR file cannot be removed from the
-enterprise application as long as the EJB project is defined as a module for
-the application.</p>
-
-<div class="important"><span class="importanttitle">Important:</span> If
-you use the Export EJB JAR file wizard to export an EJB project, the export
-wizard does not include an EJB project's associated EJB client JAR project.
-To include the EJB client JAR file, it is recommended that you export the
-enterprise application EAR file that contains the EJB project. The resulting
-EAR file will include any dependent EJB client JAR files as utility JAR files.
-Alternatively, you can export the EJB client JAR project separately as a JAR
-file.</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ceresrc.html" title="This topic describes resources and development tools that are commonly used in EJB version 2.x development.">EJB 2.x development resources</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3.dita
deleted file mode 100644
index 5508f55..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3.dita
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cejb3" xml:lang="en-us">
-<title>Developing EJB 3.0 Applications</title>
-<shortdesc>You can use the workbench to develop and test enterprise beans
-that conform to the distributed component architecture defined in the Sun
-Microsystems Enterprise JavaBeans (EJB) 3.0 specification.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Enterprise JavaBeans 3.0</indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<p> Using this specification, you can develop beans more simply than in the
-2.1 standard. You can annotate your Java source code to provide information
-that was previously contained in XML deployment descriptors. Using <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> annotations
-allows you to create EJBs and <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> Persistence Architecture (JPA) beans
-quickly and easily from “plain old <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> objects (POJOs). For EJBs, these can
-be created without implementing EnterpriseBean interfaces. </p>
-<p>This product supports the Enterprise JavaBeans 2.1 and 3.0 specification
-levels. All of the EJB tools in the product are accessible from the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-perspective in the workbench. You can create session beans (stateful or stateless)
-or message-driven beans, by simply specifying the component defining annotation
-in your POJO. Additional configuration for your bean can be done by specifying
-additional annotations in the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> class. The <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> editor provides validation, content
-assistance and QuickFixes for your EJB 3.0 annotations, as well as support
-for refactoring beans. For richer assistance with the EJB 3.0 annotations,
-you can use the Annotations view to add or delete annotations, and to modify
-the attribute values of annotations. Deployment descriptors for your EJB 3.0
-modules are optional, but can be created for additional configuration.</p>
-<p>Java EE 5 streamlines EJB development in the following ways: <ul>
-<li>Fewer required classes and interfaces<ul>
-<li>Home and object interfaces are no longer required – you need the business
-interface only</li>
-<li>No need to implement javax.ejb.SessionBean</li>
-<li>No need to declare checked exceptions</li>
-</ul></li>
-<li>Optional deployment descriptors<ul>
-<li>Annotations provide component definition and dependency injection</li>
-</ul></li>
-<li>Simple lookups<ul>
-<li>new EJBContext() interface method replaces JNDI calls</li>
-</ul></li>
-<li>Lightweight persistence for object-relational mapping<ul>
-<li>Entities are POJOs that provide an object-oriented view of the data stored
-in relational database</li>
-</ul></li>
-<li>New Interceptors class (new in Java EE 5)<ul>
-<li>Interceptors are objects that can intercept a call to a business method
-(to handle security for example)</li>
-<li>Similar in purpose and action to servlet filter or Web services handler</li>
-<li>Provide limited form of aspect-oriented programming</li>
-</ul></li>
-</ul></p>
-<p>For further additional information on EJB 3.0, see the official specification: <xref
-href="http://jcp.org/en/jsr/detail?id=220" scope="external">JSR 220: Enterprise <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm> 3.0 </xref></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3.html b/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3.html
deleted file mode 100644
index 5dcb032..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Developing EJB 3.0 Applications" />
-<meta name="abstract" content="You can use the workbench to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) 3.0 specification." />
-<meta name="description" content="You can use the workbench to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) 3.0 specification." />
-<meta content="Enterprise JavaBeans 3.0" name="DC.subject" />
-<meta content="Enterprise JavaBeans 3.0" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceover.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tecrtpro.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccontentassist3.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cejb3" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Developing EJB 3.0 Applications</title>
-</head>
-<body id="cejb3"><a name="cejb3"><!-- --></a>
-
-
-<h1 class="topictitle1">Developing EJB 3.0 Applications</h1>
-
-
-
-<div><p>You can use the workbench to develop and test enterprise beans
-that conform to the distributed component architecture defined in the Sun
-Microsystems Enterprise JavaBeans (EJB) 3.0 specification.</p>
-
-<p> Using this specification, you can develop beans more simply than in the
-2.1 standard. You can annotate your Java source code to provide information
-that was previously contained in XML deployment descriptors. Using Java™ annotations
-allows you to create EJBs and Java Persistence Architecture (JPA) beans
-quickly and easily from “plain old Java objects (POJOs). For EJBs, these can
-be created without implementing EnterpriseBean interfaces. </p>
-
-<p>This product supports the Enterprise JavaBeans 2.1 and 3.0 specification
-levels. All of the EJB tools in the product are accessible from the Java EE
-perspective in the workbench. You can create session beans (stateful or stateless)
-or message-driven beans, by simply specifying the component defining annotation
-in your POJO. Additional configuration for your bean can be done by specifying
-additional annotations in the Java class. The Java editor provides validation, content
-assistance and QuickFixes for your EJB 3.0 annotations, as well as support
-for refactoring beans. For richer assistance with the EJB 3.0 annotations,
-you can use the Annotations view to add or delete annotations, and to modify
-the attribute values of annotations. Deployment descriptors for your EJB 3.0
-modules are optional, but can be created for additional configuration.</p>
-
-<div class="p">Java EE 5 streamlines EJB development in the following ways: <ul>
-<li>Fewer required classes and interfaces<ul>
-<li>Home and object interfaces are no longer required – you need the business
-interface only</li>
-
-<li>No need to implement javax.ejb.SessionBean</li>
-
-<li>No need to declare checked exceptions</li>
-
-</ul>
-</li>
-
-<li>Optional deployment descriptors<ul>
-<li>Annotations provide component definition and dependency injection</li>
-
-</ul>
-</li>
-
-<li>Simple lookups<ul>
-<li>new EJBContext() interface method replaces JNDI calls</li>
-
-</ul>
-</li>
-
-<li>Lightweight persistence for object-relational mapping<ul>
-<li>Entities are POJOs that provide an object-oriented view of the data stored
-in relational database</li>
-
-</ul>
-</li>
-
-<li>New Interceptors class (new in Java EE 5)<ul>
-<li>Interceptors are objects that can intercept a call to a business method
-(to handle security for example)</li>
-
-<li>Similar in purpose and action to servlet filter or Web services handler</li>
-
-<li>Provide limited form of aspect-oriented programming</li>
-
-</ul>
-</li>
-
-</ul>
-</div>
-
-<p>For further additional information on EJB 3.0, see the official specification: <a href="http://jcp.org/en/jsr/detail?id=220" target="_blank">JSR 220: Enterprise JavaBeans™ 3.0</a></p>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tecrtpro.html">Creating EJB projects</a></strong><br />
-An EJB project is used to organize the resources contained in an EJB module.</li>
-<li class="ulchildlink"><strong><a href="../topics/ccontentassist3.html">Content assist and EJB 3.0</a></strong><br />
-The content assist tool is a feature of the workbench. You can type code in your Java editor and the content assist tool recommends possibilities to complete your code.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ceover.html" title="The workbench provides a specialized environment that you can use to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version specification. This product supports the Enterprise JavaBeans 1.1, 2.0, 2.1, and 3.0 specification levels.">EJB 2.x application development</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3vejb21.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3vejb21.dita
deleted file mode 100644
index 3cbdd8c..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3vejb21.dita
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="compareejb2" xml:lang="en-us">
-<title>Differences between EJB 3.0 and EJB 2.1</title>
-<titlealts>
-<navtitle>EJB 3.0 versus EJB 2.1</navtitle>
-<searchtitle>Enterprise JavaBean version differences between EJB 3.0 and EJB
-2.1</searchtitle>
-</titlealts>
-<shortdesc>Compared to EJB 2.1, EJB 3.0 simplifies the process of creating
-Enterprise JavaBean applications.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Enterprise JavaBeans 3.0</indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<p>The underlying concept of the EJB 3.0 specification centers on a plain
-old <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> object
-(POJO) programming model that uses <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> annotations to capture information
-that deployment descriptors used to contain. Deployment descriptors are now
-optional in most cases. Using default values liberally also means that you
-need to write and maintain less supporting code. This greatly simplifies the
-programming experience in creating and using EJB 3.0 components.</p>
-<p>While EJB 2.1 added support for Web services, changes in the implementation
-of session beans, changes in how enterprise beans are invoked and a new XML
-schema to replace the DTD that defined ejb-jar.xml deployment descriptor,
-EJB 3.0 has taken this one step further. EJB 3.0 has introduced a lightweight
-entity bean persistence mechanism through the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> Persistence API. These entities are
-POJO based and can then be run outside of an EJB container and do not require
-any interfaces or EJB code in them. Similarly, session beans also no longer
-require EJB-specific component interfaces either.</p>
-<p><b>Comparison of EJB 2.1 class plus Deployment Descriptor file with equivalent
-EJB 3.0 class</b></p>
-<p>The examples in Table 1 are functionally equivalent:</p>
-<table><title>Comparison of EJB 2.1 and EJB 3.0</title>
-<tgroup cols="2"><colspec colname="col1"/><colspec colname="col2"/>
-<thead>
-<row valign="bottom">
-<entry colname="col1">EJB 2.1 </entry>
-<entry colname="col2">EJB 3.0</entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry colname="col1"><p><b>Java Class</b></p><codeblock>public class AccountBean
-implements javax.ejb.SessionBean {
-
- SessionContext ctx;
- DataSource accountDB;
-
- public void setSessionContext(SessionContext ctx) {
- this.ctx = ctx;
- }
-
- public void ejbCreate() {
- accountDB = (DataSource)ctx.lookup(
- "jdbc/accountDB");
-
- }
- public void ejbActivate() { }
- public void ejbPassivate() { }
- public void ejbRemove() { }
-
- public void setAccountDeposit(int empId,
- double deposit) {
- ...
- Connection conn = accountDB.getConnection();
- ...
- }
- ...
-}</codeblock></entry>
-<entry colname="col2"><p><b>Java Class</b></p><codeblock>@Stateless
-public class AccountBean implements Account
-{
- @Resource private DataSource accountDB;
-
- public void setAccountDeposit(int customerId,
- double deposit) {
- ...
- Connection conn = accountDB.getConnection();
- ...
- }
- ...
-}</codeblock></entry>
-</row>
-<row>
-<entry colname="col1"><p><b>Deployment Descriptor</b></p><codeblock><session>
- <ejb-name>AccountBean</ejb-name>
- <local-home>AccountHome</local-home>
- <local>Account</local>
- <ejb-class>com.example.AccountBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <resource-ref>
- <res-ref-name>jdbc/accountDB</res-ref-name>
- <res-ref-type>javax.sql.DataSource</res-ref-type>
- <res-auth>Container</res-auth>
- </resource-ref>
-</session>
-...
-<assembly-descriptor>...</assembly-descriptor>
-</codeblock></entry>
-<entry colname="col2"></entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-<p>The following four facets of <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 contributed the most to the changes
-in EJB 3.0 from EJB 2.1:<ul>
-<li>Plain old <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> objects</li>
-<li>Annotations</li>
-<li>Implied values</li>
-<li>Persistence</li>
-</ul></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3vejb21.html b/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3vejb21.html
deleted file mode 100644
index 3322e1d..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/cejb3vejb21.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Differences between EJB 3.0 and EJB 2.1" />
-<meta name="abstract" content="Compared to EJB 2.1, EJB 3.0 simplifies the process of creating Enterprise JavaBean applications." />
-<meta name="description" content="Compared to EJB 2.1, EJB 3.0 simplifies the process of creating Enterprise JavaBean applications." />
-<meta content="Enterprise JavaBeans 3.0" name="DC.subject" />
-<meta content="Enterprise JavaBeans 3.0" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ejbarch.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="compareejb2" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Enterprise JavaBean version differences between EJB 3.0 and EJB
-2.1</title>
-</head>
-<body id="compareejb2"><a name="compareejb2"><!-- --></a>
-
-
-<h1 class="topictitle1">Differences between EJB 3.0 and EJB 2.1</h1>
-
-
-
-
-<div><p>Compared to EJB 2.1, EJB 3.0 simplifies the process of creating
-Enterprise JavaBean applications.</p>
-
-<p>The underlying concept of the EJB 3.0 specification centers on a plain
-old Java™ object
-(POJO) programming model that uses Java annotations to capture information
-that deployment descriptors used to contain. Deployment descriptors are now
-optional in most cases. Using default values liberally also means that you
-need to write and maintain less supporting code. This greatly simplifies the
-programming experience in creating and using EJB 3.0 components.</p>
-
-<p>While EJB 2.1 added support for Web services, changes in the implementation
-of session beans, changes in how enterprise beans are invoked and a new XML
-schema to replace the DTD that defined ejb-jar.xml deployment descriptor,
-EJB 3.0 has taken this one step further. EJB 3.0 has introduced a lightweight
-entity bean persistence mechanism through the Java Persistence API. These entities are
-POJO based and can then be run outside of an EJB container and do not require
-any interfaces or EJB code in them. Similarly, session beans also no longer
-require EJB-specific component interfaces either.</p>
-
-<p><strong>Comparison of EJB 2.1 class plus Deployment Descriptor file with equivalent
-EJB 3.0 class</strong></p>
-
-<p>The examples in Table 1 are functionally equivalent:</p>
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all"><caption>Table 1. Comparison of EJB 2.1 and EJB 3.0</caption>
-<thead align="left">
-<tr valign="bottom">
-<th valign="bottom" id="N100A4">EJB 2.1 </th>
-
-<th valign="bottom" id="N100AB">EJB 3.0</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<td valign="top" headers="N100A4 "><p><strong>Java Class</strong></p>
-<pre>public class AccountBean
-implements javax.ejb.SessionBean {
-
- SessionContext ctx;
- DataSource accountDB;
-
- public void setSessionContext(SessionContext ctx) {
- this.ctx = ctx;
- }
-
- public void ejbCreate() {
- accountDB = (DataSource)ctx.lookup(
- "jdbc/accountDB");
-
- }
- public void ejbActivate() { }
- public void ejbPassivate() { }
- public void ejbRemove() { }
-
- public void setAccountDeposit(int empId,
- double deposit) {
- ...
- Connection conn = accountDB.getConnection();
- ...
- }
- ...
-}</pre>
-</td>
-
-<td valign="top" headers="N100AB "><p><strong>Java Class</strong></p>
-<pre>@Stateless
-public class AccountBean implements Account
-{
- @Resource private DataSource accountDB;
-
- public void setAccountDeposit(int customerId,
- double deposit) {
- ...
- Connection conn = accountDB.getConnection();
- ...
- }
- ...
-}</pre>
-</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100A4 "><p><strong>Deployment Descriptor</strong></p>
-<pre><session>
- <ejb-name>AccountBean</ejb-name>
- <local-home>AccountHome</local-home>
- <local>Account</local>
- <ejb-class>com.example.AccountBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <resource-ref>
- <res-ref-name>jdbc/accountDB</res-ref-name>
- <res-ref-type>javax.sql.DataSource</res-ref-type>
- <res-auth>Container</res-auth>
- </resource-ref>
-</session>
-...
-<assembly-descriptor>...</assembly-descriptor>
-</pre>
-</td>
-
-<td valign="top" headers="N100AB "> </td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-<div class="p">The following four facets of Java EE 5 contributed the most to the changes
-in EJB 3.0 from EJB 2.1:<ul>
-<li>Plain old Java objects</li>
-
-<li>Annotations</li>
-
-<li>Implied values</li>
-
-<li>Persistence</li>
-
-</ul>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ejbarch.html" title="This topic provides a high-level overview of the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version 3.0 architecture specification.">EJB 3.0 architecture</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/ceover.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/ceover.dita
deleted file mode 100644
index 1371ae3..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceover.dita
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="ceover" xml:lang="en-us">
-<title>EJB 2.x application development</title>
-<shortdesc>The workbench provides a specialized environment that you can use
-to develop and test enterprise beans that conform to the distributed component
-architecture defined in the Sun Microsystems Enterprise <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm> (EJB)
-version specification. This product supports the Enterprise <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm> 1.1,
-2.0, 2.1, and 3.0 specification levels.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>applications<indexterm>EJB development</indexterm></indexterm>
-<indexterm>EJB<indexterm>developing<indexterm>applications</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p>The complete Enterprise <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="JavaBeans">JavaBeans</tm> specifications and descriptions
-of the technology are available from the <xref format="html" href="http://java.sun.com/products/ejb/docs.html#specs"
-scope="external">java.sun.com<desc></desc></xref> Web site.</p>
-<p>If you are not familiar with enterprise beans or related EJB technology,
-see <xref href="cearch.dita#cearch" type="concept"></xref> for a brief description
-of key EJB concepts.</p>
-<p>The EJB development environment includes the following tools:</p>
-<dl><dlentry>
-<dt><b>The <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective</b></dt>
-<dd>All of the EJB tools are accessible from the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective. This perspective provides
-a layout in which the most commonly used actions, views, and wizards for <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-and EJB development are easily accessible</dd>
-</dlentry><dlentry>
-<dt><b>Creating enterprise beans</b></dt>
-<dd>The EJB tools help you create enterprise beans, such as session beans
-or message-driven beans. You can accomplish the following complementary enterprise
-bean development activities:<ul>
-<li>Writing and editing business logic.</li>
-<li>Importing or exporting enterprise beans.</li>
-<li>Maintaining enterprise bean source code and generated code using build
-in <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> development
-tools, and team and version control capabilities of the workbench.</li>
-</ul> </dd>
-</dlentry><dlentry>
-<dt><b>Validating enterprise bean code</b></dt>
-<dd>The EJB tools automatically validate that your enterprise bean code is
-consistent and that it conforms to the rules defined by the Enterprise <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm> specifications.
-Code verification occurs whenever an enterprise bean or its properties are
-changed. Errors and warnings are displayed in the Problems view of the workbench.
-Files with errors also display error icons. </dd>
-</dlentry><dlentry>
-<dt><b>Importing existing EJB JAR files</b></dt>
-<dd>EJB Tools allow beans and other metadata from an EJB JAR file to be imported
-into a new or existing EJB project.</dd>
-</dlentry><dlentry>
-<dt><b>Exporting existing EJB projects into JAR files</b></dt>
-<dd>EJB tools can export your EJB project so that it may be deployed to an
-application server.</dd>
-</dlentry></dl>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/ceover.html b/docs/org.eclipse.jst.ejb.doc.user/topics/ceover.html
deleted file mode 100644
index 5265302..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceover.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="EJB 2.x application development" />
-<meta name="abstract" content="The workbench provides a specialized environment that you can use to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version specification. This product supports the Enterprise JavaBeans 1.1, 2.0, 2.1, and 3.0 specification levels." />
-<meta name="description" content="The workbench provides a specialized environment that you can use to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version specification. This product supports the Enterprise JavaBeans 1.1, 2.0, 2.1, and 3.0 specification levels." />
-<meta content="applications, EJB development, EJB, developing" name="DC.subject" />
-<meta content="applications, EJB development, EJB, developing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ejbarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cejb3.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cearch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceresrc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tecrte.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ceover" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>EJB 2.x application development</title>
-</head>
-<body id="ceover"><a name="ceover"><!-- --></a>
-
-
-<h1 class="topictitle1">EJB 2.x application development</h1>
-
-
-
-<div><p>The workbench provides a specialized environment that you can use
-to develop and test enterprise beans that conform to the distributed component
-architecture defined in the Sun Microsystems Enterprise JavaBeans™ (EJB)
-version specification. This product supports the Enterprise JavaBeans 1.1,
-2.0, 2.1, and 3.0 specification levels.</p>
-
-<p>The complete Enterprise JavaBeans specifications and descriptions
-of the technology are available from the <a href="http://java.sun.com/products/ejb/docs.html#specs" target="_blank" title="">java.sun.com</a> Web site.</p>
-
-<p>If you are not familiar with enterprise beans or related EJB technology,
-see <a href="cearch.html#cearch" title="This topic provides a high-level overview of the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version 2.x architecture specification.">EJB 2.x architecture</a> for a brief description
-of key EJB concepts.</p>
-
-<p>The EJB development environment includes the following tools:</p>
-
-<dl>
-<dt class="dlterm"><strong>The Java™ EE perspective</strong></dt>
-
-<dd>All of the EJB tools are accessible from the Java EE perspective. This perspective provides
-a layout in which the most commonly used actions, views, and wizards for Java EE
-and EJB development are easily accessible</dd>
-
-
-<dt class="dlterm"><strong>Creating enterprise beans</strong></dt>
-
-<dd>The EJB tools help you create enterprise beans, such as session beans
-or message-driven beans. You can accomplish the following complementary enterprise
-bean development activities:<ul>
-<li>Writing and editing business logic.</li>
-
-<li>Importing or exporting enterprise beans.</li>
-
-<li>Maintaining enterprise bean source code and generated code using build
-in Java development
-tools, and team and version control capabilities of the workbench.</li>
-
-</ul>
- </dd>
-
-
-<dt class="dlterm"><strong>Validating enterprise bean code</strong></dt>
-
-<dd>The EJB tools automatically validate that your enterprise bean code is
-consistent and that it conforms to the rules defined by the Enterprise JavaBeans specifications.
-Code verification occurs whenever an enterprise bean or its properties are
-changed. Errors and warnings are displayed in the Problems view of the workbench.
-Files with errors also display error icons. </dd>
-
-
-<dt class="dlterm"><strong>Importing existing EJB JAR files</strong></dt>
-
-<dd>EJB Tools allow beans and other metadata from an EJB JAR file to be imported
-into a new or existing EJB project.</dd>
-
-
-<dt class="dlterm"><strong>Exporting existing EJB projects into JAR files</strong></dt>
-
-<dd>EJB tools can export your EJB project so that it may be deployed to an
-application server.</dd>
-
-</dl>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/ejbarch.html">EJB 3.0 architecture</a></strong><br />
-This topic provides a high-level overview of the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version 3.0 architecture specification.</li>
-<li class="ulchildlink"><strong><a href="../topics/cejb3.html">Developing EJB 3.0 Applications</a></strong><br />
-You can use the workbench to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) 3.0 specification.</li>
-<li class="ulchildlink"><strong><a href="../topics/cearch.html">EJB 2.x architecture</a></strong><br />
-This topic provides a high-level overview of the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version 2.x architecture specification.</li>
-<li class="ulchildlink"><strong><a href="../topics/ceresrc.html">EJB 2.x development resources</a></strong><br />
-This topic describes resources and development tools that are commonly used in EJB version 2.x development.</li>
-<li class="ulchildlink"><strong><a href="../topics/tecrte.html">Creating enterprise beans with XDoclet annotation support</a></strong><br />
-You can use a wizard to create session beans and message-driven beans that support XDoclet annotation.</li>
-</ul>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/ceresrc.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/ceresrc.dita
deleted file mode 100644
index 94ca12a..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceresrc.dita
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="ceresrc" xml:lang="en-us">
-<title>EJB 2.x development resources</title>
-<shortdesc>This topic describes resources and development tools that are commonly
-used in EJB version 2.x development.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EJB<indexterm>developing<indexterm>resources</indexterm></indexterm></indexterm>
-<indexterm>resources<indexterm>EJB development</indexterm></indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<dl><dlentry>
-<dt><b>EJB modules</b></dt>
-<dd> <p>EJB modules are displayed in the Project Explorer view of the <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-perspective, and they correspond to EJB projects.</p><p>An EJB module is used
-to assemble one or more enterprise beans into a single deployable unit. An
-EJB module is developed in an EJB project, and it can either be exported as
-a standalone EJB JAR file, or combined with other EJB or Web modules within
-an enterprise application. An EJB JAR file uses the format of a standard <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> archive
-file. An EJB module contains the following: </p><ul>
-<li>One or more enterprise beans and their associated .class and .java files.</li>
-<li>Graphics and other files depending on the need of the enterprise bean. </li>
-<li>A deployment descriptor. The file type for the deployment descriptor is
-Extensible Markup Language (XML). This file declares the contents of the EJB
-module, defines the structure of the beans in the module, and provides a description
-of how the beans are to be used at run time. </li>
-<li>A MANIFEST.MF file in the <uicontrol>META-INF</uicontrol> directory. The
-manifest file can contain a class path entry, with references to other JAR
-files or EJB modules in a J2EE enterprise application. It defines the module's
-external dependencies.</li>
-</ul><p>An EJB module is installed and runs in an EJB container.</p><p>An
-enterprise bean is a <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> component that can be combined with
-other resources to create distributed client/server applications.</p><note>If
-you choose to create an EJB client JAR file for your EJB module, the client
-interface classes for the enterprise beans will not be included in the EJB
-JAR file, but are included in the EJB client JAR file.</note></dd>
-</dlentry><dlentry>
-<dt><b>EJB projects</b></dt>
-<dd> <p>In the workbench, you create and maintain resources for enterprise
-applications in projects. An EJB project is a logical module that allows you
-to organize your enterprise beans.</p><p>The workbench supports EJB 1.1, EJB
-2.0, and EJB 2.1 projects. The J2EE specification level of a containing EAR
-project must be set to J2EE 1.3 or higher for EJB 2.0 projects, and J2EE 1.4
-for EJB 2.1 projects. In an EJB 1.1 project, you will only be able to create
-EJB 1.1 beans.</p><p>An EJB project is a specialized <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> project.
-Like a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> project, an EJB project must have one or more source
-folders to contain the source and output files for the project. By default,
-the source folder is named <b>ejbModule</b>, but you can change that name
-when you create the project or new source folders. When you publish or deploy
-the project, the contents of the folder or folders are aggregated. </p><p>You
-cannot use the EJB project as the source folder, doing so will cause errors.
-Also, though you can have more than one source folder in the project, only
-one of these source folders can contain the <uicontrol>META-INF</uicontrol> folder
-in which the MANIFEST.MF and deployment descriptor files reside.</p><note>If
-you choose to create an EJB client JAR file for your EJB module, the client
-interface classes for the enterprise beans will not be included in the EJB
-project, but in separate EJB client JAR project. EJB client JAR projects are
-displayed in the Project Explorer as <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> projects under the <b>Other Projects</b> node.</note></dd>
-</dlentry><dlentry>
-<dt><b>EJB client projects</b></dt>
-<dd> <p>The EJB tooling supports the creation of EJB client JAR projects for
-EJB modules. An EJB client JAR project contains all the interface classes
-that a client program needs to use the client views of the enterprise beans
-that are contained in the EJB project. When you create an EJB client project
-for an EJB project, a new <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> project is created and added to your
-workspace. The EJB client project is added as a project utility JAR file to
-each module that the EJB project belongs to.</p><p>By default, when you use
-the wizard to create an EJB project, an EJB client JAR project is also created.
-However, you can clear this option in the wizard.</p><note type="tip">You
-can also add the EJB client project to another enterprise application that
-does not include the EJB project as a module. This will ensure that the EJB
-client JAR file is exported and packaged with the EAR file when the application
-is exported.</note></dd>
-</dlentry><dlentry>
-<dt><b>Enterprise beans</b></dt>
-<dd> <p>An enterprise bean is a <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> component that can be combined with
-other resources to create distributed client/server applications.</p><p>There
-are three types of enterprise beans: entity beans, session beans, and message-driven
-beans. Typically, all types of beans are used together within an enterprise
-application.</p><dl><dlentry>
-<dt><b>Entity beans</b></dt>
-<dd>Entity beans store permanent data. Entity beans with container-managed
-persistence (CMP) require database connections. Entity beans with bean-managed
-persistence manage permanent data in whichever manner is defined in the bean
-code. This can include writing to databases or XML files, for example.</dd>
-</dlentry><dlentry>
-<dt><b>Session beans</b></dt>
-<dd>Session beans do not require database access, though they can obtain it
-indirectly (as needed) by accessing entity beans. Session beans can also obtain
-direct access to databases (and other resources) through the use of resource
-references.</dd>
-</dlentry><dlentry>
-<dt><b>Message-driven beans</b></dt>
-<dd>Message-driven beans are a special kind of enterprise bean that act as
-message consumers in the JMS messaging system. As with standard JMS message
-consumers, message-driven beans perform business logic based on the message
-contents. In several ways, the dynamic creation and allocation of message-driven
-bean instances mimics the behavior of stateless session enterprise beans.
-However, message-driven beans are different from stateless session enterprise
-beans (and other types of enterprise beans) in a couple of ways:<ul>
-<li>Message-driven beans process multiple JMS messages asynchronously, rather
-than processing a serialized sequence of method calls.</li>
-<li>Message-driven beans have no home or remote interface, and therefore cannot
-be directly accessed by internal or external clients.</li>
-</ul></dd>
-</dlentry></dl></dd>
-</dlentry><dlentry>
-<dt><b>Deployment descriptors</b></dt>
-<dd> <p>A deployment descriptor contains configuration data that the runtime
-environment uses for an application. A deployment descriptor can include information
-about the following: </p><ul>
-<li>The structure and content (enterprise beans, for example) of the application.</li>
-<li>References to internal and external dependencies. For example, an enterprise
-bean in an EJB module can require another enterprise bean that is not bundled
-in the same module.</li>
-<li>References to resource factory objects, such as URLs or JDBC data sources.</li>
-<li>Security roles that the container uses when implementing the required
-access control for the application.</li>
-<li>Transactional information about how (and whether) the container is to
-manage transactions for the application.</li>
-</ul><p>Deployment descriptors are XML files packaged with the application's
-files in a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> archive file. An EJB deployment descriptor is called
-ejb-jar.xml and is located in the <b>META-INF</b> folder of an EJB project.
-A J2EE application contains one application-level deployment descriptor file,
-governing the application as a whole. It also contains several component-level
-deployment descriptors, one for each module in the application.</p></dd>
-</dlentry></dl>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/ceresrc.html b/docs/org.eclipse.jst.ejb.doc.user/topics/ceresrc.html
deleted file mode 100644
index 5b0876e..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceresrc.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="EJB 2.x development resources" />
-<meta name="abstract" content="This topic describes resources and development tools that are commonly used in EJB version 2.x development." />
-<meta name="description" content="This topic describes resources and development tools that are commonly used in EJB version 2.x development." />
-<meta content="EJB, developing, resources, EJB development" name="DC.subject" />
-<meta content="EJB, developing, resources, EJB development" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceover.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tecrtpro.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceclientjars.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/teimp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/teexp.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ceresrc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>EJB 2.x development resources</title>
-</head>
-<body id="ceresrc"><a name="ceresrc"><!-- --></a>
-
-
-<h1 class="topictitle1">EJB 2.x development resources</h1>
-
-
-
-<div><p>This topic describes resources and development tools that are commonly
-used in EJB version 2.x development.</p>
-
-<dl>
-<dt class="dlterm"><strong>EJB modules</strong></dt>
-
-<dd> <p>EJB modules are displayed in the Project Explorer view of the Java™ EE
-perspective, and they correspond to EJB projects.</p>
-<p>An EJB module is used
-to assemble one or more enterprise beans into a single deployable unit. An
-EJB module is developed in an EJB project, and it can either be exported as
-a standalone EJB JAR file, or combined with other EJB or Web modules within
-an enterprise application. An EJB JAR file uses the format of a standard Java archive
-file. An EJB module contains the following: </p>
-<ul>
-<li>One or more enterprise beans and their associated .class and .java files.</li>
-
-<li>Graphics and other files depending on the need of the enterprise bean. </li>
-
-<li>A deployment descriptor. The file type for the deployment descriptor is
-Extensible Markup Language (XML). This file declares the contents of the EJB
-module, defines the structure of the beans in the module, and provides a description
-of how the beans are to be used at run time. </li>
-
-<li>A MANIFEST.MF file in the <span class="uicontrol">META-INF</span> directory. The
-manifest file can contain a class path entry, with references to other JAR
-files or EJB modules in a J2EE enterprise application. It defines the module's
-external dependencies.</li>
-
-</ul>
-<p>An EJB module is installed and runs in an EJB container.</p>
-<p>An
-enterprise bean is a Java component that can be combined with
-other resources to create distributed client/server applications.</p>
-<div class="note"><span class="notetitle">Note:</span> If
-you choose to create an EJB client JAR file for your EJB module, the client
-interface classes for the enterprise beans will not be included in the EJB
-JAR file, but are included in the EJB client JAR file.</div>
-</dd>
-
-
-<dt class="dlterm"><strong>EJB projects</strong></dt>
-
-<dd> <p>In the workbench, you create and maintain resources for enterprise
-applications in projects. An EJB project is a logical module that allows you
-to organize your enterprise beans.</p>
-<p>The workbench supports EJB 1.1, EJB
-2.0, and EJB 2.1 projects. The J2EE specification level of a containing EAR
-project must be set to J2EE 1.3 or higher for EJB 2.0 projects, and J2EE 1.4
-for EJB 2.1 projects. In an EJB 1.1 project, you will only be able to create
-EJB 1.1 beans.</p>
-<p>An EJB project is a specialized Java project.
-Like a Java project, an EJB project must have one or more source
-folders to contain the source and output files for the project. By default,
-the source folder is named <strong>ejbModule</strong>, but you can change that name
-when you create the project or new source folders. When you publish or deploy
-the project, the contents of the folder or folders are aggregated. </p>
-<p>You
-cannot use the EJB project as the source folder, doing so will cause errors.
-Also, though you can have more than one source folder in the project, only
-one of these source folders can contain the <span class="uicontrol">META-INF</span> folder
-in which the MANIFEST.MF and deployment descriptor files reside.</p>
-<div class="note"><span class="notetitle">Note:</span> If
-you choose to create an EJB client JAR file for your EJB module, the client
-interface classes for the enterprise beans will not be included in the EJB
-project, but in separate EJB client JAR project. EJB client JAR projects are
-displayed in the Project Explorer as Java projects under the <strong>Other Projects</strong> node.</div>
-</dd>
-
-
-<dt class="dlterm"><strong>EJB client projects</strong></dt>
-
-<dd> <p>The EJB tooling supports the creation of EJB client JAR projects for
-EJB modules. An EJB client JAR project contains all the interface classes
-that a client program needs to use the client views of the enterprise beans
-that are contained in the EJB project. When you create an EJB client project
-for an EJB project, a new Java project is created and added to your
-workspace. The EJB client project is added as a project utility JAR file to
-each module that the EJB project belongs to.</p>
-<p>By default, when you use
-the wizard to create an EJB project, an EJB client JAR project is also created.
-However, you can clear this option in the wizard.</p>
-<div class="tip"><span class="tiptitle">Tip:</span> You
-can also add the EJB client project to another enterprise application that
-does not include the EJB project as a module. This will ensure that the EJB
-client JAR file is exported and packaged with the EAR file when the application
-is exported.</div>
-</dd>
-
-
-<dt class="dlterm"><strong>Enterprise beans</strong></dt>
-
-<dd> <p>An enterprise bean is a Java component that can be combined with
-other resources to create distributed client/server applications.</p>
-<p>There
-are three types of enterprise beans: entity beans, session beans, and message-driven
-beans. Typically, all types of beans are used together within an enterprise
-application.</p>
-<dl>
-<dt class="dlterm"><strong>Entity beans</strong></dt>
-
-<dd>Entity beans store permanent data. Entity beans with container-managed
-persistence (CMP) require database connections. Entity beans with bean-managed
-persistence manage permanent data in whichever manner is defined in the bean
-code. This can include writing to databases or XML files, for example.</dd>
-
-
-<dt class="dlterm"><strong>Session beans</strong></dt>
-
-<dd>Session beans do not require database access, though they can obtain it
-indirectly (as needed) by accessing entity beans. Session beans can also obtain
-direct access to databases (and other resources) through the use of resource
-references.</dd>
-
-
-<dt class="dlterm"><strong>Message-driven beans</strong></dt>
-
-<dd>Message-driven beans are a special kind of enterprise bean that act as
-message consumers in the JMS messaging system. As with standard JMS message
-consumers, message-driven beans perform business logic based on the message
-contents. In several ways, the dynamic creation and allocation of message-driven
-bean instances mimics the behavior of stateless session enterprise beans.
-However, message-driven beans are different from stateless session enterprise
-beans (and other types of enterprise beans) in a couple of ways:<ul>
-<li>Message-driven beans process multiple JMS messages asynchronously, rather
-than processing a serialized sequence of method calls.</li>
-
-<li>Message-driven beans have no home or remote interface, and therefore cannot
-be directly accessed by internal or external clients.</li>
-
-</ul>
-</dd>
-
-</dl>
-</dd>
-
-
-<dt class="dlterm"><strong>Deployment descriptors</strong></dt>
-
-<dd> <p>A deployment descriptor contains configuration data that the runtime
-environment uses for an application. A deployment descriptor can include information
-about the following: </p>
-<ul>
-<li>The structure and content (enterprise beans, for example) of the application.</li>
-
-<li>References to internal and external dependencies. For example, an enterprise
-bean in an EJB module can require another enterprise bean that is not bundled
-in the same module.</li>
-
-<li>References to resource factory objects, such as URLs or JDBC data sources.</li>
-
-<li>Security roles that the container uses when implementing the required
-access control for the application.</li>
-
-<li>Transactional information about how (and whether) the container is to
-manage transactions for the application.</li>
-
-</ul>
-<p>Deployment descriptors are XML files packaged with the application's
-files in a Java archive file. An EJB deployment descriptor is called
-ejb-jar.xml and is located in the <strong>META-INF</strong> folder of an EJB project.
-A J2EE application contains one application-level deployment descriptor file,
-governing the application as a whole. It also contains several component-level
-deployment descriptors, one for each module in the application.</p>
-</dd>
-
-</dl>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tecrtpro.html">Creating EJB projects</a></strong><br />
-An EJB project is used to organize the resources contained in an EJB module.</li>
-<li class="ulchildlink"><strong><a href="../topics/ceclientjars.html">EJB 2.x client JAR projects</a></strong><br />
-An EJB client JAR project contains all the class files that a client program needs to use the client view of the enterprise beans that are contained in the EJB module.</li>
-<li class="ulchildlink"><strong><a href="../topics/teimp.html">Importing EJB 2.x JAR files</a></strong><br />
-You can import beans and other metadata from an EJB JAR file into a new or existing EJB project.</li>
-<li class="ulchildlink"><strong><a href="../topics/teexp.html">Exporting EJB 2.x projects to EJB JAR files</a></strong><br />
-After you have tested your enterprise beans, you can export the module into an EJB JAR file.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ceover.html" title="The workbench provides a specialized environment that you can use to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version specification. This product supports the Enterprise JavaBeans 1.1, 2.0, 2.1, and 3.0 specification levels.">EJB 2.x application development</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/cpojosandee5.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/cpojosandee5.dita
deleted file mode 100644
index 61e580d..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/cpojosandee5.dita
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cejb3" xml:lang="en-us">
-<title>Plain old <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> objects</title>
-<titlealts>
-<navtitle>POJOs (Plain old Java objects)</navtitle>
-<searchtitle>Plain old Java objects (POJOs) in Java EE 5 EJB 3.0 applications</searchtitle>
-</titlealts>
-<shortdesc>Although POJOs existed before, they play a more important role
-in the programming methodology of <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5. Now, you can now create EJB applications
-with persistence capabilities by using enterprise beans and entities created
-from POJOs.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Enterprise JavaBeans 3.0</indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<p>The complexity of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Enterprise Edition framework used
-to present a major hurdle for adoption previously. The <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 specification sought a simpler development experience by making POJOs the
-basis of its design paradigm. The POJO programming model enables you to unit
-test outside of the application server, making the whole programming experience
-smoother.</p>
-<example><title>A simple POJO</title><p>The following code is an example of
-a simple POJO. Note that there are no references to any interfaces. To use
-this POJO as the basis for an EJB 2.1 application requires additional framework
-classes to support it and the class itself would have to implement additional
-interfaces.</p><codeblock>public class Test {
-
- String name;
-
- /**
- * This is a constructor for a Test Object.
- **/
- public Test(){
-
- name = "Jane";
-
- }
-
-}</codeblock><p>To create an EJB 3.0 bean, inject a component defining annotation
-at the class level. The following example turns a POJO into a stateless session
-bean by adding the @Stateless annotation.</p><codeblock>@Stateless
-
-String class Test {
-
- String name;
-
- /**
- * This is a constructor for a Test Object.
- **/
- public Test () {
-
- name = "jane";
-
- }
-
-}</codeblock></example>
-<example>In a real application, the POJO needs additional business logic.
-The fundamental idea of using POJOs in the context of the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-specification is to associate Metadata about your component to be associated
-directly in your POJO. This approach reduces the number of artifacts you need
-to deal with and makes it easier to ensure the integrity of your Metadata.</example>
-<example>The new POJO-based programming model also shifts your concentration
-to working on your <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 components in your <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> editor
-as opposed to writing business logic in XML. By working with this application
-development software, you can take advantage of features that can even further
-simplify the process of developing <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 applications (such as as-you-type
-validation, content assist, and refactoring). </example>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/cpojosandee5.html b/docs/org.eclipse.jst.ejb.doc.user/topics/cpojosandee5.html
deleted file mode 100644
index 0b9d41d..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/cpojosandee5.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Plain old Java objects" />
-<meta name="abstract" content="Although POJOs existed before, they play a more important role in the programming methodology of Java EE 5. Now, you can now create EJB applications with persistence capabilities by using enterprise beans and entities created from POJOs." />
-<meta name="description" content="Although POJOs existed before, they play a more important role in the programming methodology of Java EE 5. Now, you can now create EJB applications with persistence capabilities by using enterprise beans and entities created from POJOs." />
-<meta content="Enterprise JavaBeans 3.0" name="DC.subject" />
-<meta content="Enterprise JavaBeans 3.0" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ejbarch.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cejb3" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Plain old Java objects (POJOs) in Java EE 5 EJB 3.0 applications</title>
-</head>
-<body id="cejb3"><a name="cejb3"><!-- --></a>
-
-
-<h1 class="topictitle1">Plain old Java objects</h1>
-
-
-
-
-<div><p>Although POJOs existed before, they play a more important role
-in the programming methodology of Java™ EE 5. Now, you can now create EJB applications
-with persistence capabilities by using enterprise beans and entities created
-from POJOs.</p>
-
-<p>The complexity of the Java 2 Enterprise Edition framework used
-to present a major hurdle for adoption previously. The Java EE
-5 specification sought a simpler development experience by making POJOs the
-basis of its design paradigm. The POJO programming model enables you to unit
-test outside of the application server, making the whole programming experience
-smoother.</p>
-
-<div class="example"><h4 class="sectiontitle">A simple POJO</h4><p>The following code is an example of
-a simple POJO. Note that there are no references to any interfaces. To use
-this POJO as the basis for an EJB 2.1 application requires additional framework
-classes to support it and the class itself would have to implement additional
-interfaces.</p>
-<pre>public class Test {
-
- String name;
-
- /**
- * This is a constructor for a Test Object.
- **/
- public Test(){
-
- name = "Jane";
-
- }
-
-}</pre>
-<p>To create an EJB 3.0 bean, inject a component defining annotation
-at the class level. The following example turns a POJO into a stateless session
-bean by adding the @Stateless annotation.</p>
-<pre>@Stateless
-
-String class Test {
-
- String name;
-
- /**
- * This is a constructor for a Test Object.
- **/
- public Test () {
-
- name = "jane";
-
- }
-
-}</pre>
-</div>
-
-<div class="example">In a real application, the POJO needs additional business logic.
-The fundamental idea of using POJOs in the context of the Java EE
-specification is to associate Metadata about your component to be associated
-directly in your POJO. This approach reduces the number of artifacts you need
-to deal with and makes it easier to ensure the integrity of your Metadata.</div>
-
-<div class="example">The new POJO-based programming model also shifts your concentration
-to working on your Java EE 5 components in your Java editor
-as opposed to writing business logic in XML. By working with this application
-development software, you can take advantage of features that can even further
-simplify the process of developing Java EE 5 applications (such as as-you-type
-validation, content assist, and refactoring). </div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ejbarch.html" title="This topic provides a high-level overview of the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version 3.0 architecture specification.">EJB 3.0 architecture</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/ejbarch.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/ejbarch.dita
deleted file mode 100644
index a76a1c3..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ejbarch.dita
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="ejbarch" xml:lang="en-us">
-<title>EJB 3.0 architecture</title>
-<shortdesc>This topic provides a high-level overview of the distributed component
-architecture defined in the Sun Microsystems Enterprise <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm> (EJB)
-version 3.0 architecture specification.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>architecture<indexterm>EJB 3.0</indexterm></indexterm>
-<indexterm>EJB 3.0<indexterm>architecture<indexterm>3.0</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p><b>Enterprise <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="JavaBeans">JavaBeans</tm></b> is a standard server-side component
-model for distributed business applications. The EJB specification is part
-of the <b><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> Platform Enterprise Edition</b>.</p>
-<p><b>EJB 3.0</b> makes it much easier to develop EJBs, using annotations
-rather than the complex deployment descriptors used in version 2.x. The use
-of home and remote interfaces and the <i>ejb-jar.xml</i> file are also no
-longer required in this release. They are replaced with a business interface
-and a bean class that implements the interface.</p>
-<p>For more information about EJB 3.0 specification go to the following Web
-site: <xref format="html" href="http://java.sun.com/products/ejb/docs.html#specs"
-scope="external">http://java.sun.com<desc></desc></xref> </p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/ejbarch.html b/docs/org.eclipse.jst.ejb.doc.user/topics/ejbarch.html
deleted file mode 100644
index 20a6ab9..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ejbarch.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="EJB 3.0 architecture" />
-<meta name="abstract" content="This topic provides a high-level overview of the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version 3.0 architecture specification." />
-<meta name="description" content="This topic provides a high-level overview of the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version 3.0 architecture specification." />
-<meta content="architecture, EJB 3.0, 3.0" name="DC.subject" />
-<meta content="architecture, EJB 3.0, 3.0" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceover.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cpojosandee5.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cejb3vejb21.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ejbarch" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>EJB 3.0 architecture</title>
-</head>
-<body id="ejbarch"><a name="ejbarch"><!-- --></a>
-
-
-<h1 class="topictitle1">EJB 3.0 architecture</h1>
-
-
-
-<div><p>This topic provides a high-level overview of the distributed component
-architecture defined in the Sun Microsystems Enterprise JavaBeans™ (EJB)
-version 3.0 architecture specification.</p>
-
-<p><strong>Enterprise JavaBeans</strong> is a standard server-side component
-model for distributed business applications. The EJB specification is part
-of the <strong>Java™ Platform Enterprise Edition</strong>.</p>
-
-<p><strong>EJB 3.0</strong> makes it much easier to develop EJBs, using annotations
-rather than the complex deployment descriptors used in version 2.x. The use
-of home and remote interfaces and the <em>ejb-jar.xml</em> file are also no
-longer required in this release. They are replaced with a business interface
-and a bean class that implements the interface.</p>
-
-<p>For more information about EJB 3.0 specification go to the following Web
-site: <a href="http://java.sun.com/products/ejb/docs.html#specs" target="_blank" title="">http://java.sun.com</a> </p>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cpojosandee5.html">Plain old Java objects</a></strong><br />
-Although POJOs existed before, they play a more important role in the programming methodology of Java EE 5. Now, you can now create EJB applications with persistence capabilities by using enterprise beans and entities created from POJOs.</li>
-<li class="ulchildlink"><strong><a href="../topics/cejb3vejb21.html">Differences between EJB 3.0 and EJB 2.1</a></strong><br />
-Compared to EJB 2.1, EJB 3.0 simplifies the process of creating Enterprise JavaBean applications.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ceover.html" title="The workbench provides a specialized environment that you can use to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version specification. This product supports the Enterprise JavaBeans 1.1, 2.0, 2.1, and 3.0 specification levels.">EJB 2.x application development</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/messb.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/messb.dita
deleted file mode 100644
index bc4b998..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/messb.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="messb" xml:lang="en-us">
-<title>Message-driven Beans</title>
-<shortdesc></shortdesc>
-<prolog><metadata>
-<keywords><indexterm>message-driven beans<indexterm>overview</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p>A <b>message-driven bean</b> is an enterprise bean that allows <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-applications to process messages asynchronously. It acts as a <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Message
-Service (JMS) message listener, which is similar to an event listener except
-that it receives messages instead of events. The messages may be sent by any <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-component - an application client, another enterprise bean, or a Web component
-- or by a JMS application or system that does not use <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-technology.</p>
-<p>In JMS, a message is a <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> object with two parts: a <b>header</b> and
-a <b>body</b>. The header is composed of delivery information and metadata.
-The message body carries the application data, which can take several forms:
-text, serializable objects, byte streams, etc. The JMS API defines several
-message types (<b>TextMessage, MapMessage, ObjectMessage</b>, and others)
-and provides methods for delivering messages to and receiving messages from
-other applications.</p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/messb.html b/docs/org.eclipse.jst.ejb.doc.user/topics/messb.html
deleted file mode 100644
index 7bdb70b..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/messb.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Message-driven Beans" />
-<meta name="abstract" content="" />
-<meta name="description" content="" />
-<meta content="message-driven beans, overview" name="DC.subject" />
-<meta content="message-driven beans, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/messbwiz.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="messb" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Message-driven Beans</title>
-</head>
-<body id="messb"><a name="messb"><!-- --></a>
-
-
-<h1 class="topictitle1">Message-driven Beans</h1>
-
-
-
-<div><p />
-
-<p>A <strong>message-driven bean</strong> is an enterprise bean that allows Java™ EE
-applications to process messages asynchronously. It acts as a Java Message
-Service (JMS) message listener, which is similar to an event listener except
-that it receives messages instead of events. The messages may be sent by any Java EE
-component - an application client, another enterprise bean, or a Web component
-- or by a JMS application or system that does not use Java EE
-technology.</p>
-
-<p>In JMS, a message is a Java object with two parts: a <strong>header</strong> and
-a <strong>body</strong>. The header is composed of delivery information and metadata.
-The message body carries the application data, which can take several forms:
-text, serializable objects, byte streams, etc. The JMS API defines several
-message types (<strong>TextMessage, MapMessage, ObjectMessage</strong>, and others)
-and provides methods for delivering messages to and receiving messages from
-other applications.</p>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/messbwiz.html" title="You can use a wizard to create a message-driven bean and add it to your project.">Creating Message-driven Beans</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/messbwiz.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/messbwiz.dita
deleted file mode 100644
index f076bea..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/messbwiz.dita
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="messbwiz" xml:lang="en-us">
-<title>Creating Message-driven Beans</title>
-<shortdesc>You can use a wizard to create a message-driven bean and add it
-to your project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>message-driven beans<indexterm>creating</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>The message-driven bean wizard helps you create an Enterprise
-message-driven bean by walking you through the creation process and by providing
-you with output files that you can use or that you can modify for use with
-your application.</p> <p>To create a message-driven bean, complete the following
-steps:</p></context>
-<steps>
-<step><cmd>From the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, expand your EJB project
-in the Project Explorer view.</cmd></step>
-<step><cmd>Right click on the <b>Message-Driven Bean</b> icon, and select <menucascade>
-<uicontrol>New</uicontrol><uicontrol>Message-Driven Bean</uicontrol></menucascade> from
-the pop-up menu.</cmd><stepresult> The <uicontrol>Create Message-Driven Bean</uicontrol> wizard
-appears.</stepresult></step>
-<step><cmd>Follow the project wizard prompts.</cmd></step>
-</steps>
-<postreq><p><b>General Information</b></p><dl><dlentry>
-<dt><b>Destination name</b></dt>
-<dd>This field provides the attribute <b>mappedName</b> to the <b>@MessageDriven</b> annotation.
-This attribute specifies the product-specific name to which the message-driven
-bean should be mapped. You can also use this attribute to specify the JNDI
-name of the destination from which the bean will consume messages.</dd>
-</dlentry></dl> <dl><dlentry>
-<dt><b>Destination type</b></dt>
-<dd>To send a JMS message, we need a connection to the JMS provider and a
-destination address for the message. A JMS connection factory makes the connection
-to the provider possible. In JMS, messages are not sent directly to applications;
-they are sent to topics or queues:<dl><dlentry>
-<dt>Queue:</dt>
-<dd>Queue is used as a destination for pointtopoint messaging. The <b>point-to-point</b>
-messaging model allows JMS clients to send and receive messages both synchronously
-and asynchronously via virtual channels known as <i>queues</i>. The p2p messaging
-model has traditionally been a pull- or polling-based model, where messages
-are requested from the queue instead of being pushed to the client automatically.
-A queue may have multiple receivers, but only one receiver may receive each
-message. Messages holding this queue are of <b>MapMessages</b> type, which
-stores the information about the email as name/value pair.</dd>
-</dlentry><dlentry>
-<dt>Topic:</dt>
-<dd>Topic is used as a destination for publish/subscribe messaging. In <b>publish-and-subscribe</b>
-messaging, one producer can send a message to many consumers through a virtual
-channel called a <i>topic</i>. Consumers can choose to subscribe to a topic.
-Any messages addressed to a topic are delivered to all the topic's consumers.
-Every consumer receives a copy of each message. The pub/sub messaging model
-is a push-based model, where messages are automatically broadcast to consumers
-without them having to request or poll the topic for new messages. In the
-pub/sub messaging model, the producer sending the message is not dependent
-on the consumers receiving the message. Optionally, JMS clients that use pub/sub
-can establish durable subscriptions that allow consumers to disconnect and
-later reconnect and collect messages that were published while they were disconnected.</dd>
-</dlentry></dl></dd>
-</dlentry></dl> <dl><dlentry>
-<dt><b>Transaction type</b></dt>
-<dd>The <b>Transaction type</b> field is used to specify whether the transaction
-is handled by the <b>Container</b> or the <b>Bean</b>.</dd>
-</dlentry></dl> <dl><dlentry>
-<dt><b>Interfaces</b></dt>
-<dd>Message-driven beans usually implement the <b>javax.jms.MessageListener</b>
-interface. A <i>MessageListener object</i> is used to receive asynchronously
-delivered messages. This interface defines the <b>onMessage()</b> method.
-This method processes the JMS messages received by a bean.</dd>
-</dlentry></dl></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/messbwiz.html b/docs/org.eclipse.jst.ejb.doc.user/topics/messbwiz.html
deleted file mode 100644
index a3571e3..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/messbwiz.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating Message-driven Beans" />
-<meta name="abstract" content="You can use a wizard to create a message-driven bean and add it to your project." />
-<meta name="description" content="You can use a wizard to create a message-driven bean and add it to your project." />
-<meta content="message-driven beans, creating" name="DC.subject" />
-<meta content="message-driven beans, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceover.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/messb.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="messbwiz" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating Message-driven Beans</title>
-</head>
-<body id="messbwiz"><a name="messbwiz"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating Message-driven Beans</h1>
-
-
-
-<div><p>You can use a wizard to create a message-driven bean and add it
-to your project.</p>
-
-<div class="section"><p>The message-driven bean wizard helps you create an Enterprise
-message-driven bean by walking you through the creation process and by providing
-you with output files that you can use or that you can modify for use with
-your application.</p>
- <p>To create a message-driven bean, complete the following
-steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>From the Java™ EE perspective, expand your EJB project
-in the Project Explorer view.</span></li>
-
-<li class="stepexpand"><span>Right click on the <strong>Message-Driven Bean</strong> icon, and select <span class="menucascade">
-<span class="uicontrol">New</span> > <span class="uicontrol">Message-Driven Bean</span></span> from
-the pop-up menu.</span> The <span class="uicontrol">Create Message-Driven Bean</span> wizard
-appears.</li>
-
-<li class="stepexpand"><span>Follow the project wizard prompts.</span></li>
-
-</ol>
-
-<div class="section"><p><strong>General Information</strong></p>
-<dl>
-<dt class="dlterm"><strong>Destination name</strong></dt>
-
-<dd>This field provides the attribute <strong>mappedName</strong> to the <strong>@MessageDriven</strong> annotation.
-This attribute specifies the product-specific name to which the message-driven
-bean should be mapped. You can also use this attribute to specify the JNDI
-name of the destination from which the bean will consume messages.</dd>
-
-</dl>
- <dl>
-<dt class="dlterm"><strong>Destination type</strong></dt>
-
-<dd>To send a JMS message, we need a connection to the JMS provider and a
-destination address for the message. A JMS connection factory makes the connection
-to the provider possible. In JMS, messages are not sent directly to applications;
-they are sent to topics or queues:<dl>
-<dt class="dlterm">Queue:</dt>
-
-<dd>Queue is used as a destination for pointtopoint messaging. The <strong>point-to-point</strong>
-messaging model allows JMS clients to send and receive messages both synchronously
-and asynchronously via virtual channels known as <em>queues</em>. The p2p messaging
-model has traditionally been a pull- or polling-based model, where messages
-are requested from the queue instead of being pushed to the client automatically.
-A queue may have multiple receivers, but only one receiver may receive each
-message. Messages holding this queue are of <strong>MapMessages</strong> type, which
-stores the information about the email as name/value pair.</dd>
-
-
-<dt class="dlterm">Topic:</dt>
-
-<dd>Topic is used as a destination for publish/subscribe messaging. In <strong>publish-and-subscribe</strong>
-messaging, one producer can send a message to many consumers through a virtual
-channel called a <em>topic</em>. Consumers can choose to subscribe to a topic.
-Any messages addressed to a topic are delivered to all the topic's consumers.
-Every consumer receives a copy of each message. The pub/sub messaging model
-is a push-based model, where messages are automatically broadcast to consumers
-without them having to request or poll the topic for new messages. In the
-pub/sub messaging model, the producer sending the message is not dependent
-on the consumers receiving the message. Optionally, JMS clients that use pub/sub
-can establish durable subscriptions that allow consumers to disconnect and
-later reconnect and collect messages that were published while they were disconnected.</dd>
-
-</dl>
-</dd>
-
-</dl>
- <dl>
-<dt class="dlterm"><strong>Transaction type</strong></dt>
-
-<dd>The <strong>Transaction type</strong> field is used to specify whether the transaction
-is handled by the <strong>Container</strong> or the <strong>Bean</strong>.</dd>
-
-</dl>
- <dl>
-<dt class="dlterm"><strong>Interfaces</strong></dt>
-
-<dd>Message-driven beans usually implement the <strong>javax.jms.MessageListener</strong>
-interface. A <em>MessageListener object</em> is used to receive asynchronously
-delivered messages. This interface defines the <strong>onMessage()</strong> method.
-This method processes the JMS messages received by a bean.</dd>
-
-</dl>
-</div>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/messb.html">Message-driven Beans</a></strong><br />
-</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ceover.html" title="The workbench provides a specialized environment that you can use to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version specification. This product supports the Enterprise JavaBeans 1.1, 2.0, 2.1, and 3.0 specification levels.">EJB 2.x application development</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/sessb.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/sessb.dita
deleted file mode 100644
index be31132..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/sessb.dita
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="sessb" xml:lang="en-us">
-<title>Session Beans</title>
-<shortdesc></shortdesc>
-<prolog><metadata>
-<keywords><indexterm>session beans<indexterm>overview</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p>A <b>session bean</b> is a type of enterprise bean. It is created by a
-client and usually exists only for the duration of a single client-server
-session.</p>
-<p>Session beans are useful for describing interactions between other beans
-(taskflow) and for implementing particular tasks. They do not represent data
-in the database, but they can access data, so we can use session beans to
-read, update, and insert data in a business process. Session beans access
-data that spans concepts, is not shared, and is usually read-only. Session
-beans contain business logic, and entities model persistent data. Session
-beans are divided in two types: stateless session beans and stateful session
-beans.</p>
-<ul>
-<li><b>Stateless session beans</b> <p>A stateless session bean is pooled by
-the container to handle multiple requests from multiple clients and does not
-maintain any conversational state.</p> </li>
-<li> <b>Stateful session beans</b> <p>A stateful session bean acts on behalf
-of a single client and maintains client-specific session information (called
-conversational state) across multiple method calls and transactions. It exists
-for the duration of a single client/server session.</p> </li>
-</ul>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/sessb.html b/docs/org.eclipse.jst.ejb.doc.user/topics/sessb.html
deleted file mode 100644
index 66ab952..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/sessb.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Session Beans" />
-<meta name="abstract" content="" />
-<meta name="description" content="" />
-<meta content="session beans, overview" name="DC.subject" />
-<meta content="session beans, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/sessbwiz.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="sessb" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Session Beans</title>
-</head>
-<body id="sessb"><a name="sessb"><!-- --></a>
-
-
-<h1 class="topictitle1">Session Beans</h1>
-
-
-
-<div><p />
-
-<p>A <strong>session bean</strong> is a type of enterprise bean. It is created by a
-client and usually exists only for the duration of a single client-server
-session.</p>
-
-<p>Session beans are useful for describing interactions between other beans
-(taskflow) and for implementing particular tasks. They do not represent data
-in the database, but they can access data, so we can use session beans to
-read, update, and insert data in a business process. Session beans access
-data that spans concepts, is not shared, and is usually read-only. Session
-beans contain business logic, and entities model persistent data. Session
-beans are divided in two types: stateless session beans and stateful session
-beans.</p>
-
-<ul>
-<li><strong>Stateless session beans</strong> <p>A stateless session bean is pooled by
-the container to handle multiple requests from multiple clients and does not
-maintain any conversational state.</p>
- </li>
-
-<li> <strong>Stateful session beans</strong> <p>A stateful session bean acts on behalf
-of a single client and maintains client-specific session information (called
-conversational state) across multiple method calls and transactions. It exists
-for the duration of a single client/server session.</p>
- </li>
-
-</ul>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/sessbwiz.html" title="You can use a wizard to create a session bean and add it to your project.">Creating EJB Session Beans</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/sessbwiz.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/sessbwiz.dita
deleted file mode 100644
index 0581a24..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/sessbwiz.dita
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="sessbwiz" xml:lang="en-us">
-<title>Creating EJB Session Beans</title>
-<shortdesc>You can use a wizard to create a session bean and add it to your
-project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>session beans</indexterm><indexterm>creating</indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>The session bean wizard helps you create an Enterprise session
-bean by walking you through the creation process and by providing you with
-output files that you can use or that you can modify for use with your application.</p> <p>To
-create a session bean, complete the following steps:</p></context>
-<steps>
-<step><cmd>From the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, expand your EJB project
-in the Project Explorer view.</cmd></step>
-<step><cmd>Right click on the <b>Session Bean</b> icon, and select <menucascade>
-<uicontrol>New</uicontrol><uicontrol>Session Bean</uicontrol></menucascade> from
-the pop-up menu.</cmd><stepresult> The <uicontrol>Create Session Bean</uicontrol> wizard
-appears.</stepresult></step>
-<step><cmd>Follow the project wizard prompts.</cmd></step>
-</steps>
-<postreq><p><b>General Information</b></p><dl><dlentry>
-<dt>State type</dt>
-<dd>A session beans are divided in two types: stateless session beans and
-stateful session beans.<dl><dlentry>
-<dt>Stateless session beans</dt>
-<dd>A stateless session bean is a collection of related services, each represented
-by a method; the bean maintains no state from one method invocation to the
-next. When you invoke a method on a stateless session bean, it executes the
-method and returns the result without knowing or caring what other requests
-have gone before or might follow. Stateless session beans have longer lives
-because they do not maintain any conversational state.</dd>
-</dlentry><dlentry>
-<dt>Stateful session beans</dt>
-<dd>A stateful session bean performs tasks on behalf of a client and maintains
-state related to that client. This state is called conversational state because
-it represents a continuing conversation between the stateful session bean
-and the client. Methods invoked on a stateful session bean can write and read
-data to and from this conversational state, which is shared among all methods
-in the bean. Stateful session beans have timeout periods.</dd>
-</dlentry></dl></dd>
-</dlentry></dl> <dl><dlentry>
-<dt>Business interface</dt>
-<dd>A business interface of a session bean is an ordinary <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> interface
-that contains the business methods for the bean. A reference to a session
-bean's business interface can be passed as a parameter or as a return value
-of a business interface method. It contains methods to initialize a session
-bean's state and to notify the EJB container when the reference is no more
-needed and can be removed. The business interfaces are two types:<dl><dlentry>
-<dt>Remote business interface:</dt>
-<dd>The client can run on a different machine or different <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> virtual
-machine than the enterprise bean it accesses and the location of the bean
-is transparent.</dd>
-</dlentry><dlentry>
-<dt>Local business interface:</dt>
-<dd>The client must run on the same <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> virtual machine as the bean it accesses
-and the location of the enterprise bean is not transparent.</dd>
-</dlentry></dl></dd>
-</dlentry></dl> <dl><dlentry>
-<dt>Mapped name</dt>
-<dd>Specifies the bean's global JNDI name. The use of mappedName attribute
-allows you to assign names which you can use to search the EJB bean through
-the remote client.</dd>
-</dlentry></dl> <dl><dlentry>
-<dt>Transaction type</dt>
-<dd>The <b>Transaction type</b> field is used to specify whether the transaction
-is handled by the <b>Container</b> or the <b>Bean</b>.</dd>
-</dlentry></dl> <dl><dlentry>
-<dt>Home and Components Interfaces</dt>
-<dd>Home and component interfaces are used only for EJB 2.x session beans.<dl>
-<dlentry>
-<dt>Home interface:</dt>
-<dd>The home interface allows a client to create, remove and find existing
-instances of enterprise beans.</dd>
-</dlentry><dlentry>
-<dt>Component interface:</dt>
-<dd>The component interface allows a client to access the business methods
-of the enterprise bean.</dd>
-</dlentry></dl></dd>
-</dlentry></dl></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/sessbwiz.html b/docs/org.eclipse.jst.ejb.doc.user/topics/sessbwiz.html
deleted file mode 100644
index fcb4d3a..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/sessbwiz.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating EJB Session Beans" />
-<meta name="abstract" content="You can use a wizard to create a session bean and add it to your project." />
-<meta name="description" content="You can use a wizard to create a session bean and add it to your project." />
-<meta content="session beans, creating" name="DC.subject" />
-<meta content="session beans, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceover.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/sessb.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="sessbwiz" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating EJB Session Beans</title>
-</head>
-<body id="sessbwiz"><a name="sessbwiz"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating EJB Session Beans</h1>
-
-
-
-<div><p>You can use a wizard to create a session bean and add it to your
-project.</p>
-
-<div class="section"><p>The session bean wizard helps you create an Enterprise session
-bean by walking you through the creation process and by providing you with
-output files that you can use or that you can modify for use with your application.</p>
- <p>To
-create a session bean, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>From the Java™ EE perspective, expand your EJB project
-in the Project Explorer view.</span></li>
-
-<li class="stepexpand"><span>Right click on the <strong>Session Bean</strong> icon, and select <span class="menucascade">
-<span class="uicontrol">New</span> > <span class="uicontrol">Session Bean</span></span> from
-the pop-up menu.</span> The <span class="uicontrol">Create Session Bean</span> wizard
-appears.</li>
-
-<li class="stepexpand"><span>Follow the project wizard prompts.</span></li>
-
-</ol>
-
-<div class="section"><p><strong>General Information</strong></p>
-<dl>
-<dt class="dlterm">State type</dt>
-
-<dd>A session beans are divided in two types: stateless session beans and
-stateful session beans.<dl>
-<dt class="dlterm">Stateless session beans</dt>
-
-<dd>A stateless session bean is a collection of related services, each represented
-by a method; the bean maintains no state from one method invocation to the
-next. When you invoke a method on a stateless session bean, it executes the
-method and returns the result without knowing or caring what other requests
-have gone before or might follow. Stateless session beans have longer lives
-because they do not maintain any conversational state.</dd>
-
-
-<dt class="dlterm">Stateful session beans</dt>
-
-<dd>A stateful session bean performs tasks on behalf of a client and maintains
-state related to that client. This state is called conversational state because
-it represents a continuing conversation between the stateful session bean
-and the client. Methods invoked on a stateful session bean can write and read
-data to and from this conversational state, which is shared among all methods
-in the bean. Stateful session beans have timeout periods.</dd>
-
-</dl>
-</dd>
-
-</dl>
- <dl>
-<dt class="dlterm">Business interface</dt>
-
-<dd>A business interface of a session bean is an ordinary Java interface
-that contains the business methods for the bean. A reference to a session
-bean's business interface can be passed as a parameter or as a return value
-of a business interface method. It contains methods to initialize a session
-bean's state and to notify the EJB container when the reference is no more
-needed and can be removed. The business interfaces are two types:<dl>
-<dt class="dlterm">Remote business interface:</dt>
-
-<dd>The client can run on a different machine or different Java virtual
-machine than the enterprise bean it accesses and the location of the bean
-is transparent.</dd>
-
-
-<dt class="dlterm">Local business interface:</dt>
-
-<dd>The client must run on the same Java virtual machine as the bean it accesses
-and the location of the enterprise bean is not transparent.</dd>
-
-</dl>
-</dd>
-
-</dl>
- <dl>
-<dt class="dlterm">Mapped name</dt>
-
-<dd>Specifies the bean's global JNDI name. The use of mappedName attribute
-allows you to assign names which you can use to search the EJB bean through
-the remote client.</dd>
-
-</dl>
- <dl>
-<dt class="dlterm">Transaction type</dt>
-
-<dd>The <strong>Transaction type</strong> field is used to specify whether the transaction
-is handled by the <strong>Container</strong> or the <strong>Bean</strong>.</dd>
-
-</dl>
- <dl>
-<dt class="dlterm">Home and Components Interfaces</dt>
-
-<dd>Home and component interfaces are used only for EJB 2.x session beans.<dl>
-
-<dt class="dlterm">Home interface:</dt>
-
-<dd>The home interface allows a client to create, remove and find existing
-instances of enterprise beans.</dd>
-
-
-<dt class="dlterm">Component interface:</dt>
-
-<dd>The component interface allows a client to access the business methods
-of the enterprise bean.</dd>
-
-</dl>
-</dd>
-
-</dl>
-</div>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/sessb.html">Session Beans</a></strong><br />
-</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ceover.html" title="The workbench provides a specialized environment that you can use to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version specification. This product supports the Enterprise JavaBeans 1.1, 2.0, 2.1, and 3.0 specification levels.">EJB 2.x application development</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingentitybeans3.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingentitybeans3.dita
deleted file mode 100644
index f1eb432..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingentitybeans3.dita
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tcreateejbproj" xml:lang="en-us">
-<title>Creating an EJB 3.0 entity bean</title>
-<shortdesc>You can use <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 annotations to create an entity
-bean and add it to your project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EJB 3.0<indexterm>entity bean<indexterm>creating</indexterm></indexterm></indexterm>
-<indexterm>Entity bean<indexterm>EJB 3.0<indexterm>creating</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<prereq>You need to have a <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> project or an EJB project created. </prereq>
-<context><p><b>To create an entity bean within your EJB project:</b></p></context>
-<steps>
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Class</uicontrol></menucascade>. The
-Create a New <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> Class wizard opens.</cmd></step>
-<step><cmd>In the <uicontrol>Source folder</uicontrol> field, select the source
-folder for the new bean.</cmd></step>
-<step><cmd>In the <uicontrol>Package</uicontrol> field, type the package name
-for the new bean.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> class editor, underneath the package declaration,
-type <userinput>@Entity</userinput>. You can see an error / quick fix icon <image
-href="../images/errorquickfix.gif" placement="inline"><alt>quick fix icon</alt>
-</image> beside the <userinput>@Entity</userinput> line. </cmd></step>
-<step><cmd>Right click the quick fix icon and select <uicontrol>Quick Fix</uicontrol>.
-The options to correct the problem display.</cmd></step>
-<step><cmd>Select <uicontrol>Import javax.persistence.Entity</uicontrol>,
-press CTRL+S to save, and the dependencies are added to your Java class.</cmd>
-</step>
-</steps>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingentitybeans3.html b/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingentitybeans3.html
deleted file mode 100644
index 2574d09..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingentitybeans3.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating an EJB 3.0 entity bean" />
-<meta name="abstract" content="You can use Java EE 5 annotations to create an entity bean and add it to your project." />
-<meta name="description" content="You can use Java EE 5 annotations to create an entity bean and add it to your project." />
-<meta content="EJB 3.0, entity bean, creating, Entity bean" name="DC.subject" />
-<meta content="EJB 3.0, entity bean, creating, Entity bean" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tecrtpro.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcreateejbproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating an EJB 3.0 entity bean</title>
-</head>
-<body id="tcreateejbproj"><a name="tcreateejbproj"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating an EJB 3.0 entity bean</h1>
-
-
-
-<div><p>You can use Java™ EE 5 annotations to create an entity
-bean and add it to your project.</p>
-
-<div class="p">You need to have a Java project or an EJB project created. </div>
-
-<div class="section"><p><strong>To create an entity bean within your EJB project:</strong></p>
-</div>
-
-<ol>
-<li><span>In the Java EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Class</span></span>. The
-Create a New Java Class wizard opens.</span></li>
-
-<li><span>In the <span class="uicontrol">Source folder</span> field, select the source
-folder for the new bean.</span></li>
-
-<li><span>In the <span class="uicontrol">Package</span> field, type the package name
-for the new bean.</span></li>
-
-<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-<li><span>In the Java class editor, underneath the package declaration,
-type <kbd class="userinput">@Entity</kbd>. You can see an error / quick fix icon <img src="../images/errorquickfix.gif" alt="quick fix icon" /> beside the <kbd class="userinput">@Entity</kbd> line. </span></li>
-
-<li><span>Right click the quick fix icon and select <span class="uicontrol">Quick Fix</span>.
-The options to correct the problem display.</span></li>
-
-<li><span>Select <span class="uicontrol">Import javax.persistence.Entity</span>,
-press CTRL+S to save, and the dependencies are added to your Java class.</span>
-</li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tecrtpro.html" title="An EJB project is used to organize the resources contained in an EJB module.">Creating EJB projects</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingsessbeans3.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingsessbeans3.dita
deleted file mode 100644
index 1a4dea2..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingsessbeans3.dita
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tsessbeanwiz" xml:lang="en-us">
-<title>Creating a, EJB 3.0 session bean using the wizard</title>
-<shortdesc>You can use the <uicontrol>Create Session Bean</uicontrol> wizard
-to create a session bean in your EJB project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EJB 3.0<indexterm>session bean<indexterm>creating</indexterm></indexterm></indexterm>
-<indexterm>Session bean<indexterm>EJB 3.0<indexterm>creating</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context>Here are the steps to create a session bean in an EJB project:</context>
-<steps>
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, right-click your EJB Project, and
-select <menucascade><uicontrol>File</uicontrol><uicontrol>New</uicontrol>
-<uicontrol>Session Bean</uicontrol></menucascade>. The Create Session Bean
-wizard appears.</cmd></step>
-<step><cmd>In the <uicontrol>Project</uicontrol> field, ensure that your EJB
-Project name appears.</cmd></step>
-<step><cmd>In the <uicontrol>Folder</uicontrol> field, select the source folder
-for the new bean.</cmd></step>
-<step><cmd>In the <uicontrol>Java package</uicontrol> field, type the package
-name for the new bean.</cmd></step>
-<step><cmd>In the <b>Class name</b> field, type the name that you want to
-assign to the session bean. By convention, bean names should begin with an
-uppercase letter.</cmd><info><note>You can use Unicode characters for the
-bean name, but Unicode characters are not supported for enterprise bean packages
-and classes associated with enterprise beans.</note></info></step>
-<step><cmd>In the <b>Superclass</b> field, <uicontrol>Browse</uicontrol> to
-find a Superclass to add to your Session bean.</cmd></step>
-<step><cmd>In the <b>State Type</b> field, select the type of Session bean
-you want to create. Valid options are</cmd><info><ul>
-<li>Stateless</li>
-<li>Stateful</li>
-</ul></info></step>
-<step><cmd><i>Optional</i>In the <uicontrol>Create Business Interface</uicontrol> field,
-select <uicontrol>Local</uicontrol> or <uicontrol>Remote</uicontrol> if you
-want to include these interfaces.</cmd></step>
-<step><cmd>Click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>On the Session Bean information page, you may change the values
-of some of the Session bean elements: </cmd><info><ul>
-<li><i>Optional</i>: In the <uicontrol>EJB Name</uicontrol> field, you can
-change the value of your EJB name that you assigned in the previous page.</li>
-<li><i>Optional</i>: In the <uicontrol>Mapped Name</uicontrol> field, type
-a value for your EJB Mappedname.</li>
-<li><i>Optional</i>: In the <uicontrol>Transaction Type</uicontrol> field,
-select the type of Session bean you want to create (Container or Bean).</li>
-<li><i>Optional</i>: In the <uicontrol>Business Interfaces</uicontrol> field,
-you can add or remove Business Interfaces that you created in the previous
-wizard page.</li>
-</ul></info></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> class editor, your new Session bean appears, with
-the @Stateless annotation and the required import statements.</cmd><info></info>
-</step>
-</steps>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingsessbeans3.html b/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingsessbeans3.html
deleted file mode 100644
index a319188..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatingsessbeans3.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a, EJB 3.0 session bean using the wizard" />
-<meta name="abstract" content="You can use the Create Session Bean wizard to create a session bean in your EJB project." />
-<meta name="description" content="You can use the Create Session Bean wizard to create a session bean in your EJB project." />
-<meta content="EJB 3.0, session bean, creating, Session bean" name="DC.subject" />
-<meta content="EJB 3.0, session bean, creating, Session bean" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tecrtpro.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsessbeanwiz" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a, EJB 3.0 session bean using the wizard</title>
-</head>
-<body id="tsessbeanwiz"><a name="tsessbeanwiz"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating a, EJB 3.0 session bean using the wizard</h1>
-
-
-
-<div><p>You can use the <span class="uicontrol">Create Session Bean</span> wizard
-to create a session bean in your EJB project.</p>
-
-<div class="section">Here are the steps to create a session bean in an EJB project:</div>
-
-<ol>
-<li class="stepexpand"><span>In the Java™ EE perspective, right-click your EJB Project, and
-select <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span>
- > <span class="uicontrol">Session Bean</span></span>. The Create Session Bean
-wizard appears.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project</span> field, ensure that your EJB
-Project name appears.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Folder</span> field, select the source folder
-for the new bean.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Java package</span> field, type the package
-name for the new bean.</span></li>
-
-<li class="stepexpand"><span>In the <strong>Class name</strong> field, type the name that you want to
-assign to the session bean. By convention, bean names should begin with an
-uppercase letter.</span> <div class="note"><span class="notetitle">Note:</span> You can use Unicode characters for the
-bean name, but Unicode characters are not supported for enterprise bean packages
-and classes associated with enterprise beans.</div>
-</li>
-
-<li class="stepexpand"><span>In the <strong>Superclass</strong> field, <span class="uicontrol">Browse</span> to
-find a Superclass to add to your Session bean.</span></li>
-
-<li class="stepexpand"><span>In the <strong>State Type</strong> field, select the type of Session bean
-you want to create. Valid options are</span> <ul>
-<li>Stateless</li>
-
-<li>Stateful</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span><em>Optional</em>In the <span class="uicontrol">Create Business Interface</span> field,
-select <span class="uicontrol">Local</span> or <span class="uicontrol">Remote</span> if you
-want to include these interfaces.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>On the Session Bean information page, you may change the values
-of some of the Session bean elements: </span> <ul>
-<li><em>Optional</em>: In the <span class="uicontrol">EJB Name</span> field, you can
-change the value of your EJB name that you assigned in the previous page.</li>
-
-<li><em>Optional</em>: In the <span class="uicontrol">Mapped Name</span> field, type
-a value for your EJB Mappedname.</li>
-
-<li><em>Optional</em>: In the <span class="uicontrol">Transaction Type</span> field,
-select the type of Session bean you want to create (Container or Bean).</li>
-
-<li><em>Optional</em>: In the <span class="uicontrol">Business Interfaces</span> field,
-you can add or remove Business Interfaces that you created in the previous
-wizard page.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-<li class="stepexpand"><span>In the Java class editor, your new Session bean appears, with
-the @Stateless annotation and the required import statements.</span>
-</li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tecrtpro.html" title="An EJB project is used to organize the resources contained in an EJB module.">Creating EJB projects</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatinmessbeans3.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatinmessbeans3.dita
deleted file mode 100644
index 8070a44..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatinmessbeans3.dita
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tcreatingsessionbean" xml:lang="en-us">
-<title>Creating a message-driven bean using the wizard</title>
-<shortdesc>You can use the <uicontrol>Create Message-Driven Bean</uicontrol> wizard
-to create a message-driven bean in your EJB project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EJB 3.0<indexterm>message-driven bean<indexterm>creating</indexterm></indexterm></indexterm>
-<indexterm>Message-driven bean<indexterm>EJB 3.0<indexterm>creating</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>The main difference between a message-driven bean and a session
-bean is that a message-driven bean has no local or remote interface. Instead,
-it has only a bean class. To create a message-driven bean within your EJB
-project, follow these steps:</p></context>
-<steps>
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, right-click your EJB Project, and
-select <menucascade><uicontrol>File</uicontrol><uicontrol>New</uicontrol>
-<uicontrol>Message-Driven Bean</uicontrol></menucascade>. The Create Message-Driven
-wizard appears.</cmd></step>
-<step><cmd>In the <uicontrol>Project</uicontrol> field, ensure that your EJB
-Project name appears.</cmd></step>
-<step><cmd>In the <uicontrol>Folder</uicontrol> field, select the source folder
-for the new bean.</cmd></step>
-<step><cmd>In the <uicontrol>Java package</uicontrol> field, type the package
-name for the new bean.</cmd></step>
-<step><cmd>In the <b>Class name</b> field, type the name that you want to
-assign to the session bean. By convention, bean names should begin with an
-uppercase letter.</cmd><info><note>You can use Unicode characters for the
-bean name, but Unicode characters are not supported for enterprise bean packages
-and classes associated with enterprise beans.</note></info></step>
-<step><cmd>In the <b>Superclass</b> field, <uicontrol>Browse</uicontrol> to
-find a Superclass to add to your Session bean.</cmd></step>
-<step><cmd>In the <uicontrol>Destination Name</uicontrol> field, type the
-name of your message destination.</cmd></step>
-<step><cmd>In the <uicontrol>JMS</uicontrol> field, Select JMS if you want
-to use Java Messaging Service, and in the <uicontrol>Destination Type</uicontrol> field,
-select the type of destination.</cmd><info><ul>
-<li>Queue</li>
-<li>Topic</li>
-</ul></info></step>
-<step><cmd>Click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>On the Message-Driven Bean information page, you may change the
-values of some of the Session bean elements: </cmd><info><ul>
-<li><i>Optional</i>: In the <uicontrol>EJB Name</uicontrol> field, you can
-change the value of your EJB name that you assigned in the previous page.</li>
-<li><i>Optional</i>: In the <uicontrol>Transaction Type</uicontrol> field,
-select the type of Session bean you want to create (Container or Bean).</li>
-<li><i>Optional</i>: In the <uicontrol>Interfaces</uicontrol> field, you can
-add or remove Business Interfaces that you created in the previous wizard
-page.</li>
-<li><i>Optional</i>: In the <uicontrol>Which method stubs would you like to
-create?</uicontrol> field, you can create one or both of these methods: <ul>
-<li>Inherited abstract methods</li>
-<li>Constructors from superclass</li>
-</ul></li>
-</ul></info></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> class editor, your new Message-driven bean appears,
-with the @MessageDriven annotation and the required import statements.</cmd>
-<info></info></step>
-</steps>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatinmessbeans3.html b/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatinmessbeans3.html
deleted file mode 100644
index 535bdef..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tcreatinmessbeans3.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a message-driven bean using the wizard" />
-<meta name="abstract" content="You can use the Create Message-Driven Bean wizard to create a message-driven bean in your EJB project." />
-<meta name="description" content="You can use the Create Message-Driven Bean wizard to create a message-driven bean in your EJB project." />
-<meta content="EJB 3.0, message-driven bean, creating, Message-driven bean" name="DC.subject" />
-<meta content="EJB 3.0, message-driven bean, creating, Message-driven bean" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tecrtpro.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcreatingsessionbean" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a message-driven bean using the wizard</title>
-</head>
-<body id="tcreatingsessionbean"><a name="tcreatingsessionbean"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating a message-driven bean using the wizard</h1>
-
-
-
-<div><p>You can use the <span class="uicontrol">Create Message-Driven Bean</span> wizard
-to create a message-driven bean in your EJB project.</p>
-
-<div class="section"><p>The main difference between a message-driven bean and a session
-bean is that a message-driven bean has no local or remote interface. Instead,
-it has only a bean class. To create a message-driven bean within your EJB
-project, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Java™ EE perspective, right-click your EJB Project, and
-select <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span>
- > <span class="uicontrol">Message-Driven Bean</span></span>. The Create Message-Driven
-wizard appears.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project</span> field, ensure that your EJB
-Project name appears.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Folder</span> field, select the source folder
-for the new bean.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Java package</span> field, type the package
-name for the new bean.</span></li>
-
-<li class="stepexpand"><span>In the <strong>Class name</strong> field, type the name that you want to
-assign to the session bean. By convention, bean names should begin with an
-uppercase letter.</span> <div class="note"><span class="notetitle">Note:</span> You can use Unicode characters for the
-bean name, but Unicode characters are not supported for enterprise bean packages
-and classes associated with enterprise beans.</div>
-</li>
-
-<li class="stepexpand"><span>In the <strong>Superclass</strong> field, <span class="uicontrol">Browse</span> to
-find a Superclass to add to your Session bean.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Destination Name</span> field, type the
-name of your message destination.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">JMS</span> field, Select JMS if you want
-to use Java Messaging Service, and in the <span class="uicontrol">Destination Type</span> field,
-select the type of destination.</span> <ul>
-<li>Queue</li>
-
-<li>Topic</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>On the Message-Driven Bean information page, you may change the
-values of some of the Session bean elements: </span> <ul>
-<li><em>Optional</em>: In the <span class="uicontrol">EJB Name</span> field, you can
-change the value of your EJB name that you assigned in the previous page.</li>
-
-<li><em>Optional</em>: In the <span class="uicontrol">Transaction Type</span> field,
-select the type of Session bean you want to create (Container or Bean).</li>
-
-<li><em>Optional</em>: In the <span class="uicontrol">Interfaces</span> field, you can
-add or remove Business Interfaces that you created in the previous wizard
-page.</li>
-
-<li><em>Optional</em>: In the <span class="uicontrol">Which method stubs would you like to
-create?</span> field, you can create one or both of these methods: <ul>
-<li>Inherited abstract methods</li>
-
-<li>Constructors from superclass</li>
-
-</ul>
-</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-<li class="stepexpand"><span>In the Java class editor, your new Message-driven bean appears,
-with the @MessageDriven annotation and the required import statements.</span>
- </li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tecrtpro.html" title="An EJB project is used to organize the resources contained in an EJB module.">Creating EJB projects</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tecrte.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/tecrte.dita
deleted file mode 100644
index 88b0260..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tecrte.dita
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tecrte" xml:lang="en-us">
-<title>Creating enterprise beans with XDoclet annotation support</title>
-<shortdesc>You can use a wizard to create session beans and message-driven
-beans that support XDoclet annotation.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EJB<indexterm>XDoclet annotation support</indexterm></indexterm>
-<indexterm>XDoclet annotation support<indexterm>EJBs</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<prereq><p>Before you can create an enterprise bean, you must:</p><ul>
-<li>Define an EJB project to contain the enterprise bean. See <xref href="tecrtpro.dita"></xref>.</li>
-<li>Install XDoclet annotation support and enable it. See <xref href="txdocletconf.dita"></xref>.</li>
-</ul></prereq>
-<context> <p> After you create an EJB project, you can add enterprise beans
-to the EJB project in one of the following ways: </p><ul>
-<li>Create new enterprise beans.</li>
-<li>Import enterprise beans from EJB JAR files.</li>
-</ul><p>A wizard helps you to create enterprise beans. You can use the Enterprise
-Bean Creation wizard to generate an enterprise bean while avoiding the complexities
-that exist between the different types of beans. The wizard helps you add
-enterprise beans to you project by creating entirely new enterprise beans.</p><p>With
-the wizard, you can create three types of enterprise beans: session beans
-and message-driven beans (EJB 2.0 or later projects only): </p><ul>
-<li>Create a session bean. For more information, see <xref href="tesessb.dita"></xref>.</li>
-<li>Create a CMP entity bean. For more information, see <xref href="teentityb.dita"></xref>.</li>
-<li>Create a message-driven bean. For more information, see <xref href="temessb.dita"></xref>.</li>
-</ul></context>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tecrte.html b/docs/org.eclipse.jst.ejb.doc.user/topics/tecrte.html
deleted file mode 100644
index 873f940..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tecrte.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating enterprise beans with XDoclet annotation support" />
-<meta name="abstract" content="You can use a wizard to create session beans and message-driven beans that support XDoclet annotation." />
-<meta name="description" content="You can use a wizard to create session beans and message-driven beans that support XDoclet annotation." />
-<meta content="EJB, XDoclet annotation support, EJBs" name="DC.subject" />
-<meta content="EJB, XDoclet annotation support, EJBs" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceover.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tesessb.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/teentityb.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/temessb.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txdocletconf.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tecrte" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating enterprise beans with XDoclet annotation support</title>
-</head>
-<body id="tecrte"><a name="tecrte"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating enterprise beans with XDoclet annotation support</h1>
-
-
-
-<div><p>You can use a wizard to create session beans and message-driven
-beans that support XDoclet annotation.</p>
-
-<div class="p"><p>Before you can create an enterprise bean, you must:</p>
-<ul>
-<li>Define an EJB project to contain the enterprise bean. See <a href="tecrtpro.html" title="An EJB project is used to organize the resources contained in an EJB module.">Creating EJB projects</a>.</li>
-
-<li>Install XDoclet annotation support and enable it. See <a href="txdocletconf.html" title="To use XDoclet annotation support, or to create enterprise beans, XDoclet must be installed on your system and configured to work with the workbench. ">Configuring XDoclet annotation support</a>.</li>
-
-</ul>
-</div>
-
-<div class="section"> <p> After you create an EJB project, you can add enterprise beans
-to the EJB project in one of the following ways: </p>
-<ul>
-<li>Create new enterprise beans.</li>
-
-<li>Import enterprise beans from EJB JAR files.</li>
-
-</ul>
-<p>A wizard helps you to create enterprise beans. You can use the Enterprise
-Bean Creation wizard to generate an enterprise bean while avoiding the complexities
-that exist between the different types of beans. The wizard helps you add
-enterprise beans to you project by creating entirely new enterprise beans.</p>
-<p>With
-the wizard, you can create three types of enterprise beans: session beans
-and message-driven beans (EJB 2.0 or later projects only): </p>
-<ul>
-<li>Create a session bean. For more information, see <a href="tesessb.html" title="You can use a wizard to create a session bean and add it to your project.">Creating session beans with XDoclet annotation support</a>.</li>
-
-<li>Create a CMP entity bean. For more information, see <a href="teentityb.html" title="You can use a wizard to create a CMP entity bean and add it to your project.">Creating container-managed persistence (CMP) entity beans with XDoclet annotation support</a>.</li>
-
-<li>Create a message-driven bean. For more information, see <a href="temessb.html" title="You can use a wizard to create a message-driven bean and add it to your project.">Creating message-driven beans with XDoclet annotation support</a>.</li>
-
-</ul>
-</div>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tesessb.html">Creating session beans with XDoclet annotation support</a></strong><br />
-You can use a wizard to create a session bean and add it to your project.</li>
-<li class="ulchildlink"><strong><a href="../topics/teentityb.html">Creating container-managed persistence (CMP) entity beans with XDoclet annotation support</a></strong><br />
-You can use a wizard to create a CMP entity bean and add it to your project.</li>
-<li class="ulchildlink"><strong><a href="../topics/temessb.html">Creating message-driven beans with XDoclet annotation support</a></strong><br />
-You can use a wizard to create a message-driven bean and add it to your project.</li>
-<li class="ulchildlink"><strong><a href="../topics/txdocletconf.html">Configuring XDoclet annotation support</a></strong><br />
-To use XDoclet annotation support, or to create enterprise beans, XDoclet must be installed on your system and configured to work with the workbench.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ceover.html" title="The workbench provides a specialized environment that you can use to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) version specification. This product supports the Enterprise JavaBeans 1.1, 2.0, 2.1, and 3.0 specification levels.">EJB 2.x application development</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tecrtpro.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/tecrtpro.dita
deleted file mode 100644
index 2fa09e6..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tecrtpro.dita
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tecrtpro" xml:lang="en-us">
-<title>Creating EJB projects</title>
-<shortdesc>An EJB project is used to organize the resources contained in an
-EJB module.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EJB<indexterm>projects<indexterm>creating</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>An EJB module is used to assemble one or more enterprise beans
-into a single deployable unit. It is deployed in a standard <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> archive
-(JAR) file. An EJB module can be used as a standalone application, or it can
-be combined with other modules to create a Java EE enterprise application.
-An EJB module is installed and run in an enterprise bean container. An EJB
-project must be referenced by an enterprise application project (defined as
-a module in an EAR) in order to be deployed successfully and run on a server.</p><p>An
-EJB module contains the following:</p><ul>
-<li>One or more deployable enterprise beans.</li>
-<li>A deployment descriptor, stored in an Extensible Markup Language (XML)
-file. This file declares the contents of the module, defines the structure
-and external dependencies of the beans in the module, and describes how the
-enterprise beans are to be used at run time.</li>
-</ul><p>To create a new EJB project, complete the following steps:</p></context>
-<steps>
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, select <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Other</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>EJB</uicontrol>
-<uicontrol>EJB Project</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Project Name</uicontrol> field, type a name for
-the EJB project.</cmd></step>
-<step importance="optional"><cmd>To use a different workspace directory for
-your EJB project, modify the settings for <uicontrol>Project contents.</uicontrol> </cmd>
-<info><note type="note">If you specify a non-default project location that
-is already being used by another project, the project creation will fail.</note></info>
-</step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> drop-down list, select
-the application server that you want to target for your development. This
-selection affects the compilation and runtime settings by modifying the class
-path entries for the project. Use the <uicontrol>New</uicontrol> button if
-a target runtime does not exist, or if you want to use a different one.</cmd>
-</step>
-<step><cmd>In the <uicontrol>EJB Module version</uicontrol> field, select
-the correct version level for the project.</cmd></step>
-<step><cmd>Select a pre-defined project configuration from the <uicontrol>Configurations</uicontrol> drop-down
-list, or modify the configuration to customize the project facets. You can
-select the Java version, support for XDoclet, and support for Java persistence
-when customizing your configuration.</cmd><info><p>For example, if you are
-creating an Entity Bean, select the <uicontrol>Java Persistence</uicontrol> facet.
-You can save your configuration with a meaningful name so that you can reference
-this configuration in any EJB projects that are subsequently created.</p></info>
-</step>
-<step importance="optional"><cmd>Select the <uicontrol>Add project to an EAR </uicontrol> check
-box to add the new module to an enterprise application (EAR) project.</cmd>
-<info>Type a new project name or select an existing enterprise application
-project from the drop-down list in the <uicontrol>EAR Project</uicontrol> combination
-box. Or, click the <uicontrol>New</uicontrol> button to launch the New Enterprise
-Application Project wizard. Click <uicontrol>Next</uicontrol>.<note>If you
-type a new EAR project name, the EAR project will be created in the default
-location with the lowest compatible Java EE version based on the version of
-the project being created. If you want to specify a different version or a
-different location for the enterprise application, click <uicontrol>New</uicontrol> to
-use the New Enterprise Application Project wizard.</note></info></step>
-<step importance="optional"><cmd>Change the value of <uicontrol>Source Folder</uicontrol> to
-change the directory where the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> source files are stored. </cmd></step>
-<step importance="optional"><cmd>Select the <uicontrol>Create an EJB Client
-JAR Project to hold the client interfaces and classes</uicontrol> check box
-if you want the client interface classes for your enterprise beans to be kept
-in a separate EJB client JAR file. This EJB client JAR file will be added
-to the enterprise application as a project utility JAR file. You can also
-modify the <uicontrol>Name</uicontrol> of the EJB Client JAR project, or the
-name (<uicontrol>Client JAR URI</uicontrol>) of the client JAR file. </cmd>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><note>The New Project Wizard will automatically
-add default facets to your project. You can change these facets or add new
-ones in the <uicontrol>Preferences</uicontrol> window. For more information,
-see <xref href="../../org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita"
-scope="peer">Adding a facet to a Java EE project</xref>.</note><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html b/docs/org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html
deleted file mode 100644
index efb61ed..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating EJB projects" />
-<meta name="abstract" content="An EJB project is used to organize the resources contained in an EJB module." />
-<meta name="description" content="An EJB project is used to organize the resources contained in an EJB module." />
-<meta content="EJB, projects, creating" name="DC.subject" />
-<meta content="EJB, projects, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cejb3.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcreatingentitybeans3.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcreatingsessbeans3.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcreatinmessbeans3.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceresrc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tecrtpro" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating EJB projects</title>
-</head>
-<body id="tecrtpro"><a name="tecrtpro"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating EJB projects</h1>
-
-
-
-<div><p>An EJB project is used to organize the resources contained in an
-EJB module.</p>
-
-<div class="section"><p>An EJB module is used to assemble one or more enterprise beans
-into a single deployable unit. It is deployed in a standard Java™ archive
-(JAR) file. An EJB module can be used as a standalone application, or it can
-be combined with other modules to create a Java EE enterprise application.
-An EJB module is installed and run in an enterprise bean container. An EJB
-project must be referenced by an enterprise application project (defined as
-a module in an EAR) in order to be deployed successfully and run on a server.</p>
-<p>An
-EJB module contains the following:</p>
-<ul>
-<li>One or more deployable enterprise beans.</li>
-
-<li>A deployment descriptor, stored in an Extensible Markup Language (XML)
-file. This file declares the contents of the module, defines the structure
-and external dependencies of the beans in the module, and describes how the
-enterprise beans are to be used at run time.</li>
-
-</ul>
-<p>To create a new EJB project, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Java EE perspective, select <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">EJB</span>
- > <span class="uicontrol">EJB Project</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project Name</span> field, type a name for
-the EJB project.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To use a different workspace directory for
-your EJB project, modify the settings for <span class="uicontrol">Project contents.</span> </span>
- <div class="note"><span class="notetitle">Note:</span> If you specify a non-default project location that
-is already being used by another project, the project creation will fail.</div>
-
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> drop-down list, select
-the application server that you want to target for your development. This
-selection affects the compilation and runtime settings by modifying the class
-path entries for the project. Use the <span class="uicontrol">New</span> button if
-a target runtime does not exist, or if you want to use a different one.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">EJB Module version</span> field, select
-the correct version level for the project.</span></li>
-
-<li class="stepexpand"><span>Select a pre-defined project configuration from the <span class="uicontrol">Configurations</span> drop-down
-list, or modify the configuration to customize the project facets. You can
-select the Java version, support for XDoclet, and support for Java persistence
-when customizing your configuration.</span> <p>For example, if you are
-creating an Entity Bean, select the <span class="uicontrol">Java Persistence</span> facet.
-You can save your configuration with a meaningful name so that you can reference
-this configuration in any EJB projects that are subsequently created.</p>
-
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <span class="uicontrol">Add project to an EAR </span> check
-box to add the new module to an enterprise application (EAR) project.</span>
- Type a new project name or select an existing enterprise application
-project from the drop-down list in the <span class="uicontrol">EAR Project</span> combination
-box. Or, click the <span class="uicontrol">New</span> button to launch the New Enterprise
-Application Project wizard. Click <span class="uicontrol">Next</span>.<div class="note"><span class="notetitle">Note:</span> If you
-type a new EAR project name, the EAR project will be created in the default
-location with the lowest compatible Java EE version based on the version of
-the project being created. If you want to specify a different version or a
-different location for the enterprise application, click <span class="uicontrol">New</span> to
-use the New Enterprise Application Project wizard.</div>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Change the value of <span class="uicontrol">Source Folder</span> to
-change the directory where the Java source files are stored. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <span class="uicontrol">Create an EJB Client
-JAR Project to hold the client interfaces and classes</span> check box
-if you want the client interface classes for your enterprise beans to be kept
-in a separate EJB client JAR file. This EJB client JAR file will be added
-to the enterprise application as a project utility JAR file. You can also
-modify the <span class="uicontrol">Name</span> of the EJB Client JAR project, or the
-name (<span class="uicontrol">Client JAR URI</span>) of the client JAR file. </span>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><div class="note"><span class="notetitle">Note:</span> The New Project Wizard will automatically
-add default facets to your project. You can change these facets or add new
-ones in the <span class="uicontrol">Preferences</span> window. For more information,
-see <a href="../../org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html">Adding a facet to a Java EE project</a>.</div>
-<p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tcreatingentitybeans3.html">Creating an EJB 3.0 entity bean</a></strong><br />
-You can use Java EE 5 annotations to create an entity bean and add it to your project.</li>
-<li class="ulchildlink"><strong><a href="../topics/tcreatingsessbeans3.html">Creating a, EJB 3.0 session bean using the wizard</a></strong><br />
-You can use the Create Session Bean wizard to create a session bean in your EJB project.</li>
-<li class="ulchildlink"><strong><a href="../topics/tcreatinmessbeans3.html">Creating a message-driven bean using the wizard</a></strong><br />
-You can use the Create Message-Driven Bean wizard to create a message-driven bean in your EJB project.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cejb3.html" title="You can use the workbench to develop and test enterprise beans that conform to the distributed component architecture defined in the Sun Microsystems Enterprise JavaBeans (EJB) 3.0 specification.">Developing EJB 3.0 Applications</a></div>
-</div>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ceresrc.html" title="This topic describes resources and development tools that are commonly used in EJB version 2.x development.">EJB 2.x development resources</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/teentityb.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/teentityb.dita
deleted file mode 100644
index 2c9d7fe..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/teentityb.dita
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="temessb" xml:lang="en-us">
-<title>Creating container-managed persistence (CMP) entity beans with XDoclet
-annotation support</title>
-<shortdesc>You can use a wizard to create a CMP entity bean and add it to
-your project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>CMP entity beans<indexterm>XDoclet annotation support</indexterm></indexterm>
-<indexterm>XDoclet annotation support<indexterm>entity beans</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<prereq><p>Before you can create an enterprise bean, you must:</p><ul>
-<li>Define an EJB project to contain the enterprise bean. See <xref href="tecrtpro.dita"></xref>.</li>
-<li>Install XDoclet annotation support and enable it. See <xref href="txdocletconf.dita"></xref>.</li>
-</ul></prereq>
-<context><p>To create a CMP entity bean, complete the following steps:</p></context>
-<steps>
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Other</uicontrol></menucascade>. Select <menucascade>
-<uicontrol>EJB</uicontrol><uicontrol>XDoclet Enterprise JavaBean</uicontrol>
-</menucascade> and click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>Select <uicontrol>Container Managed Entity Bean</uicontrol> and
-click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Project</uicontrol> that will contain the
-new bean. </cmd></step>
-<step><cmd>In the <uicontrol>Folder</uicontrol> field, select the folder for
-the new bean. </cmd></step>
-<step><cmd>In the <uicontrol>Java package</uicontrol> field, enter the package
-name for the new bean. </cmd></step>
-<step><cmd>In the <uicontrol>Class name</uicontrol> field, type a name for
-the enterprise bean. By convention, bean names should begin with an uppercase
-letter. </cmd><info><note>You can use Unicode characters for the bean name,
-but Unicode characters are not supported for enterprise bean packages and
-classes associated with enterprise beans.</note></info></step>
-<step importance="optional"><cmd>Change the <uicontrol>Superclass</uicontrol> for
-the bean if you want it to inherit from a class other than <codeph>java.lang.Object</codeph> and
-click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>Provide an <uicontrol>EJB Name</uicontrol> for the bean. This is
-the name of the enterprise bean class. </cmd></step>
-<step><cmd>Provide a <uicontrol>Schema</uicontrol> name to specify the abstract
-schema of the bean.</cmd></step>
-<step><cmd>Provide a <uicontrol>Display Name</uicontrol> for the bean. This
-is a short name for the enterprise bean that is used by tools.</cmd></step>
-<step><cmd>Provide a text <uicontrol>Description</uicontrol> for the bean.</cmd>
-</step>
-<step><cmd>Select a <uicontrol>CMP Version</uicontrol> for the new bean:</cmd>
-<choices>
-<choice><uicontrol>1.x</uicontrol> specifies you are adding the bean to an
-EJB 1.0 or later project.</choice>
-<choice><uicontrol>2.x</uicontrol> specifies you are adding the bean to an
-EJB 2.0 or later project.</choice>
-</choices>
-</step>
-<step><cmd>Select a <uicontrol>Usecase</uicontrol> for the new bean:</cmd>
-<choices>
-<choice><uicontrol>Import attributes from table</uicontrol> specifies that
-the CMP entity bean attributes will be imported from a database table. Click <uicontrol>Next</uicontrol> and
-do one of the following:<ul>
-<li>To select an available connection definition, click a connection in the <uicontrol>Available
-Connection Definitions</uicontrol> list. Click <uicontrol>Next</uicontrol>.</li>
-<li>To create a new JDBC connection definition, click <uicontrol>New</uicontrol> and
-complete the following steps: <ol>
-<li>Select a database manager in the Connection Profile Type window and click <uicontrol>Next</uicontrol>.</li>
-<li>Enter a name and description for the new connection definition and click <uicontrol>Next</uicontrol>.</li>
-<li>Select a JDBC driver from the drop-down menu or click the <uicontrol>...</uicontrol> button
-to add, edit, or remove driver definitions.</li>
-<li>Specify the other connection details in this window, test the connection,
-and click <uicontrol>Finish</uicontrol> and then click <uicontrol>Next</uicontrol>.</li>
-</ol></li>
-</ul></choice>
-<choice><uicontrol>Define new attributes</uicontrol> specifies that the CMP
-entity bean attributes will be user-defined. Click <uicontrol>Next</uicontrol> and
-complete the following steps:<ol>
-<li>To specify a table name for the entity bean, enter a name in the <uicontrol>Table</uicontrol> field.</li>
-<li>To create a CMP attribute for the entity bean, click <uicontrol>Add</uicontrol>.</li>
-<li>To specify a name for the attribute, click in the <uicontrol>Name</uicontrol> field
-and enter a name.</li>
-<li>To specify a type for the attribute, click in the <uicontrol>Type</uicontrol> field
-and enter a type.</li>
-<li>To make the attribute a key field for the entity bean, select the <uicontrol>Primary
-Key</uicontrol> check box.</li>
-<li importance="optional">To add more attributes, repeat procedures b to e
-and click <uicontrol>Next</uicontrol>.</li>
-</ol></choice>
-</choices>
-</step>
-<step><cmd>Select the type of <uicontrol>Modifiers</uicontrol> to use for
-the class.</cmd></step>
-<step importance="optional"><cmd>Select the <b>Interfaces</b> you want the
-bean to implement. Click <uicontrol>Add</uicontrol> to select interfaces that
-you want to implement and click <uicontrol>Remove</uicontrol> to take away
-interfaces that you no longer want to implement.</cmd></step>
-<step><cmd>Select the method stubs that you want the wizard to create.</cmd>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to add the new bean to the
-specified EJB project.</cmd></step>
-</steps>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/teentityb.html b/docs/org.eclipse.jst.ejb.doc.user/topics/teentityb.html
deleted file mode 100644
index e7d7629..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/teentityb.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating container-managed persistence (CMP) entity beans with XDoclet annotation support" />
-<meta name="abstract" content="You can use a wizard to create a CMP entity bean and add it to your project." />
-<meta name="description" content="You can use a wizard to create a CMP entity bean and add it to your project." />
-<meta content="CMP entity beans, XDoclet annotation support, entity beans" name="DC.subject" />
-<meta content="CMP entity beans, XDoclet annotation support, entity beans" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tecrte.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="temessb" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating container-managed persistence (CMP) entity beans with XDoclet
-annotation support</title>
-</head>
-<body id="temessb"><a name="temessb"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating container-managed persistence (CMP) entity beans with XDoclet
-annotation support</h1>
-
-
-
-<div><p>You can use a wizard to create a CMP entity bean and add it to
-your project.</p>
-
-<div class="p"><p>Before you can create an enterprise bean, you must:</p>
-<ul>
-<li>Define an EJB project to contain the enterprise bean. See <a href="tecrtpro.html" title="An EJB project is used to organize the resources contained in an EJB module.">Creating EJB projects</a>.</li>
-
-<li>Install XDoclet annotation support and enable it. See <a href="txdocletconf.html" title="To use XDoclet annotation support, or to create enterprise beans, XDoclet must be installed on your system and configured to work with the workbench. ">Configuring XDoclet annotation support</a>.</li>
-
-</ul>
-</div>
-
-<div class="section"><p>To create a CMP entity bean, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span></span>. Select <span class="menucascade">
-<span class="uicontrol">EJB</span> > <span class="uicontrol">XDoclet Enterprise JavaBean</span>
-</span> and click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">Container Managed Entity Bean</span> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project</span> that will contain the
-new bean. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Folder</span> field, select the folder for
-the new bean. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Java package</span> field, enter the package
-name for the new bean. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Class name</span> field, type a name for
-the enterprise bean. By convention, bean names should begin with an uppercase
-letter. </span> <div class="note"><span class="notetitle">Note:</span> You can use Unicode characters for the bean name,
-but Unicode characters are not supported for enterprise bean packages and
-classes associated with enterprise beans.</div>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Change the <span class="uicontrol">Superclass</span> for
-the bean if you want it to inherit from a class other than <samp class="codeph">java.lang.Object</samp> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>Provide an <span class="uicontrol">EJB Name</span> for the bean. This is
-the name of the enterprise bean class. </span></li>
-
-<li class="stepexpand"><span>Provide a <span class="uicontrol">Schema</span> name to specify the abstract
-schema of the bean.</span></li>
-
-<li class="stepexpand"><span>Provide a <span class="uicontrol">Display Name</span> for the bean. This
-is a short name for the enterprise bean that is used by tools.</span></li>
-
-<li class="stepexpand"><span>Provide a text <span class="uicontrol">Description</span> for the bean.</span>
-</li>
-
-<li class="stepexpand"><span>Select a <span class="uicontrol">CMP Version</span> for the new bean:</span>
-<ul>
-<li><span class="uicontrol">1.x</span> specifies you are adding the bean to an
-EJB 1.0 or later project.</li>
-
-<li><span class="uicontrol">2.x</span> specifies you are adding the bean to an
-EJB 2.0 or later project.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>Select a <span class="uicontrol">Usecase</span> for the new bean:</span>
-<ul>
-<li><span class="uicontrol">Import attributes from table</span> specifies that
-the CMP entity bean attributes will be imported from a database table. Click <span class="uicontrol">Next</span> and
-do one of the following:<ul>
-<li>To select an available connection definition, click a connection in the <span class="uicontrol">Available
-Connection Definitions</span> list. Click <span class="uicontrol">Next</span>.</li>
-
-<li>To create a new JDBC connection definition, click <span class="uicontrol">New</span> and
-complete the following steps: <ol type="a">
-<li>Select a database manager in the Connection Profile Type window and click <span class="uicontrol">Next</span>.</li>
-
-<li>Enter a name and description for the new connection definition and click <span class="uicontrol">Next</span>.</li>
-
-<li>Select a JDBC driver from the drop-down menu or click the <span class="uicontrol">...</span> button
-to add, edit, or remove driver definitions.</li>
-
-<li>Specify the other connection details in this window, test the connection,
-and click <span class="uicontrol">Finish</span> and then click <span class="uicontrol">Next</span>.</li>
-
-</ol>
-</li>
-
-</ul>
-</li>
-
-<li><span class="uicontrol">Define new attributes</span> specifies that the CMP
-entity bean attributes will be user-defined. Click <span class="uicontrol">Next</span> and
-complete the following steps:<ol type="a">
-<li>To specify a table name for the entity bean, enter a name in the <span class="uicontrol">Table</span> field.</li>
-
-<li>To create a CMP attribute for the entity bean, click <span class="uicontrol">Add</span>.</li>
-
-<li>To specify a name for the attribute, click in the <span class="uicontrol">Name</span> field
-and enter a name.</li>
-
-<li>To specify a type for the attribute, click in the <span class="uicontrol">Type</span> field
-and enter a type.</li>
-
-<li>To make the attribute a key field for the entity bean, select the <span class="uicontrol">Primary
-Key</span> check box.</li>
-
-<li>To add more attributes, repeat procedures b to e
-and click <span class="uicontrol">Next</span>.</li>
-
-</ol>
-</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>Select the type of <span class="uicontrol">Modifiers</span> to use for
-the class.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <strong>Interfaces</strong> you want the
-bean to implement. Click <span class="uicontrol">Add</span> to select interfaces that
-you want to implement and click <span class="uicontrol">Remove</span> to take away
-interfaces that you no longer want to implement.</span></li>
-
-<li class="stepexpand"><span>Select the method stubs that you want the wizard to create.</span>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to add the new bean to the
-specified EJB project.</span></li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tecrte.html" title="You can use a wizard to create session beans and message-driven beans that support XDoclet annotation.">Creating enterprise beans with XDoclet annotation support</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/teexp.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/teexp.dita
deleted file mode 100644
index 7440027..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/teexp.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="teexp" xml:lang="en-us">
-<title>Exporting EJB 2.x projects to EJB JAR files</title>
-<shortdesc>After you have tested your enterprise beans, you can export the
-module into an EJB JAR file.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EJB<indexterm>JAR files<indexterm>exporting projects</indexterm></indexterm></indexterm>
-<indexterm>EJB<indexterm>exporting projects</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<context><p>When you export an EJB project, the contents of the project are
-exported into an EJB JAR file regardless of whether deployment code has been
-generated or not. You can use the exported server-side JAR file as the client
-JAR file, since it contains all of the required code from both a server-side
-and client-side perspective.</p><note id="exportEJBClientJAR" type="important">If
-you use the Export EJB JAR file wizard to export an EJB project, the export
-wizard does not include an EJB project's associated EJB client JAR project.
-To include the EJB client JAR file, it is recommended that you export the
-enterprise application EAR file that contains the EJB project. The resulting
-EAR file will include any dependent EJB client JAR files as utility JAR files.
-Alternatively, you can export the EJB client JAR project separately as a JAR
-file.</note><p>To export an EJB project, complete the following steps:</p></context>
-<steps>
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, right-click the EJB
-project that you want to export and select <menucascade><uicontrol>Export</uicontrol>
-<uicontrol>EJB JAR File</uicontrol></menucascade>.</cmd></step>
-<step><cmd>In the <uicontrol>EJB Project</uicontrol> drop-down list, select
-the project you want to export if the name is not already filled in for you.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Destination</uicontrol> field, provide the full
-path and JAR file name for the exported EJB module.</cmd></step>
-<step importance="optional"><cmd>To include source files in the exported JAR
-file, select the <uicontrol>Export source files</uicontrol> check box.</cmd>
-</step>
-<step importance="optional"><cmd>If you are exporting to an existing JAR file
-and you do not want to be warned about overwriting it, select <uicontrol>Overwrite
-existing file</uicontrol>.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<result> <p>To deploy your EJB JAR file to an application server after you
-export it, you need to use the deployment tools provided by the vendor of
-that server.</p></result>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/teexp.html b/docs/org.eclipse.jst.ejb.doc.user/topics/teexp.html
deleted file mode 100644
index 83e365c..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/teexp.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting EJB 2.x projects to EJB JAR files" />
-<meta name="abstract" content="After you have tested your enterprise beans, you can export the module into an EJB JAR file." />
-<meta name="description" content="After you have tested your enterprise beans, you can export the module into an EJB JAR file." />
-<meta content="EJB, JAR files, exporting projects" name="DC.subject" />
-<meta content="EJB, JAR files, exporting projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceresrc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="teexp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting EJB 2.x projects to EJB JAR files</title>
-</head>
-<body id="teexp"><a name="teexp"><!-- --></a>
-
-
-<h1 class="topictitle1">Exporting EJB 2.x projects to EJB JAR files</h1>
-
-
-
-<div><p>After you have tested your enterprise beans, you can export the
-module into an EJB JAR file.</p>
-
-<div class="section"><p>When you export an EJB project, the contents of the project are
-exported into an EJB JAR file regardless of whether deployment code has been
-generated or not. You can use the exported server-side JAR file as the client
-JAR file, since it contains all of the required code from both a server-side
-and client-side perspective.</p>
-<div class="important" id="teexp__exportEJBClientJAR"><a name="teexp__exportEJBClientJAR"><!-- --></a><span class="importanttitle">Important:</span> If
-you use the Export EJB JAR file wizard to export an EJB project, the export
-wizard does not include an EJB project's associated EJB client JAR project.
-To include the EJB client JAR file, it is recommended that you export the
-enterprise application EAR file that contains the EJB project. The resulting
-EAR file will include any dependent EJB client JAR files as utility JAR files.
-Alternatively, you can export the EJB client JAR project separately as a JAR
-file.</div>
-<p>To export an EJB project, complete the following steps:</p>
-</div>
-
-<ol>
-<li><span>In the Project Explorer view of the Java™ EE perspective, right-click the EJB
-project that you want to export and select <span class="menucascade"><span class="uicontrol">Export</span>
- > <span class="uicontrol">EJB JAR File</span></span>.</span></li>
-
-<li><span>In the <span class="uicontrol">EJB Project</span> drop-down list, select
-the project you want to export if the name is not already filled in for you.</span>
-</li>
-
-<li><span>In the <span class="uicontrol">Destination</span> field, provide the full
-path and JAR file name for the exported EJB module.</span></li>
-
-<li><strong>Optional: </strong><span>To include source files in the exported JAR
-file, select the <span class="uicontrol">Export source files</span> check box.</span>
-</li>
-
-<li><strong>Optional: </strong><span>If you are exporting to an existing JAR file
-and you do not want to be warned about overwriting it, select <span class="uicontrol">Overwrite
-existing file</span>.</span></li>
-
-<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="section"> <p>To deploy your EJB JAR file to an application server after you
-export it, you need to use the deployment tools provided by the vendor of
-that server.</p>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ceresrc.html" title="This topic describes resources and development tools that are commonly used in EJB version 2.x development.">EJB 2.x development resources</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/teimp.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/teimp.dita
deleted file mode 100644
index 6506064..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/teimp.dita
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="teimp" xml:lang="en-us">
-<title>Importing EJB 2.x JAR files</title>
-<shortdesc>You can import beans and other metadata from an EJB JAR file into
-a new or existing EJB project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EJB<indexterm>importing JAR files</indexterm></indexterm>
-<indexterm>JAR files<indexterm>importing EJB</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<context> <p>To import an EJB JAR file into an EJB project using the Import
-wizard, complete the following steps:</p></context>
-<steps>
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, select <menucascade>
-<uicontrol>File</uicontrol><uicontrol>Import</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>Under <uicontrol>Select an import source</uicontrol>, click <menucascade>
-<uicontrol>EJB</uicontrol><uicontrol>EJB JAR file</uicontrol></menucascade> and
-click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>EJB JAR file</uicontrol> field, enter the location
-and name of the EJB JAR file that you want to import.</cmd></step>
-<step><cmd>In the <uicontrol>EJB Project</uicontrol> field, a new project
-name or select an EJB project from the drop-down list.</cmd></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> drop-down list, select
-the application server that you want to target for your development. If no
-Target servers exist, create one using the <uicontrol>New</uicontrol> button.
-The target server choice affects the run time settings by modifying the class
-path entries for the project. This selection affects the run time settings
-by modifying the class path entries for the project.</cmd></step>
-<step><cmd>Specify whether you want to add the new module to an enterprise
-application (EAR) project. </cmd></step>
-<step importance="optional"><cmd>Select the <uicontrol>Add project to an EAR </uicontrol> check
-box to add the new module to an enterprise application (EAR) project.</cmd>
-<info>Type a new project name or select an existing enterprise application
-project from the drop-down list in the <uicontrol>EAR Project</uicontrol> combination
-box. Or, click the <uicontrol>New</uicontrol> button to launch the New Enterprise
-Application Project wizard. Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to import the EJB JAR file.</cmd>
-</step>
-</steps>
-<result><note type="tip">In the Project Explorer view you can also copy enterprise
-beans by dragging and dropping them from one EJB project to another EJB project.
-The import wizard will open to help you merge existing enterprise beans.</note><note
-type="tip"><image alt="The following paragraph applies to Windows." href="../images/ycwin.gif"
-placement="inline"></image> You can quickly drag and drop an EJB JAR file
-from the <tm tmclass="special" tmowner="Microsoft Corporation" tmtype="reg"
-trademark="Windows">Windows</tm> Explorer or desktop onto the Project Explorer
-view. The Import wizard will open with appropriate fields already populated.
-If you drop on an existing EJB module, the wizard will import into that EJB
-module. If you drop on an enterprise application, the wizard will bind the
-new EJB module to this EAR.</note><note>The .ser files in an EJB 1.0 JAR are
-converted into the ejb-jar.xml file for EJB 1.1 during an import.</note></result>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/teimp.html b/docs/org.eclipse.jst.ejb.doc.user/topics/teimp.html
deleted file mode 100644
index 3ba9307..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/teimp.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing EJB 2.x JAR files" />
-<meta name="abstract" content="You can import beans and other metadata from an EJB JAR file into a new or existing EJB project." />
-<meta name="description" content="You can import beans and other metadata from an EJB JAR file into a new or existing EJB project." />
-<meta content="EJB, importing JAR files, JAR files, importing EJB" name="DC.subject" />
-<meta content="EJB, importing JAR files, JAR files, importing EJB" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ceresrc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="teimp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing EJB 2.x JAR files</title>
-</head>
-<body id="teimp"><a name="teimp"><!-- --></a>
-
-
-<h1 class="topictitle1">Importing EJB 2.x JAR files</h1>
-
-
-
-<div><p>You can import beans and other metadata from an EJB JAR file into
-a new or existing EJB project.</p>
-
-<div class="section"> <p>To import an EJB JAR file into an EJB project using the Import
-wizard, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Project Explorer view of the Java™ EE perspective, select <span class="menucascade">
-<span class="uicontrol">File</span> > <span class="uicontrol">Import</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="menucascade">
-<span class="uicontrol">EJB</span> > <span class="uicontrol">EJB JAR file</span></span> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">EJB JAR file</span> field, enter the location
-and name of the EJB JAR file that you want to import.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">EJB Project</span> field, a new project
-name or select an EJB project from the drop-down list.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> drop-down list, select
-the application server that you want to target for your development. If no
-Target servers exist, create one using the <span class="uicontrol">New</span> button.
-The target server choice affects the run time settings by modifying the class
-path entries for the project. This selection affects the run time settings
-by modifying the class path entries for the project.</span></li>
-
-<li class="stepexpand"><span>Specify whether you want to add the new module to an enterprise
-application (EAR) project. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <span class="uicontrol">Add project to an EAR </span> check
-box to add the new module to an enterprise application (EAR) project.</span>
- Type a new project name or select an existing enterprise application
-project from the drop-down list in the <span class="uicontrol">EAR Project</span> combination
-box. Or, click the <span class="uicontrol">New</span> button to launch the New Enterprise
-Application Project wizard. Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to import the EJB JAR file.</span>
-</li>
-
-</ol>
-
-<div class="section"><div class="tip"><span class="tiptitle">Tip:</span> In the Project Explorer view you can also copy enterprise
-beans by dragging and dropping them from one EJB project to another EJB project.
-The import wizard will open to help you merge existing enterprise beans.</div>
-<div class="tip"><span class="tiptitle">Tip:</span> <img src="../images/ycwin.gif" alt="The following paragraph applies to Windows." /> You can quickly drag and drop an EJB JAR file
-from the Windows<sup>®</sup> Explorer or desktop onto the Project Explorer
-view. The Import wizard will open with appropriate fields already populated.
-If you drop on an existing EJB module, the wizard will import into that EJB
-module. If you drop on an enterprise application, the wizard will bind the
-new EJB module to this EAR.</div>
-<div class="note"><span class="notetitle">Note:</span> The .ser files in an EJB 1.0 JAR are
-converted into the ejb-jar.xml file for EJB 1.1 during an import.</div>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ceresrc.html" title="This topic describes resources and development tools that are commonly used in EJB version 2.x development.">EJB 2.x development resources</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/temessb.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/temessb.dita
deleted file mode 100644
index ea4067c..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/temessb.dita
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="temessb" xml:lang="en-us">
-<title>Creating message-driven beans with XDoclet annotation support</title>
-<shortdesc>You can use a wizard to create a message-driven bean and add it
-to your project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>message-driven beans<indexterm>XDoclet annotation support</indexterm></indexterm>
-<indexterm>XDoclet annotation support<indexterm>message-driven beans</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<prereq><p>Before you can create an enterprise bean, you must:</p><ul>
-<li>Define an EJB project to contain the enterprise bean. See <xref href="tecrtpro.dita"></xref>.</li>
-<li>Install XDoclet annotation support and enable it. See <xref href="txdocletconf.dita"></xref>.</li>
-</ul></prereq>
-<context><p>To create a message-driven bean, complete the following steps:</p></context>
-<steps>
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Other</uicontrol></menucascade>. Select <menucascade>
-<uicontrol>EJB</uicontrol><uicontrol>XDoclet Enterprise JavaBean</uicontrol>
-</menucascade> and click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Message Driven Bean</uicontrol> and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>Select the <uicontrol>Project</uicontrol> that will contain the
-new bean. </cmd></step>
-<step><cmd>In the <uicontrol>Folder</uicontrol> field, select the folder for
-the new bean. </cmd></step>
-<step><cmd>In the <uicontrol>Java package</uicontrol> field, enter the package
-name for the new bean. </cmd></step>
-<step><cmd>In the <uicontrol>Class name</uicontrol> field, type a name for
-the enterprise bean. By convention, bean names should begin with an uppercase
-letter. </cmd><info><note>You can use Unicode characters for the bean name,
-but Unicode characters are not supported for enterprise bean packages and
-classes associated with enterprise beans.</note></info></step>
-<step><cmd>Change the <uicontrol>Superclass</uicontrol> for the bean if you
-want it to inherit from a class other than <codeph>java.lang.Object</codeph> and
-click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>Provide an <uicontrol>EJB Name</uicontrol> for the bean. This is
-the name of the enterprise bean class. </cmd></step>
-<step><cmd>Provide an <uicontrol>Destination JNDI Name</uicontrol> for the
-bean. This is a logical name used by the server to locate an enterprise bean
-at runtime. </cmd></step>
-<step><cmd>Provide an <uicontrol>Display Name</uicontrol> for the bean. This
-is a short name for the enterprise bean that is used by tools. </cmd></step>
-<step><cmd>Provide a text <uicontrol>Description</uicontrol> for the bean.</cmd>
-</step>
-<step><cmd>Select a <uicontrol>Destination</uicontrol> for the new bean: </cmd>
-<info><ul>
-<li><uicontrol>Queue</uicontrol> specifies that the point-to-point JMS messaging
-model will be used. </li>
-<li><uicontrol>Topic</uicontrol> specifies that the publish-and-subscribe
-JMS messaging model will be used.</li>
-</ul></info></step>
-<step><cmd>Select a <uicontrol>Transaction Type</uicontrol> for the new bean:</cmd>
-<info><ul>
-<li><uicontrol>Container</uicontrol> specifies that the transaction demarcation
-is performed by the container.</li>
-<li><uicontrol>Bean</uicontrol> specifies that the transaction demarcation
-is performed by the bean. </li>
-</ul>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>Select the type of <uicontrol>Modifiers</uicontrol> to use for
-the class.</cmd></step>
-<step importance="optional"><cmd>Select the <uicontrol>Interfaces</uicontrol> you
-want the bean to implement. Click <uicontrol>Add</uicontrol> to select interfaces
-that you want to implement and click <uicontrol>Remove</uicontrol> to take
-away interfaces that you no longer want to implement.</cmd></step>
-<step><cmd>Select the method stubs that you want the wizard to create.</cmd>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to add the new bean to the
-specified EJB project.</cmd></step>
-</steps>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/temessb.html b/docs/org.eclipse.jst.ejb.doc.user/topics/temessb.html
deleted file mode 100644
index d84f5f3..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/temessb.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating message-driven beans with XDoclet annotation support" />
-<meta name="abstract" content="You can use a wizard to create a message-driven bean and add it to your project." />
-<meta name="description" content="You can use a wizard to create a message-driven bean and add it to your project." />
-<meta content="message-driven beans, XDoclet annotation support" name="DC.subject" />
-<meta content="message-driven beans, XDoclet annotation support" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tecrte.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="temessb" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating message-driven beans with XDoclet annotation support</title>
-</head>
-<body id="temessb"><a name="temessb"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating message-driven beans with XDoclet annotation support</h1>
-
-
-
-<div><p>You can use a wizard to create a message-driven bean and add it
-to your project.</p>
-
-<div class="p"><p>Before you can create an enterprise bean, you must:</p>
-<ul>
-<li>Define an EJB project to contain the enterprise bean. See <a href="tecrtpro.html" title="An EJB project is used to organize the resources contained in an EJB module.">Creating EJB projects</a>.</li>
-
-<li>Install XDoclet annotation support and enable it. See <a href="txdocletconf.html" title="To use XDoclet annotation support, or to create enterprise beans, XDoclet must be installed on your system and configured to work with the workbench. ">Configuring XDoclet annotation support</a>.</li>
-
-</ul>
-</div>
-
-<div class="section"><p>To create a message-driven bean, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span></span>. Select <span class="menucascade">
-<span class="uicontrol">EJB</span> > <span class="uicontrol">XDoclet Enterprise JavaBean</span>
-</span> and click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Message Driven Bean</span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project</span> that will contain the
-new bean. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Folder</span> field, select the folder for
-the new bean. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Java package</span> field, enter the package
-name for the new bean. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Class name</span> field, type a name for
-the enterprise bean. By convention, bean names should begin with an uppercase
-letter. </span> <div class="note"><span class="notetitle">Note:</span> You can use Unicode characters for the bean name,
-but Unicode characters are not supported for enterprise bean packages and
-classes associated with enterprise beans.</div>
-</li>
-
-<li class="stepexpand"><span>Change the <span class="uicontrol">Superclass</span> for the bean if you
-want it to inherit from a class other than <samp class="codeph">java.lang.Object</samp> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>Provide an <span class="uicontrol">EJB Name</span> for the bean. This is
-the name of the enterprise bean class. </span></li>
-
-<li class="stepexpand"><span>Provide an <span class="uicontrol">Destination JNDI Name</span> for the
-bean. This is a logical name used by the server to locate an enterprise bean
-at runtime. </span></li>
-
-<li class="stepexpand"><span>Provide an <span class="uicontrol">Display Name</span> for the bean. This
-is a short name for the enterprise bean that is used by tools. </span></li>
-
-<li class="stepexpand"><span>Provide a text <span class="uicontrol">Description</span> for the bean.</span>
-</li>
-
-<li class="stepexpand"><span>Select a <span class="uicontrol">Destination</span> for the new bean: </span>
- <ul>
-<li><span class="uicontrol">Queue</span> specifies that the point-to-point JMS messaging
-model will be used. </li>
-
-<li><span class="uicontrol">Topic</span> specifies that the publish-and-subscribe
-JMS messaging model will be used.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>Select a <span class="uicontrol">Transaction Type</span> for the new bean:</span>
- <ul>
-<li><span class="uicontrol">Container</span> specifies that the transaction demarcation
-is performed by the container.</li>
-
-<li><span class="uicontrol">Bean</span> specifies that the transaction demarcation
-is performed by the bean. </li>
-
-</ul>
-Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>Select the type of <span class="uicontrol">Modifiers</span> to use for
-the class.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <span class="uicontrol">Interfaces</span> you
-want the bean to implement. Click <span class="uicontrol">Add</span> to select interfaces
-that you want to implement and click <span class="uicontrol">Remove</span> to take
-away interfaces that you no longer want to implement.</span></li>
-
-<li class="stepexpand"><span>Select the method stubs that you want the wizard to create.</span>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to add the new bean to the
-specified EJB project.</span></li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tecrte.html" title="You can use a wizard to create session beans and message-driven beans that support XDoclet annotation.">Creating enterprise beans with XDoclet annotation support</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tesessb.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/tesessb.dita
deleted file mode 100644
index c656f06..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tesessb.dita
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tesessb" xml:lang="en-us">
-<title>Creating session beans with XDoclet annotation support</title>
-<shortdesc>You can use a wizard to create a session bean and add it to your
-project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>session beans<indexterm>XDoclet annotation support</indexterm></indexterm>
-<indexterm>XDoclet annotation support<indexterm>session beans</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<prereq><p>Before you can create an enterprise bean, you must:</p><ul>
-<li>Define an EJB project to contain the enterprise bean. See <xref href="tecrtpro.dita"></xref>.</li>
-<li>Install XDoclet annotation support and enable it. See <xref href="txdocletconf.dita"></xref>.</li>
-</ul></prereq>
-<context> <p>To create a session bean, complete the following steps:</p></context>
-<steps>
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Other</uicontrol></menucascade>. Select <menucascade>
-<uicontrol>EJB</uicontrol><uicontrol>XDoclet Enterprise JavaBean</uicontrol>
-</menucascade> and click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>Select <uicontrol>Session Bean</uicontrol> and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>Select the <uicontrol>Project</uicontrol> that will contain the
-new session bean.</cmd></step>
-<step><cmd>In the <uicontrol>Folder</uicontrol> field, select the folder for
-the new bean. </cmd></step>
-<step><cmd>In the <uicontrol>Java package</uicontrol> field, enter the package
-name for the new bean. </cmd></step>
-<step><cmd>In the <uicontrol>Class name</uicontrol> field, type a name for
-the enterprise bean. By convention, bean names should begin with an uppercase
-letter. </cmd><info><note>You can use Unicode characters for the bean name,
-but Unicode characters are not supported for enterprise bean packages and
-classes associated with enterprise beans.</note></info></step>
-<step importance="optional"><cmd>Change the <uicontrol>Superclass</uicontrol> for
-the bean if you want it to inherit from a class other than <codeph>java.lang.Object</codeph> and
-click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>Provide an <uicontrol>EJB Name</uicontrol> for the bean.</cmd>
-<info>This is the name of the enterprise bean class. The next three fields
-will automatically be filled in, you can change these values if you want:<ul>
-<li><uicontrol>JNDI Name</uicontrol> is the logical name used by the server
-to locate an enterprise bean at runtime.</li>
-<li><uicontrol>Display Name</uicontrol> is a short name for the enterprise
-bean that is used by tools.</li>
-<li><uicontrol>Description</uicontrol> is to help you identify the bean.</li>
-</ul></info></step>
-<step><cmd>Select the <uicontrol>State type</uicontrol> for the new bean:</cmd>
-<info><ul>
-<li>A <uicontrol>Stateful</uicontrol> session bean maintains client-specific
-session information, or conversational state, across multiple method calls
-and transactions. An instance of a stateful session bean has a unique identity
-that is assigned by the container at create time. </li>
-<li>A <uicontrol>Stateless</uicontrol> session bean does not maintain conversational
-state. Instances of a stateless session bean have no conversational state.
-All instances of a stateless session bean have the same object identifier,
-which is assigned by the container. </li>
-</ul></info></step>
-<step><cmd>Select a <uicontrol>Transaction Type</uicontrol> for the new bean:</cmd>
-<info><ul>
-<li><b>Container</b> specifies that the transaction demarcation is performed
-by the container.</li>
-<li><uicontrol>Bean</uicontrol> specifies that the transaction demarcation
-is performed by the bean.</li>
-</ul>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>Select the type of <uicontrol>Modifiers</uicontrol> to use for
-the class.</cmd></step>
-<step importance="optional"><cmd>Select the <b>Interfaces</b> you want the
-bean to implement. Click <uicontrol>Add</uicontrol> to select interfaces that
-you want to implement and click <uicontrol>Remove</uicontrol> to take away
-interfaces that you no longer want to implement.</cmd></step>
-<step><cmd>Select the method stubs that you want the wizard to create.</cmd>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to add the new bean to the
-specified EJB project.</cmd></step>
-</steps>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/tesessb.html b/docs/org.eclipse.jst.ejb.doc.user/topics/tesessb.html
deleted file mode 100644
index 23f2ce8..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tesessb.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating session beans with XDoclet annotation support" />
-<meta name="abstract" content="You can use a wizard to create a session bean and add it to your project." />
-<meta name="description" content="You can use a wizard to create a session bean and add it to your project." />
-<meta content="session beans, XDoclet annotation support" name="DC.subject" />
-<meta content="session beans, XDoclet annotation support" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tecrte.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tesessb" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating session beans with XDoclet annotation support</title>
-</head>
-<body id="tesessb"><a name="tesessb"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating session beans with XDoclet annotation support</h1>
-
-
-
-<div><p>You can use a wizard to create a session bean and add it to your
-project.</p>
-
-<div class="p"><p>Before you can create an enterprise bean, you must:</p>
-<ul>
-<li>Define an EJB project to contain the enterprise bean. See <a href="tecrtpro.html" title="An EJB project is used to organize the resources contained in an EJB module.">Creating EJB projects</a>.</li>
-
-<li>Install XDoclet annotation support and enable it. See <a href="txdocletconf.html" title="To use XDoclet annotation support, or to create enterprise beans, XDoclet must be installed on your system and configured to work with the workbench. ">Configuring XDoclet annotation support</a>.</li>
-
-</ul>
-</div>
-
-<div class="section"> <p>To create a session bean, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span></span>. Select <span class="menucascade">
-<span class="uicontrol">EJB</span> > <span class="uicontrol">XDoclet Enterprise JavaBean</span>
-</span> and click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">Session Bean</span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project</span> that will contain the
-new session bean.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Folder</span> field, select the folder for
-the new bean. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Java package</span> field, enter the package
-name for the new bean. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Class name</span> field, type a name for
-the enterprise bean. By convention, bean names should begin with an uppercase
-letter. </span> <div class="note"><span class="notetitle">Note:</span> You can use Unicode characters for the bean name,
-but Unicode characters are not supported for enterprise bean packages and
-classes associated with enterprise beans.</div>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Change the <span class="uicontrol">Superclass</span> for
-the bean if you want it to inherit from a class other than <samp class="codeph">java.lang.Object</samp> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>Provide an <span class="uicontrol">EJB Name</span> for the bean.</span>
- This is the name of the enterprise bean class. The next three fields
-will automatically be filled in, you can change these values if you want:<ul>
-<li><span class="uicontrol">JNDI Name</span> is the logical name used by the server
-to locate an enterprise bean at runtime.</li>
-
-<li><span class="uicontrol">Display Name</span> is a short name for the enterprise
-bean that is used by tools.</li>
-
-<li><span class="uicontrol">Description</span> is to help you identify the bean.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">State type</span> for the new bean:</span>
- <ul>
-<li>A <span class="uicontrol">Stateful</span> session bean maintains client-specific
-session information, or conversational state, across multiple method calls
-and transactions. An instance of a stateful session bean has a unique identity
-that is assigned by the container at create time. </li>
-
-<li>A <span class="uicontrol">Stateless</span> session bean does not maintain conversational
-state. Instances of a stateless session bean have no conversational state.
-All instances of a stateless session bean have the same object identifier,
-which is assigned by the container. </li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>Select a <span class="uicontrol">Transaction Type</span> for the new bean:</span>
- <ul>
-<li><strong>Container</strong> specifies that the transaction demarcation is performed
-by the container.</li>
-
-<li><span class="uicontrol">Bean</span> specifies that the transaction demarcation
-is performed by the bean.</li>
-
-</ul>
-Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>Select the type of <span class="uicontrol">Modifiers</span> to use for
-the class.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <strong>Interfaces</strong> you want the
-bean to implement. Click <span class="uicontrol">Add</span> to select interfaces that
-you want to implement and click <span class="uicontrol">Remove</span> to take away
-interfaces that you no longer want to implement.</span></li>
-
-<li class="stepexpand"><span>Select the method stubs that you want the wizard to create.</span>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to add the new bean to the
-specified EJB project.</span></li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tecrte.html" title="You can use a wizard to create session beans and message-driven beans that support XDoclet annotation.">Creating enterprise beans with XDoclet annotation support</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/txdocletconf.dita b/docs/org.eclipse.jst.ejb.doc.user/topics/txdocletconf.dita
deleted file mode 100644
index d0720c8..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/txdocletconf.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="configuringxdocletannotationsupport" xml:lang="en-us">
-<title>Configuring XDoclet annotation support</title>
-<shortdesc>To use XDoclet annotation support, or to create enterprise beans,
-XDoclet must be installed on your system and configured to work with the workbench. </shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java annotation<indexterm>XDoclet annotation support</indexterm></indexterm>
-<indexterm>XDoclet annotation support<indexterm>configuring</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<prereq>More information on XDoclet can be found at <xref href="http://xdoclet.sourceforge.net/xdoclet/index.html"
-scope="external"><desc>The XDoclet Web site</desc></xref>.</prereq>
-<context><p>To configure XDoclet to work with the workbench, complete the
-following steps:</p></context>
-<steps>
-<step><cmd>Download and unzip xdoclet-bin-1.2.3.zip by navigating to <xref
-href="http://xdoclet.sourceforge.net/xdoclet/install.html" scope="external"><desc></desc></xref> and
-following the download link.</cmd></step>
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade>. </cmd></step>
-<step><cmd>In the Preferences window, click <uicontrol>XDoclet</uicontrol> in
-the left pane.</cmd></step>
-<step><cmd>Check the <uicontrol>Enable XDoclet Builder</uicontrol> check box
-to turn on annotation-based artifact creation. </cmd></step>
-<step><cmd>Use the <uicontrol>Browse</uicontrol> button to locate the folder
-where you unzipped the XDoclet download (<uicontrol>XDoclet Home</uicontrol>). </cmd>
-</step>
-<step><cmd>Select the <uicontrol>Version</uicontrol> of XDoclet that you have
-installed. In this case, select 1.2.3.</cmd><info>If you downloaded an earlier
-version, XDoclet versions 1.2.1 and 1.2.2 are also supported.<?Pub Caret?></info>
-</step>
-<step><cmd>Click <uicontrol>OK</uicontrol> to save the preferences.</cmd>
-</step>
-</steps>
-</taskbody>
-</task>
-<?Pub *0000002115?>
diff --git a/docs/org.eclipse.jst.ejb.doc.user/topics/txdocletconf.html b/docs/org.eclipse.jst.ejb.doc.user/topics/txdocletconf.html
deleted file mode 100644
index 22b38fc..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/txdocletconf.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Configuring XDoclet annotation support" />
-<meta name="abstract" content="To use XDoclet annotation support, or to create enterprise beans, XDoclet must be installed on your system and configured to work with the workbench." />
-<meta name="description" content="To use XDoclet annotation support, or to create enterprise beans, XDoclet must be installed on your system and configured to work with the workbench." />
-<meta content="Java annotation, XDoclet annotation support, configuring" name="DC.subject" />
-<meta content="Java annotation, XDoclet annotation support, configuring" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tecrte.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="configuringxdocletannotationsupport" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Configuring XDoclet annotation support</title>
-</head>
-<body id="configuringxdocletannotationsupport"><a name="configuringxdocletannotationsupport"><!-- --></a>
-
-
-<h1 class="topictitle1">Configuring XDoclet annotation support</h1>
-
-
-
-<div><p>To use XDoclet annotation support, or to create enterprise beans,
-XDoclet must be installed on your system and configured to work with the workbench. </p>
-
-<div class="p">More information on XDoclet can be found at <a href="http://xdoclet.sourceforge.net/xdoclet/index.html" target="_blank" title="The XDoclet Web site">http://xdoclet.sourceforge.net/xdoclet/index.html</a>.</div>
-
-<div class="section"><p>To configure XDoclet to work with the workbench, complete the
-following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Download and unzip xdoclet-bin-1.2.3.zip by navigating to <a href="http://xdoclet.sourceforge.net/xdoclet/install.html" target="_blank" title="">http://xdoclet.sourceforge.net/xdoclet/install.html</a> and
-following the download link.</span></li>
-
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
-</span>. </span></li>
-
-<li class="stepexpand"><span>In the Preferences window, click <span class="uicontrol">XDoclet</span> in
-the left pane.</span></li>
-
-<li class="stepexpand"><span>Check the <span class="uicontrol">Enable XDoclet Builder</span> check box
-to turn on annotation-based artifact creation. </span></li>
-
-<li class="stepexpand"><span>Use the <span class="uicontrol">Browse</span> button to locate the folder
-where you unzipped the XDoclet download (<span class="uicontrol">XDoclet Home</span>). </span>
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Version</span> of XDoclet that you have
-installed. In this case, select 1.2.3.</span> If you downloaded an earlier
-version, XDoclet versions 1.2.1 and 1.2.2 are also supported.
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> to save the preferences.</span>
-</li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tecrte.html" title="You can use a wizard to create session beans and message-driven beans that support XDoclet annotation.">Creating enterprise beans with XDoclet annotation support</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.ui.infopop/.project b/docs/org.eclipse.jst.ejb.ui.infopop/.project
deleted file mode 100644
index 4fb0e17..0000000
--- a/docs/org.eclipse.jst.ejb.ui.infopop/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ejb.ui.infopop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.ejb.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ejb.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 8de8ebd..0000000
--- a/docs/org.eclipse.jst.ejb.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ejb.ui.infopop;singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.jst.ejb.ui.infopop/MessageDrivenBeanWizContext.xml b/docs/org.eclipse.jst.ejb.ui.infopop/MessageDrivenBeanWizContext.xml
deleted file mode 100644
index c55666d..0000000
--- a/docs/org.eclipse.jst.ejb.ui.infopop/MessageDrivenBeanWizContext.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-
-<contexts>
-<context id="messbw1100">
-<description>
-Specify the <b>Project</b> and <b>Folder</b> where the message–driven bean will be placed. The message–driven bean should be stored in the Java source directory, which you specified when you created the EJB Project (for example ejbModule).
-
-Specify the <b>Java package</b> that the class will belong to. <b>Note:</b> The bean class cannot be added into a default package.
-
-Specify the <b>Class name</b> of the message-driven bean (for example MyMessageBean).
-
-In the field <b>Superclass</b> specify the superclass for the message-driven bean, only if it is derived from one. Click <b>Browse</b> to choose from the available, already existing or created, superclasses. This field is optional.
-
-In the field <b>Destination name</b> specify the global JNDI name of the Queue/Topic JMS Resource.
-
-Check <b>JMS</b> to specify that message-driven bean is of JMS message type. This means that the message listener interface is the javax.jms.MessageListener interface. If <b>JMS</b> is checked you can specify the <b>Destination type</b> of the message-driven bean:
- <b>- Queue</b> is used as a destination for point–to–point messaging.
- <b>- Topic</b> is used as a destination for publish/subscribe messaging.
-</description>
-<topic label="Creating Messsage-driven Beans" href="../org.eclipse.jst.ejb.doc.user/topics/messbwiz.html"/>
-<topic label="EJB 2.x architecture" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html"/>
-<topic label="EJB 2.x development resource" href="../org.eclipse.jst.ejb.doc.user/topics/ceresrc.html"/>
-</context>
-
-<context id="messbw1200">
-<description>
-Note that the <b>Class name</b> value provided in the first page of the wizard is automatically mapped to the <b>Bean name</b> field on this page.
-
-In the field <b>Transaction type</b> specify whether the transaction is handled by the <b>Container</b> or the <b>Bean</b>.
-
-You can <b>Add</b> and <b>Remove</b> <b>Interfaces</b> that this message-driven bean implements.
-Clicking on the <b>Message listener interface</b> allows you to set or change the message listener interface of the bean. This field is automatically set to the first interfaces added to <b>Interfaces</b>. It is mandatory that this field point to a valid Java interface. Otherwise the wizard cannot be finished.
-Note that, if you have specified on the first wizard page that the bean is of JMS message type, then the javax.jms.MessageListener interface is automatically set as <b>Message listener interface</b> and added to the <b>Interfaces</b>.
-If the <b>Inherited abstract methods</b> option is checked, it means that you want to override the methods provided by the interface, which is defined in the <b>Interfaces</b> field.
-
-Using the option <b>Constructors from superclass</b> you can choose whether to override the constructor of the class, which you specified as superclass in the first page of the wizard.
-</description>
-<topic label="Creating Messsage-driven Beans" href="../org.eclipse.jst.ejb.doc.user/topics/messbwiz.html"/>
-<topic label="EJB 2.x architecture" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html"/>
-<topic label="EJB 2.x development resource" href="../org.eclipse.jst.ejb.doc.user/topics/ceresrc.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.ejb.ui.infopop/SessionBeanWizContext.xml b/docs/org.eclipse.jst.ejb.ui.infopop/SessionBeanWizContext.xml
deleted file mode 100644
index b495219..0000000
--- a/docs/org.eclipse.jst.ejb.ui.infopop/SessionBeanWizContext.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<contexts>
-<context id="sessbw1100">
-<description>
-Specify the <b>Project</b> and <b>Folder</b> where the session bean will be placed. The session bean should be stored in the Java source directory, which you specified when you created the EJB Project (for example ejbModule).
-
-Specify the <b>Java package</b> that the class will belong to. <b>Note:</b> The bean class cannot be added into a default package.
-
-Specify the <b>Class name</b> of the session bean (for example MySessionBean).
-
-In the field <b>Superclass</b> specify the superclass for the session bean, only if it is derived from one. Click <b>Browse</b> to choose from the available, already existing or created, superclasses. (This field is optional).
-
-In the field <b>State type</b> choose the type of the session bean that you create:
- <b>- Stateful</b> session bean acts on behalf of a single client and maintains client-specific session information (called conversational state) across multiple method calls and transactions. It exists for the duration of a single client/server session.
- <b>- Stateless</b> session bean is pooled by the container to handle multiple requests from multiple clients and does not maintain any conversational state.
-
-In the section <b>Create business interface</b>, check the business interface that you want to create:
- <b>- Remote Interface</b> – the client can run on a different machine or different Java virtual machine than the enterprise bean it accesses and the location of the bean is transparent.
- <b>- Local Interface</b> – the client must run on the same Java virtual machine as the bean it accesses and the location of the enterprise bean is not transparent.
-Note: You can check both interfaces, so that your session bean will have local and remote interfaces.
-</description>
-<topic label="Creating Session Beans" href="../org.eclipse.jst.ejb.doc.user/topics/sessbwiz.html"/>
-<topic label="EJB 2.x architecture" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html"/>
-<topic label="EJB 2.x development resource" href="../org.eclipse.jst.ejb.doc.user/topics/ceresrc.html"/>
-</context>
-
-<context id="sessbw1200">
-<description>
-Note that the <b>Class name</b> value provided in the first page of the wizard is automatically mapped to the <b>Bean name</b> field on this page.
-
-In the field <b>Transaction type</b> specify whether the transaction is handled by the <b>Container</b> or the <b>Bean</b>.
-
-In the field <b>Mapped name</b> specify the bean’s global JNDI name.
-
-Note that the business interface, provided in the previous page of the wizard, is automatically mapped to the <b>Business interfaces</b> field on this page. You can click the <b>Add</b> button to add additional interfaces to implement.
-
-Note: If you create EJB 2.x beans, click on <b>Home and Components interfaces(EJB 2.x)</b> to add the home and the component interfaces. The <b>home interface</b> allows a client to create, remove and find existing instances of enterprise beans. The <b>component interface</b> allows a client to access the business methods of the enterprise bean. Check:
- <b>- Local</b> to add the local home and component interfaces.
- <b>- Remote</b> to add the remote home and component interfaces.
-
-If the <b>Inherited abstract methods</b> option is checked, it means that you want to override the methods provided by the interface, which is defined in the <b>Business interfaces</b> field.
-
-Using the option <b>Constructors from superclass</b> you can choose whether to override the constructor of the class, which you specified as superclass in the first page of the wizard.
-</description>
-<topic label="Creating Session Beans" href="../org.eclipse.jst.ejb.doc.user/topics/sessbwiz.html"/>
-<topic label="EJB 2.x architecture" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html"/>
-<topic label="EJB 2.x development resource" href="../org.eclipse.jst.ejb.doc.user/topics/ceresrc.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.ejb.ui.infopop/about.html b/docs/org.eclipse.jst.ejb.ui.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.jst.ejb.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ejb.ui.infopop/build.properties b/docs/org.eclipse.jst.ejb.ui.infopop/build.properties
deleted file mode 100644
index ac09c39..0000000
--- a/docs/org.eclipse.jst.ejb.ui.infopop/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = SessionBeanWizContext.xml,\
- MessageDrivenBeanWizContext.xml,\
- about.html,\
- plugin.xml,\
- plugin.properties,\
- META-INF/
-
-src.includes = build.properties
-generateSourceBundle=false
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.ui.infopop/plugin.properties b/docs/org.eclipse.jst.ejb.ui.infopop/plugin.properties
deleted file mode 100644
index 0abd6eb..0000000
--- a/docs/org.eclipse.jst.ejb.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName = EJB infopop
-pluginProvider = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.ui.infopop/plugin.xml b/docs/org.eclipse.jst.ejb.ui.infopop/plugin.xml
deleted file mode 100644
index f7d8022..0000000
--- a/docs/org.eclipse.jst.ejb.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help -->
-<!-- contributions for using the tool. -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
- <contexts file="SessionBeanWizContext.xml" plugin ="org.eclipse.jst.ejb.ui"/>
- <contexts file="MessageDrivenBeanWizContext.xml" plugin ="org.eclipse.jst.ejb.ui"/>
-
-</extension>
-
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.classpath b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.classpath
deleted file mode 100644
index 196d49a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.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.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.cvsignore b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.cvsignore
deleted file mode 100644
index fa3eb8f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-*.jar
-build.xml
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.project b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.project
deleted file mode 100644
index 5ec81c8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.ejb.annotation.model</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.ejb.annotation.model/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9aaa98f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,62 +0,0 @@
-#Thu May 10 18:42:24 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/META-INF/MANIFEST.MF
deleted file mode 100644
index 900ac39..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb.annotation.model; singleton:=true
-Bundle-Version: 1.1.102.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.j2ee.ejb.annotation.internal.model.ModelPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package:
- org.eclipse.jst.j2ee.ejb.annotation.internal.messages;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotation.internal.model;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotation.internal.operations;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotation.internal.preferences;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotation.internal.provider;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotation.internal.utility;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/about.html b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/build.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/build.properties
deleted file mode 100644
index 19d1785..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = plugin.xml,\
- .,\
- META-INF/,\
- about.html,\
- plugin.properties
-src.includes = schema/
-source.. = src/
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/plugin.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/plugin.properties
deleted file mode 100644
index 42654f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.jst.j2ee.ejb.annotation.model
-Bundle-Name.0 = EJB Annotation Model Plug-in
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/plugin.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/plugin.xml
deleted file mode 100644
index fcd4c63..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="ejbGenerator" name="org.eclipse.jst.j2ee.ejb.generator" schema="schema/ejbGenerator.exsd"/>
-
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <DataModelProvider
- class="org.eclipse.jst.j2ee.ejb.annotation.internal.model.EnterpriseBeanClassDataModelProvider"
- id="org.eclipse.jst.j2ee.ejb.annotation.internal.model.EnterpriseBeanClassDataModelProvider"/>
- <DataModelProvider
- class="org.eclipse.jst.j2ee.ejb.annotation.internal.model.MessageDrivenBeanDataModelProvider"
- id="org.eclipse.jst.j2ee.ejb.annotation.internal.model.MessageDrivenBeanDataModelProvider"/>
- <DataModelProvider
- class="org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModelProvider"
- id="org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModelProvider"/>
- </extension>
- <extension
- id="org.eclipse.jst.j2ee.ejb.annotation.model"
- name="org.eclipse.jst.j2ee.ejb.annotation.model"
- point="org.eclipse.core.runtime.preferences">
- <initializer class="org.eclipse.jst.j2ee.ejb.annotation.internal.preferences.AnnotationPreferenceStore"/>
-
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/schema/ejbGenerator.exsd b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/schema/ejbGenerator.exsd
deleted file mode 100644
index 88af90d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/schema/ejbGenerator.exsd
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.ejb.annotation.model">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.ejb.annotation.model" id="ejbGenerator" name="EJB Generator"/>
- </appInfo>
- <documentation>
- This extension permits definitions for new types of EJB generators. An example of such a generator is XDoclet. There can be other types of generators that can be associated with EJB wizards. Currently this is not selectabled via the UI.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="ejbGenerator"/>
- <element ref="provider"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="ejbGenerator">
- <annotation>
- <documentation>
- Using this extension point an EJB generator can generate annotated Java from EMF models. This extension point is invoked from the EJB wizards. The provider and generator are linked by the "id". i.e. They should both have the same id (e.g. XDoclet). There can be many provider-generator sets.
-
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- </sequence>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- The name of the generator.
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- A class that implements <code>org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IEJBGenerator</code>.
- </documentation>
- <appInfo>
- <meta.attribute kind="java"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="provider">
- <annotation>
- <documentation>
- Using this extension point clients can define an annotation generator. (i.e. appear in wizards that generate EJBs and Servlets to generate annotated Java code from a model.) The processor can be selective about the types annotation it generates (servlet/EJB/WebService), and it should be return whether is ready to generate code or not (isValid). Typically the generator may need an installation step. isValid is used to confirm whether this took place or not. The name may appear as a user selectable option in wizards.
-
- </documentation>
- </annotation>
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The name of the provider.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- A class that implements <code>org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IAnnotationProvider</code>.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <pre>
- <extension
- point="org.eclipse.jst.j2ee.ejb.annotation.model.ejbGenerator">
- <provider
- name="XDoclet"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.provider.XDocletAnnotationProvider" />
- <ejbGenerator
- name="XDoclet"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.provider.XDocletAnnotationProvider" />
- </extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- The ejb generator class must implement the <code>org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IEJBGenerator</code>.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- <code>org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.provider.XDocletAnnotationProvider</code> provides an implementation for XDoclet.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 Eteration A.S. and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/messages/EJBAnnotationMessages.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/messages/EJBAnnotationMessages.java
deleted file mode 100644
index 9768c8f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/messages/EJBAnnotationMessages.java
+++ /dev/null
@@ -1,154 +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.annotation.internal.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class EJBAnnotationMessages extends NLS {
-
- private static final String BUNDLE_NAME = "web_ui";//$NON-NLS-1$
-
- private EJBAnnotationMessages() {
- // Do not instantiate
- }
-
- public static String ERR_TRANSACTION_EMPTY;
- public static String FOLDER_LABEL;
- public static String ADD_EJB_WIZARD_WINDOW_TITLE;
- public static String DESTINATION_LABEL;
- public static String ERR_STATELESS_VALUE;
- public static String TRANSACTION_LABEL;
- public static String JAVA_CLASS_MODIFIERS_LABEL;
- public static String DISPLAY_NAME_LABEL;
- public static String ERR_DESTINATIONTYPE_EMPTY;
- public static String ERR_EJB_TYPE_VALUE;
- public static String SUPERCLASS_LABEL;
- public static String ERR_CLASS_NAME_MUSTEND_WITH_BEAN;
- public static String PACKAGE_SELECTION_DIALOG_MSG_NONE;
- public static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL;
- public static String DESTINATION_NAME_LABEL;
- public static String _9;
- public static String JAVA_CLASS_MAIN_CHECKBOX_LABEL;
- public static String _8;
- public static String ERR_JNDI_NAME_VALUE;
- public static String _7;
- public static String _6;
- public static String _5;
- public static String _4;
- public static String _3;
- public static String _2;
- public static String _1;
- public static String ADD_EJB_WIZARD_PAGE_DESC;
- public static String _0;
- public static String EMPTY_LIST_MSG;
- public static String ERR_DISPLAY_NAME_EMPTY;
- public static String NO_WEB_PROJECTS;
- public static String INTERFACE_SELECTION_DIALOG_MSG_NONE;
- public static String ERR_EJB_NAME_ENDS_WITH_BEAN;
- public static String SUPERCLASS_SELECTION_DIALOG_TITLE;
- public static String PACKAGE_SELECTION_DIALOG_DESC;
- public static String JAVA_CLASS_BROWER_DIALOG_TITLE;
- public static String CONTAINER_SELECTION_DIALOG_DESC;
- public static String NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
- public static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL;
- public static String URL_PATTERN_LABEL;
- public static String CONTAINER_SELECTION_DIALOG_TITLE;
- public static String URL_PATTERN_TITLE;
- public static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG;
- public static String DESCRIPTION_LABEL;
- public static String JAVA_CLASS_FINAL_CHECKBOX_LABEL;
- public static String ERR_STATELESS_EMPTY;
- public static String EJB_NAME_LABEL;
- public static String ERR_EJB_DISPLAY_NAME_USED;
- public static String ERR_EJB_TYPE_EXISTS;
- public static String ERR_MUST_ENTER_A_PACKAGE_NAME;
- public static String ERR_EJB_TYPE_EMPTY;
- public static String INTERFACE_SELECTION_DIALOG_DESC;
- public static String ADD_LABEL;
- public static String JAVA_CLASS_BROWER_DIALOG_MESSAGE;
- public static String ERR_DESTINATIONTYPE_VALUE;
- public static String JAVA_CLASS_METHOD_STUBS_LABEL;
- public static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
- public static String DEFAULT_PACKAGE;
- public static String BROWSE_BUTTON_LABEL;
- public static String REMOVE_BUTTON;
- public static String ERR_JNDI_NAME_EMPTY;
- public static String ERR_EJB_CLASS_NAME_USED;
- public static String CLASS_NAME_LABEL;
- public static String STATELESS_LABEL;
- public static String JAVA_PACKAGE_LABEL;
- public static String PACKAGE_SELECTION_DIALOG_TITLE;
- public static String ADD_BUTTON_LABEL;
- public static String ADD_EJB_WIZARD_PAGE_TITLE;
- public static String _10;
- public static String SUPERCLASS_SELECTION_DIALOG_DESC;
- public static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
- public static String REMOVE_BUTTON_LABEL;
- public static String ERR_EJB_NAME_EMPTY;
- public static String INTERFACE_SELECTION_DIALOG_TITLE;
- public static String NAME_LABEL;
- public static String VALUE_LABEL;
- public static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
- public static String JNDI_NAME_LABEL;
- public static String JAVA_CLASS_INTERFACES_LABEL;
- public static String SELECT_CLASS_TITLE;
- public static String NO_EJB_PROJECTS;
- public static String ERR_TRANSACTION_VALUE;
- public static String ENTITY_USECASE_LABEL;
- public static String DATASOURCE_NAME_LABEL;
-
- public static String ERR_NO_ATTRIBUTES;
- public static String ERR_DUPLICATE_ATTRIBUTES;
- public static String ERR_NO_KEY;
-
-
- public static String ADD_EJB_CMPWIZARD_PAGE_DESC;
- public static String ADD_EJB_CMPWIZARD_PAGE_TITLE;
- public static String CMP_FROM_TABLE;
- public static String CMP_FROM_BEAN;
- public static String ERR_CMP_CONNECTION_SUCCESS;
- public static String ERR_CMP_NO_CONNECTION;
- public static String CMP_CONNECTION_VALUE;
- public static String CMP_CONNECTION_PROPERTY;
- public static String CMP_CONNECTION_PROPERTIES;
- public static String CMP_CONNECTION_AVAILABLE;
- public static String CMP_CONNECTION_NEW_BUTTON;
- public static String CMP_CONNECTION_PAGE_DESC;
- public static String CMP_CONNECTION_PAGE_TITLE;
- public static String ADD_CMP_TABLE_WIZARD_PAGE_DESC;
- public static String ADD_CMP_TABLE_WIZARD_PAGE_TITLE;
- public static String CMP_TABLE_CHOOSE_TABLE;
- public static String CANNOT_CONNECT;
- public static String CHECK_PROPERTIES;
- public static String CMP_MANAGED_FIELDS;
- public static String ATTRIBUTE_NAME;
- public static String ATTRIBUTE_COLUMN;
- public static String ATTRIBUTE_TYPE;
- public static String ATTRIBUTE_JDBCTYPE;
- public static String ATTRIBUTE_SQLTYPE;
- public static String ATTRIBUTE_COLUMNSIZE;
- public static String ATTRIBUTE_DECIMALDIGITS;
- public static String ATTRIBUTE_READONLY;
- public static String ATTRIBUTE_ISKEY;
- public static String ATTRIBUTE_ADD;
- public static String ATTRIBUTE_REMOVE;
- public static String ERR_CMP_INVALID_TABLE;
- public static String SCHEMA_NAME_LABEL;
- public static String ERR_CMP_INVALID_VERSION;
- public static String ENTITY_VERSION_LABEL;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EJBAnnotationMessages.class);
- }
-
- public static final String IMAGE_LOAD_ERROR = _0;
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/messages/IEJBAnnotationConstants.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/messages/IEJBAnnotationConstants.java
deleted file mode 100644
index 209eefc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/messages/IEJBAnnotationConstants.java
+++ /dev/null
@@ -1,136 +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.annotation.internal.messages;
-
-
-
-public interface IEJBAnnotationConstants {
-
- public static final String ERR_EJB_CLASS_NAME_USED = EJBAnnotationMessages.ERR_EJB_CLASS_NAME_USED;
- public static final String ERR_EJB_NAME_EMPTY = EJBAnnotationMessages.ERR_EJB_NAME_EMPTY;
- public static final String ERR_EJB_TYPE_EMPTY = EJBAnnotationMessages.ERR_EJB_TYPE_EMPTY;;
- public static final String ERR_EJB_TYPE_EXISTS = EJBAnnotationMessages.ERR_EJB_TYPE_EXISTS;;
- public static final String ERR_EJB_TYPE_VALUE = EJBAnnotationMessages.ERR_EJB_TYPE_VALUE;;
- public static final String ERR_CLASS_NAME_MUSTEND_WITH_BEAN = EJBAnnotationMessages.ERR_CLASS_NAME_MUSTEND_WITH_BEAN;
- public static final String ERR_EJB_NAME_ENDS_WITH_BEAN = EJBAnnotationMessages.ERR_EJB_NAME_ENDS_WITH_BEAN;
- public static final String ERR_DISPLAY_NAME_EMPTY = EJBAnnotationMessages.ERR_DISPLAY_NAME_EMPTY;
- public static final String ERR_EJB_DISPLAY_NAME_USED = EJBAnnotationMessages.ERR_EJB_DISPLAY_NAME_USED;
- public static final String ERR_STATELESS_EMPTY = EJBAnnotationMessages.ERR_STATELESS_EMPTY;
- public static final String ERR_STATELESS_VALUE = EJBAnnotationMessages.ERR_STATELESS_VALUE;
- public static final String ERR_JNDI_NAME_EMPTY = EJBAnnotationMessages.ERR_JNDI_NAME_EMPTY;
- public static final String ERR_JNDI_NAME_VALUE = EJBAnnotationMessages.ERR_JNDI_NAME_VALUE;
- public static final String ERR_TRANSACTION_EMPTY = EJBAnnotationMessages.ERR_TRANSACTION_EMPTY;
- public static final String ERR_TRANSACTION_VALUE = EJBAnnotationMessages.ERR_TRANSACTION_VALUE;
- public static final String ERR_DESTINATIONTYPE_EMPTY = EJBAnnotationMessages.ERR_DESTINATIONTYPE_EMPTY;
- public static final String ERR_DESTINATIONTYPE_VALUE = EJBAnnotationMessages.ERR_DESTINATIONTYPE_VALUE;
- public static final String ERR_MUST_ENTER_A_PACKAGE_NAME = EJBAnnotationMessages.ERR_MUST_ENTER_A_PACKAGE_NAME;
-
- // AddEjbWizard
- public final static String ADD_EJB_WIZARD_WINDOW_TITLE = EJBAnnotationMessages.ADD_EJB_WIZARD_WINDOW_TITLE;
- public final static String ADD_EJB_WIZARD_PAGE_TITLE = EJBAnnotationMessages.ADD_EJB_WIZARD_PAGE_TITLE;
- public static final String ADD_EJB_WIZARD_PAGE_DESC = EJBAnnotationMessages.ADD_EJB_WIZARD_PAGE_DESC;
-
- public final static String DEFAULT_PACKAGE = EJBAnnotationMessages.DEFAULT_PACKAGE;
- public final static String SELECT_CLASS_TITLE = EJBAnnotationMessages.SELECT_CLASS_TITLE;
-
-
- // common
-
- public final static String EJB_NAME_LABEL = EJBAnnotationMessages.EJB_NAME_LABEL;
- public final static String DESCRIPTION_LABEL = EJBAnnotationMessages.DESCRIPTION_LABEL;
- public static final String NAME_LABEL = EJBAnnotationMessages.NAME_LABEL;
- public static final String JNDI_NAME_LABEL = EJBAnnotationMessages.JNDI_NAME_LABEL;
- public static final String STATELESS_LABEL = EJBAnnotationMessages.STATELESS_LABEL;
- public static final String TRANSACTION_LABEL = EJBAnnotationMessages.TRANSACTION_LABEL;
- public static final String DESTINATION_LABEL = EJBAnnotationMessages.DESTINATION_LABEL;
- public static final String DESTINATION_NAME_LABEL = EJBAnnotationMessages.DESTINATION_NAME_LABEL;
- public static final String DISPLAY_NAME_LABEL = EJBAnnotationMessages.DISPLAY_NAME_LABEL;
-
-
- public final static String ADD_BUTTON_LABEL = EJBAnnotationMessages.ADD_BUTTON_LABEL;
- public final static String FOLDER_LABEL = EJBAnnotationMessages.FOLDER_LABEL;
- public final static String JAVA_PACKAGE_LABEL = EJBAnnotationMessages.JAVA_PACKAGE_LABEL;
- public final static String CLASS_NAME_LABEL = EJBAnnotationMessages.CLASS_NAME_LABEL;
- public final static String SUPERCLASS_LABEL = EJBAnnotationMessages.SUPERCLASS_LABEL;
- public final static String CONTAINER_SELECTION_DIALOG_TITLE = EJBAnnotationMessages.CONTAINER_SELECTION_DIALOG_TITLE;
- public final static String CONTAINER_SELECTION_DIALOG_DESC = EJBAnnotationMessages.CONTAINER_SELECTION_DIALOG_DESC;
- public final static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG = EJBAnnotationMessages.CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG;
- public final static String PACKAGE_SELECTION_DIALOG_TITLE = EJBAnnotationMessages.PACKAGE_SELECTION_DIALOG_TITLE;
- public final static String PACKAGE_SELECTION_DIALOG_DESC = EJBAnnotationMessages.PACKAGE_SELECTION_DIALOG_DESC;
- public final static String PACKAGE_SELECTION_DIALOG_MSG_NONE = EJBAnnotationMessages.PACKAGE_SELECTION_DIALOG_MSG_NONE;
- public final static String SUPERCLASS_SELECTION_DIALOG_TITLE = EJBAnnotationMessages.SUPERCLASS_SELECTION_DIALOG_TITLE;
- public final static String SUPERCLASS_SELECTION_DIALOG_DESC = EJBAnnotationMessages.SUPERCLASS_SELECTION_DIALOG_DESC;
- public final static String INTERFACE_SELECTION_DIALOG_TITLE = EJBAnnotationMessages.INTERFACE_SELECTION_DIALOG_TITLE;
- public final static String INTERFACE_SELECTION_DIALOG_DESC = EJBAnnotationMessages.INTERFACE_SELECTION_DIALOG_DESC;
- public final static String INTERFACE_SELECTION_DIALOG_MSG_NONE = EJBAnnotationMessages.INTERFACE_SELECTION_DIALOG_MSG_NONE;
- public final static String JAVA_CLASS_MODIFIERS_LABEL = EJBAnnotationMessages.JAVA_CLASS_MODIFIERS_LABEL;
- public final static String JAVA_CLASS_INTERFACES_LABEL = EJBAnnotationMessages.JAVA_CLASS_INTERFACES_LABEL;
- public final static String JAVA_CLASS_METHOD_STUBS_LABEL = EJBAnnotationMessages.JAVA_CLASS_METHOD_STUBS_LABEL;
- public final static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL = EJBAnnotationMessages.JAVA_CLASS_PUBLIC_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL = EJBAnnotationMessages.JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_FINAL_CHECKBOX_LABEL = EJBAnnotationMessages.JAVA_CLASS_FINAL_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL = EJBAnnotationMessages.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_MAIN_CHECKBOX_LABEL = EJBAnnotationMessages.JAVA_CLASS_MAIN_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL = EJBAnnotationMessages.JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_BROWER_DIALOG_TITLE = EJBAnnotationMessages.JAVA_CLASS_BROWER_DIALOG_TITLE;
- public final static String JAVA_CLASS_BROWER_DIALOG_MESSAGE = EJBAnnotationMessages.JAVA_CLASS_BROWER_DIALOG_MESSAGE;
-
- public final static String VALUE_LABEL = EJBAnnotationMessages.VALUE_LABEL;
- public final static String EMPTY_STRING = ""; //$NON-NLS-1$
- public final static String BROWSE_BUTTON_LABEL = EJBAnnotationMessages.BROWSE_BUTTON_LABEL;
- public static final String REMOVE_BUTTON = EJBAnnotationMessages.REMOVE_BUTTON;
-
- public final static String NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC = EJBAnnotationMessages.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
- public final static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC = EJBAnnotationMessages.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-
- public final static String NO_EJB_PROJECTS = EJBAnnotationMessages.NO_EJB_PROJECTS;
- public static final String ENTITY_USECASE_LABEL = EJBAnnotationMessages.ENTITY_USECASE_LABEL;
- public static final String DATASOURCE_NAME_LABEL = EJBAnnotationMessages.DATASOURCE_NAME_LABEL;
-
-
- public static final String ERR_NO_ATTRIBUTES = EJBAnnotationMessages.ERR_NO_ATTRIBUTES;
- public static final String ERR_DUPLICATE_ATTRIBUTES = EJBAnnotationMessages.ERR_DUPLICATE_ATTRIBUTES;
- public static final String ERR_NO_KEY = EJBAnnotationMessages.ERR_NO_KEY;
-
- public static final String ADD_EJB_CMPWIZARD_PAGE_DESC = EJBAnnotationMessages.ADD_EJB_CMPWIZARD_PAGE_DESC;
- public static final String ADD_EJB_CMPWIZARD_PAGE_TITLE = EJBAnnotationMessages.ADD_EJB_CMPWIZARD_PAGE_TITLE;
- public static final String CMP_FROM_TABLE = EJBAnnotationMessages.CMP_FROM_TABLE;
- public static final String CMP_FROM_BEAN = EJBAnnotationMessages.CMP_FROM_BEAN;
- public static final String ERR_CMP_CONNECTION_SUCCESS = EJBAnnotationMessages.ERR_CMP_CONNECTION_SUCCESS;
- public static final String ERR_CMP_NO_CONNECTION = EJBAnnotationMessages.ERR_CMP_NO_CONNECTION;
- public static final String CMP_CONNECTION_VALUE = EJBAnnotationMessages.CMP_CONNECTION_VALUE;
- public static final String CMP_CONNECTION_PROPERTY = EJBAnnotationMessages.CMP_CONNECTION_PROPERTY;
- public static final String CMP_CONNECTION_PROPERTIES = EJBAnnotationMessages.CMP_CONNECTION_PROPERTIES;
- public static final String CMP_CONNECTION_AVAILABLE = EJBAnnotationMessages.CMP_CONNECTION_AVAILABLE;
- public static final String CMP_CONNECTION_NEW_BUTTON = EJBAnnotationMessages.CMP_CONNECTION_NEW_BUTTON;
- public static final String CMP_CONNECTION_PAGE_DESC = EJBAnnotationMessages.CMP_CONNECTION_PAGE_DESC;
- public static final String CMP_CONNECTION_PAGE_TITLE = EJBAnnotationMessages.CMP_CONNECTION_PAGE_TITLE;
-
- public static final String ADD_CMP_TABLE_WIZARD_PAGE_DESC = EJBAnnotationMessages.ADD_CMP_TABLE_WIZARD_PAGE_DESC;
- public static final String ADD_CMP_TABLE_WIZARD_PAGE_TITLE = EJBAnnotationMessages.ADD_CMP_TABLE_WIZARD_PAGE_TITLE;
- public static final String CMP_TABLE_CHOOSE_TABLE = EJBAnnotationMessages.CMP_TABLE_CHOOSE_TABLE;
- public static final String CANNOT_CONNECT = EJBAnnotationMessages.CANNOT_CONNECT;
- public static final String CHECK_PROPERTIES = EJBAnnotationMessages.CHECK_PROPERTIES;
- public static final String CMP_MANAGED_FIELDS = EJBAnnotationMessages.CMP_MANAGED_FIELDS;
- public static final String ATTRIBUTE_NAME = EJBAnnotationMessages.ATTRIBUTE_NAME;
- public static final String ATTRIBUTE_COLUMN = EJBAnnotationMessages.ATTRIBUTE_COLUMN;
- public static final String ATTRIBUTE_TYPE = EJBAnnotationMessages.ATTRIBUTE_TYPE;
- public static final String ATTRIBUTE_JDBCTYPE = EJBAnnotationMessages.ATTRIBUTE_JDBCTYPE;
- public static final String ATTRIBUTE_SQLTYPE = EJBAnnotationMessages.ATTRIBUTE_SQLTYPE;
- public static final String ATTRIBUTE_COLUMNSIZE = EJBAnnotationMessages.ATTRIBUTE_COLUMNSIZE;
- public static final String ATTRIBUTE_DECIMALDIGITS = EJBAnnotationMessages.ATTRIBUTE_DECIMALDIGITS;
- public static final String ATTRIBUTE_READONLY = EJBAnnotationMessages.ATTRIBUTE_READONLY;
- public static final String ATTRIBUTE_ISKEY = EJBAnnotationMessages.ATTRIBUTE_ISKEY;
- public static final String ATTRIBUTE_ADD = EJBAnnotationMessages.ATTRIBUTE_ADD;
- public static final String ATTRIBUTE_REMOVE = EJBAnnotationMessages.ATTRIBUTE_REMOVE;
- public static final String ERR_CMP_INVALID_TABLE = EJBAnnotationMessages.ERR_CMP_INVALID_TABLE;
- public static final String SCHEMA_NAME_LABEL = EJBAnnotationMessages.SCHEMA_NAME_LABEL;
- public static final String ERR_CMP_INVALID_VERSION = EJBAnnotationMessages.ERR_CMP_INVALID_VERSION;
- public static final String ENTITY_VERSION_LABEL = EJBAnnotationMessages.ENTITY_VERSION_LABEL;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/CMPAttributeDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/CMPAttributeDelegate.java
deleted file mode 100644
index 694cc83..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/CMPAttributeDelegate.java
+++ /dev/null
@@ -1,191 +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.annotation.internal.model;
-
-public class CMPAttributeDelegate {
- private String name;
- private String attributeType;
- private String sqlType;
- private boolean isKey = false;
- private boolean isTransient = false;
- private String columnName;
- private String jdbcType;
- private boolean isReadOnly;
-
- private int columnSize;
- private int decimalDigits;
-
- public CMPAttributeDelegate() {
- this.name = "aField";
- this.attributeType = "java.lang.String";
- this.jdbcType = "VARCHAR";
- this.sqlType = "VARCHAR";
- this.columnName = "ACOLUMN";
- this.columnSize = 0;
- this.decimalDigits = 0;
- }
-
- /**
- * @return Returns the attributeType.
- */
- public String getAttributeType() {
- return attributeType;
- }
-
- /**
- * @param attributeType
- * The attributeType to set.
- */
- public void setAttributeType(String attributeType) {
- this.attributeType = attributeType;
- }
-
- /**
- * @return Returns the columnName.
- */
- public String getColumnName() {
- return columnName;
- }
-
- /**
- * @param columnName
- * The columnName to set.
- */
- public void setColumnName(String columnName) {
- this.columnName = columnName;
- }
-
- /**
- * @return Returns the isKey.
- */
- public boolean isKey() {
- return isKey;
- }
-
- /**
- * @param isKey
- * The isKey to set.
- */
- public void setKey(boolean isKey) {
- this.isKey = isKey;
- }
-
- /**
- * @return Returns the isReadOnly.
- */
- public boolean isReadOnly() {
- return isReadOnly;
- }
-
- /**
- * @param isReadOnly
- * The isReadOnly to set.
- */
- public void setReadOnly(boolean isReadOnly) {
- this.isReadOnly = isReadOnly;
- }
-
- /**
- * @return Returns the isTransient.
- */
- public boolean isTransient() {
- return isTransient;
- }
-
- /**
- * @param isTransient
- * The isTransient to set.
- */
- public void setTransient(boolean isTransient) {
- this.isTransient = isTransient;
- }
-
- /**
- * @return Returns the jdbcType.
- */
- public String getJdbcType() {
- return jdbcType;
- }
-
- /**
- * @param jdbcType
- * The jdbcType to set.
- */
- public void setJdbcType(String jdbcType) {
- this.jdbcType = jdbcType;
- }
-
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name
- * The name to set.
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return Returns the sqlType.
- */
- public String getSqlType() {
- return sqlType;
- }
- /**
- * @return Returns the sqlType.
- */
- public String getSqlTypeDecl() {
- String response = this.sqlType;
- if (isVariableSizedType()) {
- response += ("("+columnSize);
- if (isDecimal())
- response += (","+decimalDigits);
- response += ")";
- }
- return response;
- }
-
- public boolean isDecimal() {
- return sqlType.equalsIgnoreCase("DECIMAL");
- }
-
- public boolean isVariableSizedType() {
- return isDecimal() || sqlType.equalsIgnoreCase("VARCHAR") || sqlType.equalsIgnoreCase("CHAR") || sqlType.equalsIgnoreCase("CLOB") || sqlType.equalsIgnoreCase("BLOB");
- }
-
- /**
- * @param sqlType
- * The sqlType to set.
- */
- public void setSqlType(String sqlType) {
- this.sqlType = sqlType;
- }
-
- public int getColumnSize() {
- return columnSize;
- }
-
- public void setColumnSize(int columnSize) {
- this.columnSize = columnSize;
- }
-
- public int getDecimalDigits() {
- return decimalDigits;
- }
-
- public void setDecimalDigits(int decimalDigits) {
- this.decimalDigits = decimalDigits;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ContainerManagedEntityBeanDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ContainerManagedEntityBeanDataModelProvider.java
deleted file mode 100644
index d45700c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ContainerManagedEntityBeanDataModelProvider.java
+++ /dev/null
@@ -1,214 +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.annotation.internal.model;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.operations.AddContainerManagedEntityBeanOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class ContainerManagedEntityBeanDataModelProvider extends EnterpriseBeanClassDataModelProvider implements
- IContainerManagedEntityBeanDataModelProperties {
-
- public final static String DEFAULT_EJB_SUPERCLASS = "java.lang.Object"; //$NON-NLS-1$
- public final static String[] DEFAULT_EJB_INTERFACES = { "javax.ejb.EntityBean" }; //$NON-NLS-1$ //$NON-NLS-2$
-
- private List interfaceList;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultOperation()
- */
- public IDataModelOperation getDefaultOperation() {
- AddContainerManagedEntityBeanOperation operation = new AddContainerManagedEntityBeanOperation(getDataModel());
- getDataModel().getProperty(IEnterpriseBeanClassDataModelProperties.MODELDELEGATE);
- return operation;
- }
-
- /**
- * Subclasses may extend this method to add their own data model's
- * properties as valid base properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(DATASOURCE);
- propertyNames.add(SCHEMA);
- propertyNames.add(TABLE);
- propertyNames.add(ATTRIBUTES);
- propertyNames.add(VERSION);
- propertyNames.add(EJB_INTERFACES);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(USE_ANNOTATIONS))
- return Boolean.FALSE;
- else if (propertyName.equals(DATASOURCE))
- return getProperty(JNDI_NAME);
- else if (propertyName.equals(EJB_TYPE))
- return "EntityBean";
- else if (propertyName.equals(MODIFIER_ABSTRACT))
- return Boolean.TRUE;
- else if (propertyName.equals(SUPERCLASS))
- return DEFAULT_EJB_SUPERCLASS;
- else if (propertyName.equals(EJB_INTERFACES))
- return DEFAULT_EJB_INTERFACES;
- else if (propertyName.equals(SCHEMA))
- return this.getProperty(EJB_NAME)+"SCHEMA";
- else if (propertyName.equals(TABLE))
- return "MYTABLE";
- else if (propertyName.equals(ATTRIBUTES))
- return new ArrayList();
- else if (propertyName.equals(VERSION))
- return ContainerManagedEntity.VERSION_2_X;
- return super.getDefaultProperty(propertyName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
- */
- public IStatus validate(String propertyName) {
- if (propertyName.equals(DATASOURCE))
- return validateJndiName(getStringProperty(propertyName));
- if (propertyName.equals(TABLE))
- return validateTable(getStringProperty(propertyName));
- if (propertyName.equals(SCHEMA))
- return validateJndiName(getStringProperty(propertyName));
- if (propertyName.equals(ATTRIBUTES))
- return validateAttributes(getProperty(propertyName));
- if (propertyName.equals(VERSION))
- return validateVersion((String)getProperty(propertyName));
- return super.validate(propertyName);
- }
-
- protected IStatus validateTable(String prop) {
- // check for empty
- if (prop == null || prop.trim().length() == 0 || prop.indexOf(" ") >= 0) {
- String msg = IEJBAnnotationConstants.ERR_CMP_INVALID_TABLE;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
-
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected IStatus validateVersion(String prop) {
- // check for empty
- if (prop == null || prop.trim().length() == 0 || prop.indexOf(" ") >= 0) {
- String msg = IEJBAnnotationConstants.ERR_CMP_INVALID_VERSION;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
-
- if (!(ContainerManagedEntity.VERSION_1_X.equals(prop) || ContainerManagedEntity.VERSION_2_X.equals(prop))) {
- String msg = IEJBAnnotationConstants.ERR_CMP_INVALID_VERSION;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
-
- return WTPCommonPlugin.OK_STATUS;
- }
-
- private IStatus validateAttributes(Object property) {
- ArrayList attributes = (ArrayList) property;
- if (attributes == null || attributes.size() == 0) {
- String msg = IEJBAnnotationConstants.ERR_NO_ATTRIBUTES;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
-
- // No two fields should have the same name/column
- Iterator attributeNames = attributes.iterator();
- boolean duplicate = false;
-
- while (attributeNames.hasNext() && duplicate == false) {
- CMPAttributeDelegate aRow = (CMPAttributeDelegate) attributeNames.next();
- Iterator otherNames = attributes.iterator();
- while (otherNames.hasNext()) {
- CMPAttributeDelegate otherRow = (CMPAttributeDelegate) otherNames.next();
- if (aRow != otherRow && aRow.getName().equals(otherRow.getName())) {
- duplicate = true;
- break;
- }
- if (aRow != otherRow && aRow.getColumnName().equals(otherRow.getColumnName())) {
- duplicate = true;
- break;
- }
- }
- }
- if (duplicate)
- return WTPCommonPlugin.createErrorStatus(IEJBAnnotationConstants.ERR_DUPLICATE_ATTRIBUTES);
-
- // There should be at least one primary key field
- attributeNames = attributes.iterator();
- int primaryKey = 0;
- while (attributeNames.hasNext() && duplicate == false) {
- CMPAttributeDelegate aRow = (CMPAttributeDelegate) attributeNames.next();
- if (aRow.isKey())
- primaryKey++;
- }
-
- if (primaryKey == 0)
- return WTPCommonPlugin.createErrorStatus(IEJBAnnotationConstants.ERR_NO_KEY);
-
- return WTPCommonPlugin.OK_STATUS;
-
- }
-
- public List getCMPAttributes() {
- List attributes = (List) getProperty(ATTRIBUTES);
- return attributes;
- }
-
- protected List getEJBInterfaces() {
- if (this.interfaceList == null) {
- this.interfaceList = new ArrayList();
- for (int i = 0; i < ((String[]) getProperty(EJB_INTERFACES)).length; i++) {
- this.interfaceList.add(((String[]) getProperty(EJB_INTERFACES))[i]);
- }
- }
- return this.interfaceList;
- }
-
- protected void initializeDelegate() {
- ContainerManagedEntityBeanDelegate delegate = new ContainerManagedEntityBeanDelegate();
- delegate.setDataModel(getDataModel());
- this.setProperty(MODELDELEGATE, delegate);
-
- // Set the defaults so that they are propagated via events
- this.setProperty(DATASOURCE, this.getProperty(DATASOURCE));
- this.setProperty(SCHEMA, this.getProperty(SCHEMA));
- this.setProperty(TABLE, this.getProperty(TABLE));
- this.setProperty(ATTRIBUTES, this.getProperty(ATTRIBUTES));
- this.setProperty(VERSION, this.getProperty(VERSION));
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
-
- boolean result = super.propertySet(propertyName, propertyValue);
-
- if (propertyName.equals(EJB_NAME)) {
- if (!isPropertySet(DATASOURCE))
- getDataModel().notifyPropertyChange(DATASOURCE, IDataModel.DEFAULT_CHG);
- if (!isPropertySet(SCHEMA))
- getDataModel().notifyPropertyChange(SCHEMA, IDataModel.DEFAULT_CHG);
- }
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ContainerManagedEntityBeanDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ContainerManagedEntityBeanDelegate.java
deleted file mode 100644
index 37a4483..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ContainerManagedEntityBeanDelegate.java
+++ /dev/null
@@ -1,133 +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.annotation.internal.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ContainerManagedEntityBeanDelegate extends EnterpriseBeanDelegate implements IContainerManagedEntityBean {
-
- public static final String BMP = "BMP";
- public static final String CMP = "CMP";
-
- public ContainerManagedEntityBeanDelegate() {
- super();
- ContainerManagedEntity entity = EjbFactory.eINSTANCE.createContainerManagedEntity();
- this.setEnterpriseBean(entity);
- }
-
- public void setDataModel(IDataModel dataModel) {
- super.setDataModel(dataModel);
- String schema = dataModel.getStringProperty(IContainerManagedEntityBeanDataModelProperties.SCHEMA);
- ContainerManagedEntity entity = (ContainerManagedEntity) this.getEnterpriseBean();
- entity.setAbstractSchemaName(schema);
-
- }
-
- public String getType() {
- return CMP;
- }
-
- public String getTransactionType() {
- return TransactionType.CONTAINER_LITERAL.getName();
- }
-
- public void propertyChanged(DataModelEvent event) {
- super.propertyChanged(event);
- String property = event.getPropertyName();
- Object propertyValue = event.getProperty();
- ContainerManagedEntity entity = (ContainerManagedEntity) this.getEnterpriseBean();
- if (entity == null)
- return;
-
- if (IContainerManagedEntityBeanDataModelProperties.SCHEMA.equals(property)) {
- entity.setAbstractSchemaName((String) propertyValue);
- }
- }
-
- public String getDatasource() {
- return this.getDataModel().getStringProperty(IContainerManagedEntityBeanDataModelProperties.DATASOURCE);
- }
-
- public String getSchema() {
- ContainerManagedEntity entity = (ContainerManagedEntity) this.getEnterpriseBean();
- return entity.getAbstractSchemaName();
- }
-
- public String getTable() {
- return this.getDataModel().getStringProperty(IContainerManagedEntityBeanDataModelProperties.TABLE);
- }
-
-
- public List getAttributes() {
- return (List) this.getDataModel().getProperty(IContainerManagedEntityBeanDataModelProperties.ATTRIBUTES);
- }
-
- public void setAttributes(HashMap attr) {
- this.getDataModel().setProperty(IContainerManagedEntityBeanDataModelProperties.ATTRIBUTES,attr);
- }
-
- public void setAtribute(String name, String jtype, String stype, String description, boolean isPrimary, boolean isTransient) {
- ContainerManagedEntity entity = (ContainerManagedEntity) this.getEnterpriseBean();
- CMPAttribute attribute = null;
- if (isPrimary)
- attribute = entity.addKeyAttributeName(name);
- else
- attribute = entity.addPersistentAttributeName(name);
- // If the class doesn't exist, it will be reflected
-
- // JavaHelpers helper = JavaRefFactory.eINSTANCE.reflectType(type,
- // (ResourceSet) nature.getResourceSet());
- // attribute.setOriginatingType(helper);
- attribute.setDescription(description);
- attribute.setTransient(isTransient);
-
- }
- public void removeAttribute(String name) {
-
- ContainerManagedEntity entity = (ContainerManagedEntity) this.getEnterpriseBean();
- entity.removePersistentAttribute(name);
- }
-
- public String getPrimaryKeyClass() {
- java.util.List keys = getKeyAttributes();
-
- if( keys.size() > 1)
- return this.getSimpleClassName() + ".PrimaryKey";
- else if( keys.size() == 1)
- return ((CMPAttributeDelegate)keys.get(0)).getAttributeType();
- return "java.lang.String";
- }
-
- public List getKeyAttributes() {
- Iterator attributes = getAttributes().iterator();
- ArrayList keys = new ArrayList();
- while (attributes.hasNext()) {
- CMPAttributeDelegate attribute = (CMPAttributeDelegate) attributes.next();
- if(attribute.isKey())
- keys.add(attribute);
-
- }
- return keys;
- }
-
- public String getVersion() {
- return this.getDataModel().getStringProperty(IContainerManagedEntityBeanDataModelProperties.VERSION);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/EnterpriseBeanClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/EnterpriseBeanClassDataModelProvider.java
deleted file mode 100644
index 2d0447e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/EnterpriseBeanClassDataModelProvider.java
+++ /dev/null
@@ -1,358 +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.annotation.internal.model;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.utility.AnnotationUtilities;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public abstract class EnterpriseBeanClassDataModelProvider extends NewJavaClassDataModelProvider implements IEnterpriseBeanClassDataModelProperties {
-
- public EnterpriseBeanClassDataModelProvider() {
- super();
- // initializeDelegate();
- }
-
- protected abstract void initializeDelegate();
-
- /**
- * Subclasses may extend this method to add their own data model's properties as valid base
- * properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(USE_ANNOTATIONS);
- propertyNames.add(EJB_TYPE);
- propertyNames.add(EJB_NAME);
- propertyNames.add(DISPLAY_NAME);
- propertyNames.add(JNDI_NAME);
- propertyNames.add(DESCRIPTION);
- propertyNames.add(CLASS_NAME);
- propertyNames.add(TRANSACTIONTYPE);
- propertyNames.add(ANNOTATIONPROVIDER);
- propertyNames.add(MODELDELEGATE);
- propertyNames.add(INTERFACES_AS_STRING);
- return propertyNames;
- }
-
- /**
- * Subclasses may extend this method to provide their own determination of whether or not
- * certain properties should be disabled or enabled. This method does not accept null parameter.
- * It will not return null. This implementation makes sure annotation support is only allowed on
- * web projects of J2EE version 1.3 or higher.
- *
- * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel#basicIsEnabled(String)
- * @see IAnnotationsDataModel#USE_ANNOTATIONS
- *
- * @param propertyName
- * @return Boolean should property be enabled?
- */
- public boolean isPropertyEnabled(String propertyName) {
- // Annotations should only be enabled on a valid j2ee project of version 1.3 or higher
- if (USE_ANNOTATIONS.equals(propertyName)) {
- return true;
- // if (!isAnnotationsSupported())
- // return Boolean.FALSE;
- // return Boolean.TRUE;
- }
- // Otherwise return super implementation
- return super.isPropertyEnabled(propertyName);
- }
-
-
- protected boolean isAnnotationsSupported() {
- if (getTargetProject() == null || getTargetComponent() == null)
- return true;
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(getTargetProject());
- if (ejbEdit == null)
- return false;
- return ejbEdit.getJ2EEVersion() > J2EEVersionConstants.VERSION_1_2;
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- } finally {
- if (ejbEdit != null)
- ejbEdit.dispose();
- }
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
-
- boolean result = super.propertySet(propertyName, propertyValue);
- // After the property is set, if project changed, update the nature and the annotations
- // enablement
- if (propertyName.equals(COMPONENT_NAME)) {
- getDataModel().notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
- } else if (propertyName.equals(CLASS_NAME)) {
- if (!isPropertySet(EJB_NAME))
- getDataModel().notifyPropertyChange(EJB_NAME, IDataModel.DEFAULT_CHG);
- } else if (propertyName.equals(EJB_NAME)) {
- if (!isPropertySet(JNDI_NAME))
- getDataModel().notifyPropertyChange(JNDI_NAME, IDataModel.DEFAULT_CHG);
- if (!isPropertySet(DISPLAY_NAME))
- getDataModel().notifyPropertyChange(DISPLAY_NAME, IDataModel.DEFAULT_CHG);
- if (!isPropertySet(DESCRIPTION))
- getDataModel().notifyPropertyChange(DESCRIPTION, IDataModel.DEFAULT_CHG);
- }
- return result;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(USE_ANNOTATIONS))
- return Boolean.TRUE;
- else if (propertyName.equals(CLASS_NAME))
- return "MyBean";
- else if (propertyName.equals(EJB_NAME)) {
- String className = getStringProperty(CLASS_NAME);
- if (className.endsWith("Bean"))
- className = className.substring(0, className.length() - 4);
- return className;
- } else if (propertyName.equals(JNDI_NAME)) {
- return getProperty(EJB_NAME);
- } else if (propertyName.equals(TRANSACTIONTYPE)) {
- return TransactionType.CONTAINER_LITERAL.getName();
- } else if (propertyName.equals(EJB_TYPE)) {
- return "SessionBean";
- } else if (propertyName.equals(DISPLAY_NAME)) {
- return getProperty(EJB_NAME);
- } else if (propertyName.equals(DESCRIPTION)) {
- return "An EJB named " + getStringProperty(EJB_NAME);
- } else if (propertyName.equals(INTERFACES))
- return getEJBInterfaces();
- else if (propertyName.equals(ANNOTATIONPROVIDER)) {
- String[] providers = AnnotationUtilities.getProviderNames();
- if (providers != null && providers.length > 0)
- return providers[0];
- } else if (propertyName.equals(SOURCE_FOLDER)) {
- try {
- Object srcFolder = super.getDefaultProperty(propertyName);
- return srcFolder;
- } catch (Exception e) {// Ignore
- }
- return ""; //$NON-NLS-1$
- } else if (propertyName.equals(INTERFACES_AS_STRING))
- return getInterfacesString();
- else if (propertyName.equals(MODELDELEGATE)) {
- initializeDelegate();
- return getProperty(MODELDELEGATE);
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public IStatus validate(String propertyName) {
- if (propertyName.equals(JAVA_PACKAGE))
- return validateEjbJavaPackage(getStringProperty(propertyName));
- if (propertyName.equals(EJB_NAME))
- return validateEJBName(getStringProperty(propertyName));
- if (propertyName.equals(EJB_TYPE))
- return validateEJBType(getStringProperty(propertyName));
- if (propertyName.equals(JNDI_NAME))
- return validateJndiName(getStringProperty(propertyName));
- if (propertyName.equals(DISPLAY_NAME))
- return validateDisplayName(getStringProperty(propertyName));
- if (propertyName.equals(CLASS_NAME))
- return validateClassName(getStringProperty(propertyName));
- if (propertyName.equals(TRANSACTIONTYPE))
- return validateTransaction(getStringProperty(propertyName));
- return super.validate(propertyName);
- }
-
- protected IStatus validateClassName(String className) {
- IStatus status = this.validateJavaClassName(className);
- if (status.isOK())
- status = canCreateTypeInClasspath(className);
- if (status != WTPCommonPlugin.OK_STATUS)
- return status;
-
- if (className.equals("Bean") || className.equals("EJB")) {
-
- } else if ((className.endsWith("Bean") || className.endsWith("EJB")))
- return status;
- String msg = IEJBAnnotationConstants.ERR_CLASS_NAME_MUSTEND_WITH_BEAN;
- return WTPCommonPlugin.createErrorStatus(msg);
-
- }
-
- protected IStatus validateEjbJavaPackage(String packageName) {
- if (packageName != null && packageName.trim().length() > 0) {
- // Use standard java conventions to validate the package name
- IStatus javaStatus = JavaConventions.validatePackageName(packageName);
- if (javaStatus.getSeverity() == IStatus.ERROR) {
- String msg = J2EECommonMessages.ERR_JAVA_PACAKGE_NAME_INVALID + javaStatus.getMessage();
- return WTPCommonPlugin.createErrorStatus(msg);
- } else if (javaStatus.getSeverity() == IStatus.WARNING) {
- String msg = J2EECommonMessages.ERR_JAVA_PACKAGE_NAME_WARNING + javaStatus.getMessage();
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- if (packageName == null || packageName.trim().length() == 0) {
- String msg = IEJBAnnotationConstants.ERR_MUST_ENTER_A_PACKAGE_NAME;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- return WTPCommonPlugin.OK_STATUS;
-
- }
-
- private IStatus validateEJBType(String prop) {
- // check for empty
- if (prop == null || prop.trim().length() == 0) {
- String msg = IEJBAnnotationConstants.ERR_EJB_TYPE_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (prop.indexOf("SessionBean") >= 0 || prop.indexOf("MessageDrivenBean") >= 0 || prop.indexOf("EntityBean") >= 0) {
- return WTPCommonPlugin.OK_STATUS;
- }
- String msg = IEJBAnnotationConstants.ERR_EJB_TYPE_VALUE;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
-
-
-
- private IStatus validateTransaction(String prop) {
- // check for empty
- if (prop == null || prop.trim().length() == 0) {
- String msg = IEJBAnnotationConstants.ERR_TRANSACTION_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (prop.indexOf("Container") >= 0 || prop.indexOf("Bean") >= 0) {
- return WTPCommonPlugin.OK_STATUS;
- }
- String msg = IEJBAnnotationConstants.ERR_TRANSACTION_VALUE;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
-
- protected IStatus validateJndiName(String prop) {
- // check for empty
- if (prop == null || prop.trim().length() == 0) {
- String msg = IEJBAnnotationConstants.ERR_JNDI_NAME_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (prop.indexOf(" ") >= 0) {
- String msg = IEJBAnnotationConstants.ERR_JNDI_NAME_VALUE;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- private IStatus validateEJBName(String prop) {
- // check for empty
- if (prop == null || prop.trim().length() == 0) {
- String msg = IEJBAnnotationConstants.ERR_EJB_NAME_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (prop.indexOf("Bean") >= 0) {
- String msg = IEJBAnnotationConstants.ERR_EJB_NAME_ENDS_WITH_BEAN;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected IStatus validateDisplayName(String prop) {
- // check for empty
- if (prop == null || prop.trim().length() == 0) {
- String msg = IEJBAnnotationConstants.ERR_DISPLAY_NAME_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (getTargetProject() == null)// || getComponent()==null)
- return WTPCommonPlugin.OK_STATUS;
- ArtifactEdit edit = null;
- try {
- //edit = getArtifactEditForRead();
- edit = ArtifactEdit.getArtifactEditForRead(getTargetProject());
- if (edit == null)
- return WTPCommonPlugin.OK_STATUS;
- EJBJar ejbJar = (EJBJar) edit.getContentModelRoot();
- if (ejbJar == null)
- return WTPCommonPlugin.OK_STATUS;
- List ejbs = ejbJar.getEnterpriseBeans();
- if (ejbs != null && ejbs.size() > 0) {
- for (int i = 0; i < ejbs.size(); i++) {
- EnterpriseBean ejb = (EnterpriseBean) ejbs.get(i);
- if (prop.equals(ejb.getDisplayName())) {
- String msg = IEJBAnnotationConstants.ERR_EJB_DISPLAY_NAME_USED;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- }
- } catch (Exception e) {
- // do nothing no DD no names to validate against
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected IStatus validateJavaClassName(String prop) {
- IStatus status = super.validateJavaClassName(prop);
- if( status == WTPCommonPlugin.OK_STATUS && getTargetProject() != null ){
- try {
- IJavaProject jProject = JavaCore.create(getTargetProject());
- String pName = getStringProperty(JAVA_PACKAGE);
- IType type = jProject.findType(pName + "." + prop);
- if(type != null ){
- String msg = IEJBAnnotationConstants.ERR_EJB_TYPE_EXISTS;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- } catch (JavaModelException e) {
- }
- }
-
- return status;
- }
-
- protected String getInterfacesString() {
- List ints = (List) this.getProperty(INTERFACES);
- Iterator iterator = ints.iterator();
- String intStr = (iterator.hasNext() ? (String) iterator.next() : getDefaultInterfaces());
- while (iterator.hasNext()) {
- String intrfc = (String) iterator.next();
- intStr += ", " + intrfc;
- }
-
- return intStr;
- }
-
- private String getDefaultInterfaces() {
- Iterator interfaces = getEJBInterfaces().iterator();
- String interfacesStr = (interfaces.hasNext() ? (String) interfaces.next() : "");
- while (interfaces.hasNext()) {
- interfacesStr = interfacesStr + ", " + (String) interfaces.next();
-
- }
- return interfacesStr;
- }
-
- protected abstract List getEJBInterfaces();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/EnterpriseBeanDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/EnterpriseBeanDelegate.java
deleted file mode 100644
index 1938fc4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/EnterpriseBeanDelegate.java
+++ /dev/null
@@ -1,140 +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.annotation.internal.model;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-/**
- * @author naci
- *
- */
-public abstract class EnterpriseBeanDelegate implements IEnterpriseBean, IDataModelListener {
-
- private final static String DEFAULT_DATA_MODEL="EnterpriseBeanDelegate.DATA_MODEL"; //$NON-NLS-1$
-
- private Map dataModels;
- private EnterpriseBean enterpriseBean;
-
- public EnterpriseBeanDelegate()
- {
- dataModels = new HashMap();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean#getEnterpriseBean()
- */
- public EnterpriseBean getEnterpriseBean() {
- return enterpriseBean;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean#getVersionID()
- */
- public int getVersionID() {
- return enterpriseBean.getVersionID();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean#getDataModel()
- */
- public IDataModel getDataModel() {
- return (IDataModel)dataModels.get(DEFAULT_DATA_MODEL);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean#getDataModel()
- */
- public void setDataModel(IDataModel dataModel) {
- if(this.getDataModel() != null)
- this.getDataModel().removeListener(this);
- dataModel.addListener(this);
- dataModels.put(DEFAULT_DATA_MODEL, dataModel);
- enterpriseBean.setName(dataModel.getStringProperty(IEnterpriseBeanClassDataModelProperties.EJB_NAME));
- enterpriseBean.setDescription(dataModel.getStringProperty(IEnterpriseBeanClassDataModelProperties.DESCRIPTION));
- enterpriseBean.setDisplayName(dataModel.getStringProperty(IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME));
- enterpriseBean.setEjbClassName(dataModel.getStringProperty(INewJavaClassDataModelProperties.QUALIFIED_CLASS_NAME));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean#getDataModelFor(java.lang.String)
- */
- public IDataModel getDataModelFor(String feature) {
- return (IDataModel)dataModels.get(feature);
- }
-
- public void setEnterpriseBean(EnterpriseBean enterpriseBean) {
- this.enterpriseBean = enterpriseBean;
- }
-
-
- public String getJndiName() {
- return getDataModel().getStringProperty(IEnterpriseBeanClassDataModelProperties.JNDI_NAME);
- }
-
- public String getEjbName() {
- return getDataModel().getStringProperty(IEnterpriseBeanClassDataModelProperties.EJB_NAME);
- }
-
- public String getInterfaces() {
- return getDataModel().getStringProperty(IEnterpriseBeanClassDataModelProperties.INTERFACES_AS_STRING);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.model.ISessionBeanDelegate#getSimpleClassName()
- */
- public String getSimpleClassName() {
- return getDataModel().getStringProperty(INewJavaClassDataModelProperties.CLASS_NAME);
- }
-
-
- public String getDisplayName() {
- return getDataModel().getStringProperty(IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.model.ISessionBeanDelegate#getDescription()
- */
- public String getDescription() {
- return getDataModel().getStringProperty(IEnterpriseBeanClassDataModelProperties.DESCRIPTION);
- }
-
- public abstract String getTransactionType() ;
-
- /**
- *
- * This method permits us to keep emf model for the bean
- * in sync with the changes in the datamodel
- */
-
- public void propertyChanged(DataModelEvent event) {
- String property = event.getPropertyName();
- Object propertyValue = event.getProperty();
- if( enterpriseBean == null)
- return;
- if( IEnterpriseBeanClassDataModelProperties.EJB_NAME.equals(property)){
- enterpriseBean.setName((String)propertyValue);
- }else if(IEnterpriseBeanClassDataModelProperties.DESCRIPTION.equals(property)){
- enterpriseBean.setDescription((String)propertyValue);
- }else if(IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME.equals(property)){
- enterpriseBean.setDisplayName((String)propertyValue);
- } else if(INewJavaClassDataModelProperties.CLASS_NAME.equals(property)){
- enterpriseBean.setEjbClassName(event.getDataModel().getStringProperty(INewJavaClassDataModelProperties.QUALIFIED_CLASS_NAME));
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IContainerManagedEntityBean.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IContainerManagedEntityBean.java
deleted file mode 100644
index 7c0be40..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IContainerManagedEntityBean.java
+++ /dev/null
@@ -1,32 +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.annotation.internal.model;
-
-import java.util.List;
-
-/**
- * @author naci
- */
-public interface IContainerManagedEntityBean extends IEnterpriseBean {
-
- public String getDatasource();
-
- public String getSchema();
-
- public String getTable();
-
- public List getAttributes();
-
- public String getPrimaryKeyClass();
-
- public String getVersion();
-
- public List getKeyAttributes();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IContainerManagedEntityBeanDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IContainerManagedEntityBeanDataModelProperties.java
deleted file mode 100644
index b3cadfa..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IContainerManagedEntityBeanDataModelProperties.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.annotation.internal.model;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-
-public interface IContainerManagedEntityBeanDataModelProperties extends IEnterpriseBeanClassDataModelProperties, IAnnotationsDataModel {
-
- public static final String DATASOURCE = "EntityBeanDataModel.DATASOURCE"; //$NON-NLS-1$
- public static final String SCHEMA = "EntityBeanDataModel.SCHEMA"; //$NON-NLS-1$
- public static final String TABLE = "EntityBeanDataModel.TABLE"; //$NON-NLS-1$
- public static final String ATTRIBUTES = "EntityBeanDataModel.ATTRIBUTES"; //$NON-NLS-1$
- public static final String VERSION = "EntityBeanDataModel.VERSION"; //$NON-NLS-1$
-
- public final static String EJB_INTERFACES = "EntityBeanDataModel.EJB_INTERFACES"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IEnterpriseBean.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IEnterpriseBean.java
deleted file mode 100644
index 7977be8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IEnterpriseBean.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.ejb.annotation.internal.model;
-
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author naci
- *
- */
-public interface IEnterpriseBean {
-
- public EnterpriseBean getEnterpriseBean();
- public IDataModel getDataModel();
- public IDataModel getDataModelFor(String feature);
-
- public String getTransactionType();
- public String getEjbName();
- public String getDisplayName();
- public String getDescription();
- public String getJndiName();
- public String getInterfaces();
- public String getSimpleClassName();
-
- public int getVersionID();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IEnterpriseBeanClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IEnterpriseBeanClassDataModelProperties.java
deleted file mode 100644
index 8655f38..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IEnterpriseBeanClassDataModelProperties.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.ejb.annotation.internal.model;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-
-public interface IEnterpriseBeanClassDataModelProperties extends INewJavaClassDataModelProperties, IAnnotationsDataModel {
-
- public static final String EJB_TYPE = "IEjbCommonDataModel.EJB_TYPE"; //$NON-NLS-1$
-
- public static final String EJB_NAME = "IEjbCommonDataModel.EJB_NAME"; //$NON-NLS-1$
-
- public static final String JNDI_NAME = "IEjbCommonDataModel.JNDI_NAME"; //$NON-NLS-1$
-
- public static final String DISPLAY_NAME = "IEjbCommonDataModel.DISPLAY_NAME"; //$NON-NLS-1$
-
- public static final String DESCRIPTION = "IEjbCommonDataModel.DESCRIPTION"; //$NON-NLS-1$
-
- public static final String TRANSACTIONTYPE = "IEjbCommonDataModel.TRANSACTIONTYPE"; //$NON-NLS-1$
-
- public static final String ANNOTATIONPROVIDER = "IEjbCommonDataModel.ANNOTATIONPROVIDER"; //$NON-NLS-1$
-
- public static final String MODELDELEGATE = "IEjbCommonDataModel.MODELDELEGATE"; //$NON-NLS-1$
-
- public static final String INTERFACES_AS_STRING = "IEjbCommonDataModel.INTERFACES_AS_STRING"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IMessageDrivenBean.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IMessageDrivenBean.java
deleted file mode 100644
index 46fae90..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IMessageDrivenBean.java
+++ /dev/null
@@ -1,20 +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.annotation.internal.model;
-
-/**
- * @author naci
- *
- */
-public interface IMessageDrivenBean extends IEnterpriseBean {
- public String getDestinationType();
- public String getDestinationJndiName();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IMessageDrivenBeanDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IMessageDrivenBeanDataModelProperties.java
deleted file mode 100644
index 6e0dddb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IMessageDrivenBeanDataModelProperties.java
+++ /dev/null
@@ -1,21 +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.annotation.internal.model;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-
-public interface IMessageDrivenBeanDataModelProperties extends IEnterpriseBeanClassDataModelProperties, IAnnotationsDataModel {
-
- public static final String DESTINATIONNAME = "MessageDrivenBeanDataModel.DESTINATIONNAME"; //$NON-NLS-1$
- public static final String DESTINATIONTYPE = "MessageDrivenBeanDataModel.DESTINATIONTYPE"; //$NON-NLS-1$
-
- public final static String EJB_INTERFACES = "MessageDrivenBeanDataModel.EJB_INTERFACES"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ISessionBean.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ISessionBean.java
deleted file mode 100644
index 1062558..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ISessionBean.java
+++ /dev/null
@@ -1,19 +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.annotation.internal.model;
-
-/**
- * @author naci
- *
- */
-public interface ISessionBean extends IEnterpriseBean {
- public String getSessionType();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ISessionBeanDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ISessionBeanDataModelProperties.java
deleted file mode 100644
index a16f33e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ISessionBeanDataModelProperties.java
+++ /dev/null
@@ -1,19 +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.annotation.internal.model;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-
-public interface ISessionBeanDataModelProperties extends IEnterpriseBeanClassDataModelProperties, IAnnotationsDataModel {
-
- public static final String STATELESS = "SessionBeanDataModel.STATELESS"; //$NON-NLS-1$
-
- public final static String EJB_INTERFACES = "SessionBeanDataModel.EJB_INTERFACES"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/Logger.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/Logger.java
deleted file mode 100644
index 5516a09..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/Logger.java
+++ /dev/null
@@ -1,142 +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.annotation.internal.model;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.xdoclet"; //$NON-NLS-1$
-
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
- }
-
- /**
- * @return true if the platform is debugging
- */
- public static boolean isDebugging() {
- return Platform.inDebugMode();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDataModelProvider.java
deleted file mode 100644
index c035aa8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDataModelProvider.java
+++ /dev/null
@@ -1,135 +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.annotation.internal.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.DestinationType;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.operations.AddMessageDrivenBeanOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-
-public class MessageDrivenBeanDataModelProvider extends EnterpriseBeanClassDataModelProvider implements IMessageDrivenBeanDataModelProperties {
-
- public final static String DEFAULT_EJB_SUPERCLASS = "java.lang.Object"; //$NON-NLS-1$
- public final static String[] DEFAULT_EJB_INTERFACES = {"javax.ejb.MessageDrivenBean", "javax.jms.MessageListener"}; //$NON-NLS-1$ //$NON-NLS-2$
-
- private List interfaceList;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultOperation()
- */
- public IDataModelOperation getDefaultOperation() {
- AddMessageDrivenBeanOperation operation = new AddMessageDrivenBeanOperation(getDataModel());
- //Initialize the delagate. It can cause Invalid state vioation if a wizard exits early
- getDataModel().getProperty(IEnterpriseBeanClassDataModelProperties.MODELDELEGATE);
-
- return operation;
- }
-
- /**
- * Subclasses may extend this method to add their own data model's properties as valid base
- * properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(DESTINATIONTYPE);
- propertyNames.add(DESTINATIONNAME);
- propertyNames.add(EJB_INTERFACES);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(USE_ANNOTATIONS))
- return Boolean.FALSE;
- else if (propertyName.equals(DESTINATIONNAME))
- return getProperty(JNDI_NAME);
- else if (propertyName.equals(DESTINATIONTYPE))
- return DestinationType.QUEUE_LITERAL.getName();
- else if (propertyName.equals(EJB_TYPE))
- return "MessageDrivenBean";
- else if (propertyName.equals(MODIFIER_ABSTRACT))
- return Boolean.FALSE;
- else if (propertyName.equals(SUPERCLASS))
- return DEFAULT_EJB_SUPERCLASS;
- else if (propertyName.equals(EJB_INTERFACES))
- return DEFAULT_EJB_INTERFACES;
- return super.getDefaultProperty(propertyName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
- */
- public IStatus validate(String propertyName) {
- if (propertyName.equals(DESTINATIONNAME))
- return validateJndiName(getStringProperty(propertyName));
- if (propertyName.equals(DESTINATIONTYPE))
- return validateDestinationType(getStringProperty(propertyName));
- return super.validate(propertyName);
- }
-
- private IStatus validateDestinationType(String prop) {
- // check for empty
- if (prop == null || prop.trim().length() == 0) {
- String msg = IEJBAnnotationConstants.ERR_DESTINATIONTYPE_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (prop.indexOf("Queue") >= 0 || prop.indexOf("Topic") >= 0) {
- return WTPCommonPlugin.OK_STATUS;
- }
- String msg = IEJBAnnotationConstants.ERR_DESTINATIONTYPE_VALUE;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
-
- protected List getEJBInterfaces() {
- if (this.interfaceList == null) {
- this.interfaceList = new ArrayList();
- for (int i = 0; i < ((String[]) getProperty(EJB_INTERFACES)).length; i++) {
- this.interfaceList.add(((String[]) getProperty(EJB_INTERFACES))[i]);
- }
- }
- return this.interfaceList;
- }
-
- protected void initializeDelegate() {
- MessageDrivenBeanDelegate delegate = new MessageDrivenBeanDelegate();
- delegate.setDataModel(getDataModel());
- this.setProperty(MODELDELEGATE, delegate);
- // Set the defaults so that they are propagated via events
- this.setProperty(DESTINATIONTYPE, this.getProperty(DESTINATIONTYPE));
- this.setProperty(TRANSACTIONTYPE, this.getProperty(TRANSACTIONTYPE));
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
-
- boolean result = super.propertySet(propertyName, propertyValue);
-
- if (propertyName.equals(EJB_NAME)) {
- if (!isPropertySet(DESTINATIONNAME))
- getDataModel().notifyPropertyChange(DESTINATIONNAME, IDataModel.DEFAULT_CHG);
- }
- return result;
- }
-
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDelegate.java
deleted file mode 100644
index b372a00..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDelegate.java
+++ /dev/null
@@ -1,122 +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.annotation.internal.model;
-
-import org.eclipse.jst.j2ee.ejb.DestinationType;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class MessageDrivenBeanDelegate extends EnterpriseBeanDelegate implements IMessageDrivenBean {
-
- public MessageDrivenBeanDelegate() {
- super();
- MessageDriven mdBean = EjbFactory.eINSTANCE.createMessageDriven();
- this.setEnterpriseBean(mdBean);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean#getDataModel()
- */
- public void setDataModel(IDataModel dataModel) {
- super.setDataModel(dataModel);
- MessageDriven messageDriven = (MessageDriven) this.getEnterpriseBean();
- if (messageDriven == null)
- return;
-
- DestinationType dType = DestinationType.QUEUE_LITERAL;
- if (dataModel.getStringProperty(IMessageDrivenBeanDataModelProperties.DESTINATIONTYPE).equals(
- DestinationType.TOPIC_LITERAL.getName()))
- dType = DestinationType.TOPIC_LITERAL;
- MessageDrivenDestination destination = EjbFactory.eINSTANCE.createMessageDrivenDestination();
- destination.setType(dType);
- destination.setBean(messageDriven);
- messageDriven.setDestination(destination);
- String dName = dataModel.getStringProperty(IMessageDrivenBeanDataModelProperties.DESTINATIONNAME);
- if (dName == null || dName.length() <= 0)
- dName = dataModel.getStringProperty(IEnterpriseBeanClassDataModelProperties.JNDI_NAME);
- messageDriven.setMessageSelector(dName);
-
- TransactionType transactionType = TransactionType.CONTAINER_LITERAL;
- if (dataModel.getStringProperty(IMessageDrivenBeanDataModelProperties.TRANSACTIONTYPE).equals(
- TransactionType.BEAN_LITERAL.getName()))
- transactionType = TransactionType.BEAN_LITERAL;
- messageDriven.setTransactionType(transactionType);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.IMessageDrivenBeanDelegate#getDestinationType()
- */
- public String getDestinationType() {
- MessageDriven messageDriven = (MessageDriven) this.getEnterpriseBean();
- return messageDriven.getDestination().getType().getName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.IMessageDrivenBeanDelegate#getDestinationType()
- */
- public String getTransactionType() {
- MessageDriven messageDriven = (MessageDriven) this.getEnterpriseBean();
- return messageDriven.getTransactionType().getName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.IMessageDrivenBeanDelegate#getDestinationJndiName()
- */
- public String getDestinationJndiName() {
- MessageDriven messageDriven = (MessageDriven) this.getEnterpriseBean();
- return messageDriven.getMessageSelector();
- }
-
- /**
- * This method permits us to keep emf model for the bean in sync with the
- * changes in the datamodel
- */
- public void propertyChanged(DataModelEvent event) {
- super.propertyChanged(event);
- String property = event.getPropertyName();
- Object propertyValue = event.getProperty();
- MessageDriven messageDriven = (MessageDriven) this.getEnterpriseBean();
- if (messageDriven == null)
- return;
-
- if (IMessageDrivenBeanDataModelProperties.DESTINATIONTYPE.equals(property)) {
- DestinationType dType = DestinationType.QUEUE_LITERAL;
- if (propertyValue.equals(DestinationType.TOPIC_LITERAL.getName()))
- dType = DestinationType.TOPIC_LITERAL;
- MessageDrivenDestination destination = EjbFactory.eINSTANCE.createMessageDrivenDestination();
- destination.setType(dType);
- destination.setBean(messageDriven);
- messageDriven.setDestination(destination);
- } else if (IMessageDrivenBeanDataModelProperties.DESTINATIONNAME.equals(property)
- || IEnterpriseBeanClassDataModelProperties.JNDI_NAME.equals(property)) {
- messageDriven.setMessageSelector((String) propertyValue);
- } else if (IEnterpriseBeanClassDataModelProperties.TRANSACTIONTYPE.equals(property)) {
- TransactionType transactionType = TransactionType.CONTAINER_LITERAL;
- if (propertyValue.equals(TransactionType.BEAN_LITERAL.getName()))
- transactionType = TransactionType.BEAN_LITERAL;
- messageDriven.setTransactionType(transactionType);
- }
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ModelPlugin.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ModelPlugin.java
deleted file mode 100644
index 50fbd59..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ModelPlugin.java
+++ /dev/null
@@ -1,88 +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.annotation.internal.model;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.preferences.AnnotationPreferenceStore;
-import org.osgi.framework.BundleContext;
-
-public class ModelPlugin extends Plugin {
-
- public static final String PLUGINID = "org.eclipse.jst.j2ee.ejb.annotation.model";
-
- // The shared instance.
- private static ModelPlugin plugin;
- // Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public ModelPlugin() {
- 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 ModelPlugin 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 = ModelPlugin.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.annotation.model.ModelPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-
- protected void initializeDefaultPluginPreferences() {
- AnnotationPreferenceStore.initializeDefaultPreferences(this.getPluginPreferences());
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/SessionBeanDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/SessionBeanDataModelProvider.java
deleted file mode 100644
index e1f6226..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/SessionBeanDataModelProvider.java
+++ /dev/null
@@ -1,115 +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.annotation.internal.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.operations.AddSessionBeanOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-
-public class SessionBeanDataModelProvider extends EnterpriseBeanClassDataModelProvider implements ISessionBeanDataModelProperties {
- protected final static String DEFAULT_EJB_SUPERCLASS = "java.lang.Object"; //$NON-NLS-1$
- protected final static String[] DEFAULT_EJB_INTERFACES = {"javax.ejb.SessionBean"}; //$NON-NLS-1$
-
- private List interfaceList;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultOperation()
- */
- public IDataModelOperation getDefaultOperation() {
- AddSessionBeanOperation operation = new AddSessionBeanOperation(getDataModel());
- getDataModel().getProperty(IEnterpriseBeanClassDataModelProperties.MODELDELEGATE);
- return operation;
- }
-
- /**
- * Subclasses may extend this method to add their own data model's properties as valid base
- * properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(STATELESS);
- propertyNames.add(EJB_INTERFACES);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(USE_ANNOTATIONS))
- return Boolean.FALSE;
- else if (propertyName.equals(EJB_TYPE))
- return "SessionBean"; //$NON-NLS-1$
- else if (propertyName.equals(STATELESS))
- return SessionType.STATELESS_LITERAL.getName();
- else if (propertyName.equals(MODIFIER_ABSTRACT))
- return Boolean.TRUE;
- else if (propertyName.equals(SUPERCLASS))
- return DEFAULT_EJB_SUPERCLASS;
- else if (propertyName.equals(MODIFIER_ABSTRACT))
- return Boolean.TRUE;
- else if (propertyName.equals(EJB_INTERFACES))
- return DEFAULT_EJB_INTERFACES;
- return super.getDefaultProperty(propertyName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
- */
- public IStatus validate(String propertyName) {
- if (propertyName.equals(STATELESS))
- return validateStateless(getStringProperty(propertyName));
- return super.validate(propertyName);
- }
-
- protected List getEJBInterfaces() {
- if (this.interfaceList == null) {
- this.interfaceList = new ArrayList();
- for (int i = 0; i < ((String[]) getProperty(EJB_INTERFACES)).length; i++) {
- this.interfaceList.add(((String[]) getProperty(EJB_INTERFACES))[i]);
- }
- }
- return this.interfaceList;
- }
-
- private IStatus validateStateless(String prop) {
- // check for empty
- if (prop == null || prop.trim().length() == 0) {
- String msg = IEJBAnnotationConstants.ERR_STATELESS_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (prop.indexOf("Stateless") >= 0 || prop.indexOf("Stateful") >= 0) { //$NON-NLS-1$ //$NON-NLS-2$
- return WTPCommonPlugin.OK_STATUS;
- }
- String msg = IEJBAnnotationConstants.ERR_STATELESS_VALUE;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
-
- protected void initializeDelegate() {
- SessionBeanDelegate delegate = new SessionBeanDelegate();
- delegate.setDataModel(getDataModel());
- this.setProperty(MODELDELEGATE, delegate);
- // Set the defaults so that they are propagated via events
- this.setProperty(STATELESS, this.getProperty(STATELESS));
- this.setProperty(TRANSACTIONTYPE, this.getProperty(TRANSACTIONTYPE));
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/SessionBeanDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/SessionBeanDelegate.java
deleted file mode 100644
index 1524c07..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/SessionBeanDelegate.java
+++ /dev/null
@@ -1,86 +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.annotation.internal.model;
-
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class SessionBeanDelegate extends EnterpriseBeanDelegate implements ISessionBean {
- public SessionBeanDelegate() {
- super();
- Session sessionBean = EjbFactory.eINSTANCE.createSession();
- this.setEnterpriseBean(sessionBean);
- }
-
- public void setDataModel(IDataModel dataModel) {
- super.setDataModel(dataModel);
- Session session = (Session) this.getEnterpriseBean();
- if (session == null)
- return;
-
- SessionType sessionBeanType = SessionType.STATELESS_LITERAL;
- if (dataModel.getStringProperty(ISessionBeanDataModelProperties.STATELESS).equals(SessionType.STATEFUL_LITERAL.getName()))
- sessionBeanType = SessionType.STATEFUL_LITERAL;
- session.setSessionType(sessionBeanType);
-
- TransactionType transactionType = TransactionType.CONTAINER_LITERAL;
- if (dataModel.getStringProperty(ISessionBeanDataModelProperties.TRANSACTIONTYPE)
- .equals(TransactionType.BEAN_LITERAL.getName()))
- transactionType = TransactionType.BEAN_LITERAL;
- session.setTransactionType(transactionType);
-
- }
-
- public String getSessionType() {
- Session session = (Session) this.getEnterpriseBean();
- return session.getSessionType().getName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.ejb.annotation.model.ISessionBeanDelegate#getTransactionType()
- */
- public String getTransactionType() {
- Session session = (Session) this.getEnterpriseBean();
- return session.getTransactionType().getName();
- }
-
- /**
- * This method permits us to keep emf model for the bean in sync with the
- * changes in the datamodel
- */
-
- public void propertyChanged(DataModelEvent event) {
- super.propertyChanged(event);
- String property = event.getPropertyName();
- Object propertyValue = event.getProperty();
- Session session = (Session) this.getEnterpriseBean();
- if (session == null)
- return;
-
- if (ISessionBeanDataModelProperties.STATELESS.equals(property)) {
- SessionType sessionBeanType = SessionType.STATELESS_LITERAL;
- if (propertyValue.equals(SessionType.STATEFUL_LITERAL.getName()))
- sessionBeanType = SessionType.STATEFUL_LITERAL;
- session.setSessionType(sessionBeanType);
- } else if (IEnterpriseBeanClassDataModelProperties.TRANSACTIONTYPE.equals(property)) {
- TransactionType transactionType = TransactionType.CONTAINER_LITERAL;
- if (propertyValue.equals(TransactionType.BEAN_LITERAL.getName()))
- transactionType = TransactionType.BEAN_LITERAL;
- session.setTransactionType(transactionType);
- }
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddContainerManagedEntityBeanOperation.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddContainerManagedEntityBeanOperation.java
deleted file mode 100644
index e348d32..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddContainerManagedEntityBeanOperation.java
+++ /dev/null
@@ -1,60 +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.annotation.internal.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IContainerManagedEntityBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.Logger;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IEJBGenerator;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.utility.AnnotationUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AddContainerManagedEntityBeanOperation extends AbstractDataModelOperation {
-
- /**
- * @param dataModel
- */
- public AddContainerManagedEntityBeanOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- try {
- IEJBGenerator generator = AnnotationUtilities.findEjbGeneratorByName(getDataModel().getStringProperty(
- IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER));
- IContainerManagedEntityBean delegate = (IContainerManagedEntityBean) getDataModel().getProperty(
- IEnterpriseBeanClassDataModelProperties.MODELDELEGATE);
- if (generator != null)
- generator.generateCMP(delegate, monitor);
- else {
- // TODO MUST RAISE A WARNING HERE
- Logger.log(Logger.WARNING, "There is no generator");
- }
- } catch (Exception e) {
- Logger.logException(e);
- }
- return OK_STATUS;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddEjbOperation.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddEjbOperation.java
deleted file mode 100644
index 29b4735..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddEjbOperation.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.ejb.annotation.internal.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AddEjbOperation extends AbstractDataModelOperation {
- /**
- * @param dataModel
- */
- public AddEjbOperation(IDataModel dataModel) {
- super(dataModel);
- }
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- createEjb(monitor);
- return OK_STATUS;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- private void createEjb(IProgressMonitor monitor) throws ExecutionException {
- if( "SessionBean".equals(getDataModel().getStringProperty(IEnterpriseBeanClassDataModelProperties.EJB_TYPE))){ //$NON-NLS-1$
- (new AddSessionBeanOperation(getDataModel())).execute(monitor, null);
- }else if( "MessageDrivenBean".equals(getDataModel().getStringProperty(IEnterpriseBeanClassDataModelProperties.EJB_TYPE))){ //$NON-NLS-1$
- (new AddMessageDrivenBeanOperation(getDataModel())).execute(monitor, null);
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddMessageDrivenBeanOperation.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddMessageDrivenBeanOperation.java
deleted file mode 100644
index 2587705..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddMessageDrivenBeanOperation.java
+++ /dev/null
@@ -1,58 +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.annotation.internal.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IMessageDrivenBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.Logger;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IEJBGenerator;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.utility.AnnotationUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AddMessageDrivenBeanOperation extends AbstractDataModelOperation {
-
- /**
- * @param dataModel
- */
- public AddMessageDrivenBeanOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- try {
- IEJBGenerator generator = AnnotationUtilities.findEjbGeneratorByName(getDataModel().getStringProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER));
- IMessageDrivenBean delegate = (IMessageDrivenBean) getDataModel().getProperty(IEnterpriseBeanClassDataModelProperties.MODELDELEGATE);
- if( generator != null )
- generator.generateMessageDriven(delegate,monitor);
- else{
- //TODO MUST RAISE A WARNING HERE
- Logger.log(Logger.WARNING,"There is no generator");
- }
- } catch (Exception e) {
- Logger.logException(e);
- }
- return OK_STATUS;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddSessionBeanOperation.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddSessionBeanOperation.java
deleted file mode 100644
index eacae32..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddSessionBeanOperation.java
+++ /dev/null
@@ -1,60 +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.annotation.internal.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.ISessionBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.Logger;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IEJBGenerator;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.utility.AnnotationUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AddSessionBeanOperation extends AbstractDataModelOperation {
-
- /**
- * @param dataModel
- */
- public AddSessionBeanOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- try {
- IEJBGenerator generator = AnnotationUtilities.findEjbGeneratorByName(getDataModel().getStringProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER));
- ISessionBean delegate = (ISessionBean) getDataModel().getProperty(IEnterpriseBeanClassDataModelProperties.MODELDELEGATE);
- if(generator != null )
- generator.generateSession(delegate,monitor);
- else{
- //TODO MUST RAISE A WARNING HERE
- Logger.log(Logger.WARNING,"There is no generator");
- }
- } catch (Exception e) {
- Logger.logException(e);
- }
- return OK_STATUS;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/preferences/AnnotationPreferenceStore.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/preferences/AnnotationPreferenceStore.java
deleted file mode 100644
index b3beda6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/preferences/AnnotationPreferenceStore.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004 Eteration Bilisim A.S.
- * Naci Dai and others.
- *
- * Parts developed under contract ref:FT/R&D/MAPS/AMS/2004-09-09/AL are
- * Copyright France Telecom, 2004.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.internal.preferences;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.ModelPlugin;
-
-public class AnnotationPreferenceStore extends AbstractPreferenceInitializer {
-
- public static final String ANNOTATIONPROVIDER = "ANNOTATIONPROVIDER";
-
- protected static String getPreferencePrefix() {
- return ModelPlugin.getDefault().getBundle().getSymbolicName();
- }
-
- private static Preferences getPreferenceStore() {
- Preferences store = ModelPlugin.getDefault().getPluginPreferences();
- return store;
- }
-
- public static String getPropertyRaw(String item) {
- Preferences store = getPreferenceStore();
- return store.getString(item);
- }
-
- public static void setProperty(String prefix, String item, String value) {
- getPreferenceStore().setValue(ModelPlugin.PLUGINID + "." + prefix + "." + item + ".value", value);
- }
-
- public static void setProperty(String item, String value) {
- String prefix = ModelPlugin.PLUGINID + ".";
- getPreferenceStore().setValue(prefix + item + ".value", value);
- }
-
- public static String getProperty(String item) {
- String prefix = ModelPlugin.PLUGINID + ".";
- return getPreferenceStore().getString(prefix + item + ".value");
- }
-
- public static String getProperty(String prefix, String item) {
- String pfix = ModelPlugin.PLUGINID + "." + prefix + "." + item + ".value";
- return getPreferenceStore().getString(pfix);
- }
-
- public static boolean isPropertyActive(String item) {
- String prefix = ModelPlugin.PLUGINID + ".";
- return getPreferenceStore().getBoolean(prefix + item);
- }
-
- public static void setPropertyActive(String item, boolean active) {
- String prefix = ModelPlugin.PLUGINID + ".";
- getPreferenceStore().setValue(prefix + item, active);
- }
-
- public static void initializeDefaultPreferences(Preferences store) {
- String prefix = ModelPlugin.PLUGINID + ".";
- store.setDefault(prefix + ANNOTATIONPROVIDER + ".value", "XDoclet");
- }
-
- public void initializeDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode(getPreferencePrefix());
- String prefix = ModelPlugin.PLUGINID + ".";
- node.put(prefix + ANNOTATIONPROVIDER + ".value", "XDoclet");
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/provider/IAnnotationProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/provider/IAnnotationProvider.java
deleted file mode 100644
index 8281387..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/provider/IAnnotationProvider.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.annotation.internal.provider;
-
-/**
- * @author naci
- *
- */
-public interface IAnnotationProvider {
-
- public boolean isEjbAnnotationProvider();
- public boolean isServletAnnotationProvider();
- public boolean isWebServiceAnnotationProvider();
- public boolean isValid();
- public String getName();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/provider/IEJBGenerator.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/provider/IEJBGenerator.java
deleted file mode 100644
index fe3ffb5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/provider/IEJBGenerator.java
+++ /dev/null
@@ -1,26 +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.annotation.internal.provider;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IContainerManagedEntityBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IMessageDrivenBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.ISessionBean;
-
-/**
- * @author naci
- *
- */
-public interface IEJBGenerator {
- public void generateSession(ISessionBean bean,IProgressMonitor monitor) throws CoreException,InterruptedException;
- public void generateMessageDriven(IMessageDrivenBean bean,IProgressMonitor monitor) throws CoreException, InterruptedException;
- public void generateCMP(IContainerManagedEntityBean bean,IProgressMonitor monitor) throws CoreException, InterruptedException;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/utility/AnnotationUtilities.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/utility/AnnotationUtilities.java
deleted file mode 100644
index 07da7ce..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/utility/AnnotationUtilities.java
+++ /dev/null
@@ -1,94 +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.annotation.internal.utility;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IAnnotationProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IEJBGenerator;
-
-/**
- * @author naci
- */
-public class AnnotationUtilities {
-
- public static IConfigurationElement findAnnotationProviderConfigurationByName(String id) {
-
- IConfigurationElement configurationElement[] = getGeneratorExtensions();
- for (int i = 0; i < configurationElement.length; i++) {
- IConfigurationElement element = configurationElement[i];
- String providerID = element.getAttribute("name");
- if ("provider".equals(element.getName()) && providerID != null && providerID.equals(id))
- return element;
- }
- return null;
- }
-
- public static IAnnotationProvider findAnnotationProviderByName(String id) throws InvalidRegistryObjectException,
- ClassNotFoundException, InstantiationException, IllegalAccessException {
-
- IConfigurationElement configurationElement[] = getGeneratorExtensions();
- for (int i = 0; i < configurationElement.length; i++) {
- IConfigurationElement element = configurationElement[i];
- String emitterId = element.getAttribute("name");
- if ("provider".equals(element.getName()) && emitterId != null && emitterId.equals(id)) {
- String pluginDescriptor = element.getDeclaringExtension().getContributor().getName();
-
- org.osgi.framework.Bundle bundle = Platform.getBundle(pluginDescriptor);
- Class c = bundle.loadClass(element.getAttribute("class"));
- IAnnotationProvider provider = (IAnnotationProvider) c.newInstance();
-
- return provider;
- }
- }
- return null;
- }
-
- public static IEJBGenerator findEjbGeneratorByName(String id) throws InvalidRegistryObjectException, ClassNotFoundException,
- InstantiationException, IllegalAccessException {
-
- IConfigurationElement configurationElement[] = getGeneratorExtensions();
- for (int i = 0; i < configurationElement.length; i++) {
- IConfigurationElement element = configurationElement[i];
- String generatorID = element.getAttribute("name");
- if ("ejbGenerator".equals(element.getName()) && generatorID != null && generatorID.equals(id)) {
- String pluginDescriptor = element.getDeclaringExtension().getContributor().getName();
-
- org.osgi.framework.Bundle bundle = Platform.getBundle(pluginDescriptor);
- Class c = bundle.loadClass(element.getAttribute("class"));
- IEJBGenerator provider = (IEJBGenerator) c.newInstance();
-
- return provider;
- }
- }
- return null;
- }
-
- public static IConfigurationElement[] getGeneratorExtensions() {
- IConfigurationElement[] configurationElements = Platform.getExtensionRegistry().getConfigurationElementsFor(
- "org.eclipse.jst.j2ee.ejb.annotation.model.ejbGenerator");
- return configurationElements;
- }
-
- public static String[] getProviderNames() {
- IConfigurationElement configurationElement[] = getGeneratorExtensions();
- ArrayList names = new ArrayList();
- for (int i = 0; i < configurationElement.length; i++) {
- IConfigurationElement element = configurationElement[i];
- if ("provider".equals(element.getName()))
- names.add(element.getAttribute("name"));
- }
- return (String[]) names.toArray(new String[names.size()]);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/web_ui.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/web_ui.properties
deleted file mode 100644
index 24df2a5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/web_ui.properties
+++ /dev/null
@@ -1,144 +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
-###############################################################################
-_0=Failed to find the image "{0}".
-_1=New Ejb
-_2=Ejb version:
-_3=Ejb Project
-_4=Create an EJB Project
-_5=Ejb project:
-_6=Jar file:
-_7=Import a JAR file from the file system
-_8=JAR Import
-_9=JAR Export
-_10=Export Ejb project to the local file system.
-
-ADD_EJB_WIZARD_WINDOW_TITLE=Create EnterpriseJavaBean
-ADD_EJB_WIZARD_PAGE_TITLE=EnterpriseJavaBean
-ADD_EJB_WIZARD_PAGE_DESC=Create an EnterpriseJavaBean
-SELECT_CLASS_TITLE=SELECT_CLASS_TITLE
-NO_EJB_PROJECTS=NO_EJB_PROJECTS
-ERR_TRANSACTION_VALUE=ERR_TRANSACTION_VALUE
-
-ERR_NO_ATTRIBUTES = Entity bean has no attributes
-ERR_DUPLICATE_ATTRIBUTES = Entity bean has attributes with the same name
-ERR_NO_KEY = Entity bean has no key attributes
-
-ERR_EJB_CLASS_NAME_USED= There is already another EJB with same class name
-ERR_EJB_NAME_EMPTY=You must provide an EJB name;
-ERR_EJB_TYPE_EMPTY=You must provide an EJB type;
-ERR_EJB_TYPE_EXISTS=A java type with this name already exists
-ERR_MUST_ENTER_A_PACKAGE_NAME= EJB must not be in the default package
-ERR_CLASS_NAME_MUSTEND_WITH_BEAN= You must use Bean as a suffix to the class name
-ERR_EJB_NAME_ENDS_WITH_BEAN= You must not use Bean as a suffix to the EJB name
-ERR_DISPLAY_NAME_EMPTY= You must provide a display name for the EJB
-ERR_EJB_DISPLAY_NAME_USED= There is already another EJB with same display name
-ERR_STATELESS_EMPTY= You must provide a state type for the SessionBean
-ERR_STATELESS_VALUE= State value must be one of Stateless or Stateful
-ERR_TRANSACTION_EMPTY= You must provide a transaction type for the EJB
-ERR_TRANSACTION_EMPTY= Transaction value must be one of Container or Bean
-ERR_JNDI_NAME_VALUE=You must provide a valid jndi name for the EJB
-ERR_JNDI_NAME_EMPTY=You must provide a jndi name for the EJB
-ERR_DESTINATIONTYPE_VALUE=Destination value must be one of Queue or Topic
-ERR_DESTINATIONTYPE_EMPTY=You must provide a destination type
-ERR_EJB_TYPE_VALUE=Ejb type must be one of SessionBean, MessageDrivenBean or EntityBean
-DEFAULT_PACKAGE=(default package)
-EMPTY_LIST_MSG=Empty List
-ADD_LABEL=Add
-
-
-ADD_BUTTON_LABEL=Add...
-REMOVE_BUTTON_LABEL=Remove
-URL_PATTERN_TITLE=URL Patterns
-URL_PATTERN_LABEL=Pattern:
-FOLDER_LABEL=Folder:
-JAVA_PACKAGE_LABEL=Java package:
-CLASS_NAME_LABEL=Class name:
-SUPERCLASS_LABEL=Superclass:
-CONTAINER_SELECTION_DIALOG_TITLE=Container Selection
-CONTAINER_SELECTION_DIALOG_DESC=Choose a Container:
-CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG=Choose the Ejb Jar Folder or its subfolder
-PACKAGE_SELECTION_DIALOG_TITLE=Package Selection
-PACKAGE_SELECTION_DIALOG_DESC=Choose a package:
-PACKAGE_SELECTION_DIALOG_MSG_NONE=No packages to choose from
-SUPERCLASS_SELECTION_DIALOG_TITLE=Superclass Selection
-SUPERCLASS_SELECTION_DIALOG_DESC=Choose a superclass:
-INTERFACE_SELECTION_DIALOG_TITLE=Interface Selection
-INTERFACE_SELECTION_DIALOG_DESC=Choose interfaces:
-INTERFACE_SELECTION_DIALOG_MSG_NONE=''{0}'' added.
-JAVA_CLASS_MODIFIERS_LABEL=Modifiers:
-JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=Public
-JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=Abstract
-JAVA_CLASS_FINAL_CHECKBOX_LABEL=Final
-JAVA_CLASS_INTERFACES_LABEL=Interfaces:
-JAVA_CLASS_METHOD_STUBS_LABEL=Which method stubs would you like to create?
-JAVA_CLASS_MAIN_CHECKBOX_LABEL=public static void main(String[] args)
-JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=Constructors from superclass
-JAVA_CLASS_INHERIT_CHECKBOX_LABEL=Inherited abstract methods
-JAVA_CLASS_BROWER_DIALOG_TITLE=Java Class Browser
-JAVA_CLASS_BROWER_DIALOG_MESSAGE=Browse for a Java class
-
-NAME_LABEL=Name
-EJB_NAME_LABEL=EJB Name
-JNDI_NAME_LABEL=JNDI Name
-STATELESS_LABEL=State Type
-TRANSACTION_LABEL=Transaction Type
-DESTINATION_NAME_LABEL=Destination JNDI Name
-DESTINATION_LABEL=Destination
-DISPLAY_NAME_LABEL=Display Name
-DESCRIPTION_LABEL=Description
-VALUE_LABEL=Value
-BROWSE_BUTTON_LABEL=Browse...
-REMOVE_BUTTON=Remove
-
-NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC=Specifiy class file destination.
-NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC=Specify modifiers, interfaces to implement, and method stubs to generate.
-
-
-NO_WEB_PROJECTS=No EJB Projects
-ENTITY_USECASE_LABEL=Usecase:
-DATASOURCE_NAME_LABEL=Datasource:
-SCHEMA_NAME_LABEL=Schema:
-
-ADD_EJB_CMPWIZARD_PAGE_DESC=ContainerManagedPersistence Entity Bean Wizard
-ADD_EJB_CMPWIZARD_PAGE_TITLE=CMP Entity Bean
-CMP_FROM_TABLE=Import attributes from table
-CMP_FROM_BEAN=Define new attributes
-ERR_CMP_CONNECTION_SUCCESS=Successfully connected
-ERR_CMP_NO_CONNECTION=There is no connection to database
-ERR_CMP_INVALID_TABLE=Not a valid table name
-ERR_CMP_INVALID_VERSION=Not a valid CMP version
-CMP_CONNECTION_VALUE=Value
-CMP_CONNECTION_PROPERTY=Property
-CMP_CONNECTION_PROPERTIES=Properties
-CMP_CONNECTION_AVAILABLE=Available Connection Definitions
-CMP_CONNECTION_NEW_BUTTON=New...
-CMP_CONNECTION_PAGE_DESC=Create a new JDBC connection definition
-CMP_CONNECTION_PAGE_TITLE=New JDBC Connection
-ADD_CMP_TABLE_WIZARD_PAGE_DESC=Define CMP attributes
-ADD_CMP_TABLE_WIZARD_PAGE_TITLE=CMP Attributes
-CMP_TABLE_CHOOSE_TABLE=Table:
-CANNOT_CONNECT=Cannot connect to database
-CHECK_PROPERTIES=Check JDBC connection properties and password.
-CMP_MANAGED_FIELDS=Managed Attributes
-ATTRIBUTE_NAME=Name
-ATTRIBUTE_COLUMN=Column
-ATTRIBUTE_TYPE=Type
-ATTRIBUTE_JDBCTYPE=JDBC Type
-ATTRIBUTE_SQLTYPE=SQL Type
-ATTRIBUTE_COLUMNSIZE=Size
-ATTRIBUTE_DECIMALDIGITS=Digits
-ATTRIBUTE_READONLY=Read Only
-ATTRIBUTE_ISKEY=Primary Key
-ATTRIBUTE_ADD=Add
-ATTRIBUTE_REMOVE=Remove
-
-ENTITY_VERSION_LABEL=CMP Version:
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.classpath b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.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.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.cvsignore b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.cvsignore
deleted file mode 100644
index 9d920c4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-ejbEmitter.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.project b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.project
deleted file mode 100644
index 89e7f17..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.ejb.annotations.emitter</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.ejb.annotations.emitter/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2fc5570..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,54 +0,0 @@
-#Thu May 10 18:34:25 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/META-INF/MANIFEST.MF
deleted file mode 100644
index 3a348b6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb.annotations.emitter; singleton:=true
-Bundle-Version: 1.1.102.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.EjbEmitterPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.ejb.annotations.internal.classgen;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb.annotation.model;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/about.html b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/build.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/build.properties
deleted file mode 100644
index e460338..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
- .,\
- META-INF/,\
- about.html,\
- plugin.properties
-src.includes = schema/
-source.. = src/
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/plugin.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/plugin.properties
deleted file mode 100644
index b072be6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.jst.j2ee.ejb.annotations.emitter
-Bundle-Name.0 = EJB Emitter Plug-in
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/plugin.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/plugin.xml
deleted file mode 100644
index 775d6d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="template" name="template" schema="schema/emitter.exsd"/>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/schema/emitter.exsd b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/schema/emitter.exsd
deleted file mode 100644
index a93b085..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/schema/emitter.exsd
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.ejb.annotations.emitter">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.ejb.annotations.emitter" id="provider" name="Provider"/>
- </appInfo>
- <documentation>
- This extension point allows clients to provide their own templates for annotation based code generation using the EJB code generation framework. This extension point provides a framework to define "Provider-Generator" sets that use EMF JET (Java Emitter Templates) to annotate Java code.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="emitter"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="emitter">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="classpathProvider" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="builderId" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="ejbIntrospector" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="mergeController" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="sessionTemplates" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="entityTemplates" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="messageTemplates" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <pre>
- <extension
- point="org.eclipse.jst.j2ee.ejb.annotations.emitter.provider">
- <emitter
- name="xdoclet"
- classpathProvider="org.emitter.path.MyEmitterClasspathPorvider"
- builderId="org.emitter.path.MyEmitterBuilder"
- sessionTemplates="templates/ejb/session"
- entityTemplates="templates/ejb/entity"
- messageTemplates="templates/ejb/message"/>
- </extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- WTP org.eclipse.jst.j2ee.ejb.annotations.xdoclet plugin uses this extension point to provide XDoclet templates.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 Eteration A.S. and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/classgen/EjbBuilder.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/classgen/EjbBuilder.java
deleted file mode 100644
index 0601eba..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/classgen/EjbBuilder.java
+++ /dev/null
@@ -1,627 +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.annotations.internal.classgen;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.ToolFactory;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.Javadoc;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.PackageDeclaration;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.core.formatter.CodeFormatter;
-import org.eclipse.jdt.ui.CodeGeneration;
-import org.eclipse.jdt.ui.CodeStyleConfiguration;
-import org.eclipse.jdt.ui.actions.AddUnimplementedConstructorsAction;
-import org.eclipse.jdt.ui.actions.OverrideMethodsAction;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.text.edits.TextEdit;
-
-public class EjbBuilder {
-
- protected IProgressMonitor monitor;
-
- protected IPackageFragmentRoot packageFragmentRoot;
-
- protected String packageName = "";
-
- protected String typeName = "";
-
- protected String typeStub;
-
- protected String typeComment;
-
- protected String methodStub;
-
- protected String fields;
-
- protected boolean createInheritedMethods;
-
- protected boolean createInheritedConstructors;
-
- protected IConfigurationElement configurationElement;
-
- IType fCreatedType;
-
- public EjbBuilder() {
- super();
- }
-
- /**
- * Creates the new type using the entered field values.
- *
- * @param monitor
- * a progress monitor to report progress.
- */
- public void createType() throws CoreException, InterruptedException {
- monitor = getMonitor();
-
- monitor.beginTask("Creating a new type", 10);
-
- ICompilationUnit createdWorkingCopy = null;
- try {
- IPackageFragmentRoot root = getPackageFragmentRoot(); // Current
- // source
- // folder
- IPackageFragment pack = root.createPackageFragment(this.packageName, true, monitor); // Package
- // that
- // contains
- // the class
- monitor.worked(1);
-
- String clName = this.typeName;
-
- IType createdType;
- int indent = 0;
-
- String lineDelimiter = null;
- lineDelimiter = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-
- ICompilationUnit parentCU = pack.getCompilationUnit(clName + ".java");
- if (!parentCU.exists())
- parentCU = pack.createCompilationUnit(clName + ".java", "", false, new SubProgressMonitor(monitor, 2)); //$NON-NLS-1$ //$NON-NLS-2$
-
- // create a working copy with a new owner
- createdWorkingCopy = parentCU.getWorkingCopy(null);
-
- // use the compiler template a first time to read the imports
- String content = CodeGeneration.getCompilationUnitContent(createdWorkingCopy, null, "", lineDelimiter); //$NON-NLS-1$
- if (content != null) {
- createdWorkingCopy.getBuffer().setContents(content);
- }
-
- String cuContent = content + lineDelimiter + typeComment + lineDelimiter + typeStub;
- createdWorkingCopy.getBuffer().setContents(cuContent);
- createdType = createdWorkingCopy.getType(clName);
-
- // add imports for superclass/interfaces, so types can be resolved
- // correctly
- ICompilationUnit cu = createdType.getCompilationUnit();
-
- cu.reconcile(ICompilationUnit.NO_AST, false, null, null);
-
- // add imports
- createTypeMembers(createdType, null, new SubProgressMonitor(monitor, 1));
-
- if (isCreateInheritedMethods())
- createInheritedMethods(cu, createdType, new SubProgressMonitor(monitor, 1));
- if(isCreateInheritedConstructors())
- createInheritedConstructors(cu, createdType, new SubProgressMonitor(monitor, 1));
-
- cu.reconcile(ICompilationUnit.NO_AST, false, null, null);
-
- ISourceRange range = createdType.getSourceRange();
-
- IBuffer buf = cu.getBuffer();
- String originalContent = buf.getText(range.getOffset(), range.getLength());
- CodeFormatter codeFormatter = ToolFactory.createCodeFormatter(JavaCore.getOptions());
- TextEdit textEdit = codeFormatter.format(CodeFormatter.K_CLASS_BODY_DECLARATIONS, originalContent, 0, originalContent
- .length(), indent, lineDelimiter);
- IDocument document = new Document(originalContent);
- try {
- textEdit.apply(document);
- } catch (Exception e) {
- }
- String formattedContent = document.get();
-
- buf.replace(range.getOffset(), range.getLength(), formattedContent);
- cu.getBuffer().setContents(buf.getContents());
- cu.commitWorkingCopy(false, new SubProgressMonitor(monitor, 1));
-
- fCreatedType = (IType) createdType.getPrimaryElement();
-
- } finally {
- if (createdWorkingCopy != null) {
- createdWorkingCopy.discardWorkingCopy();
- }
- monitor.done();
- }
- }
-
- /**
- * @param createdType
- * @param imports
- * @param monitor2
- */
- private void createTypeMembers(IType createdType, ImportsManager imports, SubProgressMonitor monitor2) throws JavaModelException {
- if (fields != null && fields.length() > 0)
- createdType.createField(fields, null, false, this.getMonitor());
- if (methodStub != null && methodStub.length() > 0)
- createdType.createMethod(methodStub, null, false, this.getMonitor());
- }
-
- /**
- * Creates the bodies of all unimplemented methods and constructors and adds
- * them to the type. Method is typically called by implementers of
- * <code>NewTypeWizardPage</code> to add needed method and constructors.
- *
- * @param type
- * the type for which the new methods and constructor are to be
- * created
- * @param doConstructors
- * if <code>true</code> unimplemented constructors are created
- * @param doUnimplementedMethods
- * if <code>true</code> unimplemented methods are created
- * @param imports
- * an import manager to add all needed import statements
- * @param monitor
- * a progress monitor to report progress
- * @return the created methods.
- * @throws CoreException
- * thrown when the creation fails.
- */
- protected IMethod[] createInheritedMethods(ICompilationUnit cu, IType type, IProgressMonitor monitor) throws CoreException {
- cu.reconcile(ICompilationUnit.NO_AST, false, null, null);
- Set handleIds = getHandleIds(type);
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setResolveBindings(true);
- parser.setSource(cu);
- CompilationUnit unit = (CompilationUnit) parser.createAST(new SubProgressMonitor(monitor, 1));
- ITypeBinding binding = getBinding(type, unit);
-
- if (binding != null) {
- IWorkspaceRunnable operation = OverrideMethodsAction.createRunnable(unit, binding, null, -1, true);
- operation.run(monitor);
- cu.reconcile(ICompilationUnit.NO_AST, false, null, null);
- cu.commitWorkingCopy(false, monitor);
- }
-
- return getTypeMethods(type, handleIds);
- }
-
- protected IMethod[] createInheritedConstructors(ICompilationUnit cu, IType type, IProgressMonitor monitor) throws CoreException {
- cu.reconcile(ICompilationUnit.NO_AST, false, null, null);
- Set handleIds = getHandleIds(type);
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setResolveBindings(true);
- parser.setSource(cu);
- CompilationUnit unit = (CompilationUnit) parser.createAST(new SubProgressMonitor(monitor, 1));
- ITypeBinding binding = getBinding(type, unit);
-
- if (binding != null) {
- IWorkspaceRunnable operation = AddUnimplementedConstructorsAction.createRunnable(unit, binding, null, -1, true,
- Modifier.PUBLIC, true);
- operation.run(monitor);
- cu.commitWorkingCopy(false, monitor);
- }
-
- return getTypeMethods(type, handleIds);
- }
-
- private ITypeBinding getBinding(IType type, CompilationUnit unit) throws JavaModelException {
- ITypeBinding binding = null;
- ASTNode node = NodeFinder.perform(unit, type.getNameRange());
- do {
- node = node.getParent();
- } while (node != null && !AbstractTypeDeclaration.class.isInstance(node));
-
- AbstractTypeDeclaration declaration = (AbstractTypeDeclaration) node;
-
- if (declaration != null)
- binding = declaration.resolveBinding();
- return binding;
- }
-
- private Set getHandleIds(IType type) throws JavaModelException {
- Set handleIds;
- IMethod[] typeMethods = type.getMethods();
- handleIds = new HashSet(typeMethods.length);
- for (int index = 0; index < typeMethods.length; index++)
- handleIds.add(typeMethods[index].getHandleIdentifier());
- return handleIds;
- }
-
- private IMethod[] getTypeMethods(IType type, Set handleIds) throws JavaModelException {
- ArrayList newMethods = new ArrayList();
- IMethod[] typeMethods;
- typeMethods = type.getMethods();
- for (int index = 0; index < typeMethods.length; index++)
- if (!handleIds.contains(typeMethods[index].getHandleIdentifier()))
- newMethods.add(typeMethods[index]);
- IMethod[] methods = new IMethod[newMethods.size()];
- newMethods.toArray(methods);
- return methods;
- }
-
- protected void createImports(ImportsManager imports, String[] createdImports) {
- for (int index = 0; index < createdImports.length; index++)
- imports.addImport(createdImports[index]);
- }
-
- /**
- * @return
- */
- private IPackageFragmentRoot getPackageFragmentRoot() {
- return packageFragmentRoot;
- }
-
- protected boolean removeUnused(ICompilationUnit cu, ImportsManager imports) {
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(cu);
- parser.setResolveBindings(true);
- CompilationUnit root = (CompilationUnit) parser.createAST(null);
- IProblem[] problems = root.getProblems();
- boolean importRemoved = false;
- for (int i = 0; i < problems.length; i++) {
- if (problems[i].getID() == IProblem.UnusedImport) {
- String imp = problems[i].getArguments()[0];
- imports.removeImport(imp);
- importRemoved = true;
- }
- }
- return importRemoved;
- }
-
- /**
- * @return Returns the monitor.
- */
- public IProgressMonitor getMonitor() {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- return monitor;
- }
-
- /**
- * @param monitor
- * The monitor to set.
- */
- public void setMonitor(IProgressMonitor monitor) {
- this.monitor = monitor;
- }
-
- public static class ImportsManager {
-
- private ImportRewrite fImportsStructure;
-
- private HashSet fAddedTypes;
-
- ImportsManager(ICompilationUnit createdWorkingCopy) throws CoreException {
- fAddedTypes = new HashSet();
- fImportsStructure = CodeStyleConfiguration.createImportRewrite(createdWorkingCopy, true);
- }
-
- /* package */ImportRewrite getImportsStructure() {
- return fImportsStructure;
- }
-
- public String addImport(String qualifiedTypeName) {
- fAddedTypes.add(qualifiedTypeName);
- return fImportsStructure.addImport(qualifiedTypeName);
- }
-
- void create(ICompilationUnit cu, boolean toRestore) throws CoreException {
- ImportRewrite.create(cu, toRestore);
- TextEdit edit = fImportsStructure.rewriteImports(new NullProgressMonitor());
- IDocument document = new Document(cu.getSource());
- try {
- edit.apply(document);
- } catch (Exception e) {
- }
- String imports = document.get();
- cu.getBuffer().setContents(imports);
- cu.commitWorkingCopy(false, new NullProgressMonitor());
- }
-
- void removeImport(String qualifiedName) {
- if (fAddedTypes.contains(qualifiedName)) {
- fImportsStructure.removeImport(qualifiedName);
- }
- }
-
- }
-
- /**
- * @return Returns the fCreatedType.
- */
- public IType getCreatedType() {
- return fCreatedType;
- }
-
- /**
- * @param createdType
- * The fCreatedType to set.
- */
- public void setCreatedType(IType createdType) {
- fCreatedType = createdType;
- }
-
- /**
- * @return Returns the methodStub.
- */
- public String getMethodStub() {
- return methodStub;
- }
-
- /**
- * @param methodStub
- * The methodStub to set.
- */
- public void setMethodStub(String methodStub) {
- this.methodStub = methodStub;
- }
-
- /**
- * @return Returns the packageName.
- */
- public String getPackageName() {
- return packageName;
- }
-
- /**
- * @param packageName
- * The packageName to set.
- */
- public void setPackageName(String packageName) {
- this.packageName = packageName;
- }
-
- /**
- * @return Returns the typeComment.
- */
- public String getTypeComment() {
- return typeComment;
- }
-
- /**
- * @param typeComment
- * The typeComment to set.
- */
- public void setTypeComment(String typeComment) {
- this.typeComment = typeComment;
- }
-
- /**
- * @return Returns the typeName.
- */
- public String getTypeName() {
- return typeName;
- }
-
- /**
- * @param typeName
- * The typeName to set.
- */
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
-
- /**
- * @return Returns the typeStub.
- */
- public String getTypeStub() {
- return typeStub;
- }
-
- /**
- * @param typeStub
- * The typeStub to set.
- */
- public void setTypeStub(String typeStub) {
- this.typeStub = typeStub;
- }
-
- /**
- * @param packageFragmentRoot
- * The packageFragmentRoot to set.
- */
- public void setPackageFragmentRoot(IPackageFragmentRoot packageFragmentRoot) {
- this.packageFragmentRoot = packageFragmentRoot;
- }
-
- /**
- * @return Returns the fields.
- */
- public String getFields() {
- return fields;
- }
-
- /**
- * @param fields
- * The fields to set.
- */
- public void setFields(String fields) {
- this.fields = fields;
- }
-
- /**
- * @return Returns the configurationElement.
- */
- public IConfigurationElement getConfigurationElement() {
- return configurationElement;
- }
-
- /**
- * @param configurationElement
- * The configurationElement to set.
- */
- public void setConfigurationElement(IConfigurationElement configurationElement) {
- this.configurationElement = configurationElement;
- }
-
- public boolean isCreateInheritedConstructors() {
- return createInheritedConstructors;
- }
-
- public void setCreateInheritedConstructors(boolean createInheritedConstructors) {
- this.createInheritedConstructors = createInheritedConstructors;
- }
-
- public boolean isCreateInheritedMethods() {
- return createInheritedMethods;
- }
-
- public void setCreateInheritedMethods(boolean createInheritedMethods) {
- this.createInheritedMethods = createInheritedMethods;
- }
-
- public static class NodeFinder extends ASTVisitor {
-
- public static ASTNode perform(ASTNode root, int start, int length) {
- NodeFinder finder = new NodeFinder(start, length);
- root.accept(finder);
- ASTNode result = finder.getCoveredNode();
- if (result == null || result.getStartPosition() != start || result.getLength() != length) {
- return finder.getCoveringNode();
- }
- return result;
- }
-
- public static ASTNode perform(ASTNode root, ISourceRange range) {
- return perform(root, range.getOffset(), range.getLength());
- }
-
- private int fStart;
-
- private int fEnd;
-
- private ASTNode fCoveringNode;
-
- private ASTNode fCoveredNode;
-
- public NodeFinder(int offset, int length) {
- super(true); // include Javadoc tags
- fStart = offset;
- fEnd = offset + length;
- }
-
- protected boolean visitNode(ASTNode node) {
- int nodeStart = node.getStartPosition();
- int nodeEnd = nodeStart + node.getLength();
- if (nodeEnd < fStart || fEnd < nodeStart) {
- return false;
- }
- if (nodeStart <= fStart && fEnd <= nodeEnd) {
- fCoveringNode = node;
- }
- if (fStart <= nodeStart && nodeEnd <= fEnd) {
- if (fCoveringNode == node) { // nodeStart == fStart &&
- // nodeEnd == fEnd
- fCoveredNode = node;
- return true; // look further for node with same length as
- // parent
- } else if (fCoveredNode == null) { // no better found
- fCoveredNode = node;
- }
- return false;
- }
- return true;
- }
-
- public boolean visit(CompilationUnit node) {
- return visitNode(node);
- }
-
- public boolean visit(PackageDeclaration node) {
- return visitNode(node);
- }
-
- public boolean visit(TypeDeclaration node) {
- return visitNode(node);
- }
-
- public boolean visit(Javadoc node) {
- if (super.visit(node))
- return visitNode(node);
- else
- return false;
- }
-
- public boolean visit(Modifier node) {
- return visitNode(node);
- }
-
- public boolean visit(SimpleName node) {
- return visitNode(node);
- }
-
- public boolean visit(SimpleType node) {
- return visitNode(node);
- }
-
- public boolean visit(MethodDeclaration node) {
- return visitNode(node);
- }
-
- /**
- * Returns the covered node. If more than one nodes are covered by the
- * selection, the returned node is first covered node found in a
- * top-down traversal of the AST
- *
- * @return ASTNode
- */
- public ASTNode getCoveredNode() {
- return fCoveredNode;
- }
-
- /**
- * Returns the covering node. If more than one nodes are covering the
- * selection, the returned node is last covering node found in a
- * top-down traversal of the AST
- *
- * @return ASTNode
- */
- public ASTNode getCoveringNode() {
- return fCoveringNode;
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultClasspathProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultClasspathProvider.java
deleted file mode 100644
index 5cd6629..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultClasspathProvider.java
+++ /dev/null
@@ -1,42 +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.annotations.internal.emitter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class DefaultClasspathProvider implements IEmitterClasspathProvider {
-
- protected ArrayList list = null;
- public DefaultClasspathProvider() {
- super();
- list = new ArrayList();
- }
-
-
- public List getClasspathItems() {
- list.clear();
- list.add("org.eclipse.emf.ecore");
- list.add("org.eclipse.emf.ecore.xmi");
- list.add("org.eclipse.emf.common");
- list.add("org.eclipse.jst.j2ee");
- list.add("org.eclipse.jst.j2ee.core");
- list.add("org.eclipse.jst.j2ee.ejb.annotation.model");
- list.add("org.eclipse.jst.j2ee.ejb.annotations.emitter");
- return list;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultEjbIntrospector.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultEjbIntrospector.java
deleted file mode 100644
index 0f699f5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultEjbIntrospector.java
+++ /dev/null
@@ -1,79 +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.annotations.internal.emitter;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public abstract class DefaultEjbIntrospector implements IEjbIntrospector {
-
-
-
- public abstract EnterpriseBean getEnterpriseBean();
-
- protected boolean isEntityBean(ICompilationUnit unit) {
-
- try {
- IType type = unit.findPrimaryType();
- String[] inter = type.getSuperInterfaceNames();
- for (int i = 0; i < inter.length; i++) {
- if (inter[i].endsWith("EntityBean")) {
- return true;
- }
- }
- } catch (JavaModelException e) {
- }
- return false;
- }
-
- protected boolean isMDBBean(ICompilationUnit unit) {
-
- try {
- IType type = unit.findPrimaryType();
- String[] inter = type.getSuperInterfaceNames();
- for (int i = 0; i < inter.length; i++) {
- if (inter[i].endsWith("MessageDrivenBean")) {
- return true;
- }
- }
- } catch (JavaModelException e) {
- }
- return false;
- }
-
- /**
- * @return
- */
- protected boolean isSessionBean(ICompilationUnit unit) {
-
- try {
- IType type = unit.findPrimaryType();
- String[] inter = type.getSuperInterfaceNames();
- for (int i = 0; i < inter.length; i++) {
- if (inter[i].endsWith("SessionBean")) {
- return true;
- }
- }
- } catch (JavaModelException e) {
- }
- return false;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitter.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitter.java
deleted file mode 100644
index 2871d60..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitter.java
+++ /dev/null
@@ -1,151 +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.annotations.internal.emitter;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.codegen.jet.JETException;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-import org.eclipse.jst.j2ee.internal.project.WTPJETEmitter;
-
-public abstract class EjbEmitter {
- public static final String CLASSPATHPROVIDER = "classpathProvider";
-
- public static final String JAVACLASSPATHVARIABLEPREFIX = "WTPEJBEMITTER";
-
- public static final String EJBEMITTERPROJECT = ".WtpEjbEmitter";
-
- protected IConfigurationElement emitterConfig;
-
- protected IEmitterClasspathProvider classpathProvider;
-
- protected String base;
-
- protected IProgressMonitor monitor;
-
- public EjbEmitter(IConfigurationElement emitterConfig) throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- this.emitterConfig = emitterConfig;
- String pluginDescriptor = emitterConfig.getDeclaringExtension().getContributor().getName();
-
- org.osgi.framework.Bundle bundle = Platform.getBundle(pluginDescriptor);
- Class c = bundle.loadClass(emitterConfig.getAttribute(CLASSPATHPROVIDER));
- classpathProvider = (IEmitterClasspathProvider) c.newInstance();
- base = bundle.getEntry("/").toString();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(EJBEMITTERPROJECT);
- IProgressMonitor monitor = new NullProgressMonitor();
- project.delete(true, true, monitor);
- }
-
- public abstract String emitTypeComment(IEnterpriseBean enterpriseBean) throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException;
-
- public abstract String emitTypeStub(IEnterpriseBean enterpriseBean) throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException;
-
- public abstract String emitInterfaceMethods(IEnterpriseBean enterpriseBean) throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException;
-
- public abstract String emitFields(IEnterpriseBean enterpriseBean) throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException;
-
- /**
- * @param uri
- * @return
- * @throws JETException
- */
- protected WTPJETEmitter createJetEmitter(String uri) throws JETException {
- WTPJETEmitter emitter = new WTPJETEmitter(uri, this.getClass().getClassLoader());
- emitter.setProjectName(WTPJETEmitter.PROJECT_NAME);
- emitter.setIntelligentLinkingEnabled(true);
- Iterator iterator = classpathProvider.getClasspathItems().iterator();
- int count = 0;
- while (iterator.hasNext()) {
- String cpItem = (String) iterator.next();
- emitter.addVariable(JAVACLASSPATHVARIABLEPREFIX + count++, cpItem);
- }
- return emitter;
- }
-
- public String generate(String templatesBase, String template, IEnterpriseBean enterpriseBean) throws CoreException {
- String uri = base + templatesBase + template;
- String result = "";
- IProgressMonitor aMonitor = this.getMonitor();
- try {
- WTPJETEmitter emitter = createJetEmitter(uri);
- result = emitter.generate(aMonitor, new Object[] { enterpriseBean });
- } catch (JETException e) {
- throw new CoreException(e.getStatus());
- }
- return result;
- }
-
- /**
- * @return Returns the monitor.
- */
- public IProgressMonitor getMonitor() {
- if (monitor == null) {
- monitor = new IProgressMonitor() {
- private boolean cancelled = false;
-
- public void beginTask(String name, int totalWork) {
- System.out.println(this.getClass() + " Progress (" + totalWork + "): " + name);
- }
-
- public void done() {
- }
-
- public void internalWorked(double work) {
- }
-
- public boolean isCanceled() {
- return cancelled;
- }
-
- public void setCanceled(boolean value) {
- cancelled = value;
- }
-
- public void setTaskName(String name) {
- System.out.println(this.getClass() + " Progress Task(" + name + "): ");
- }
-
- public void subTask(String name) {
- System.out.println(this.getClass() + " Progress SubTask(" + name + "): ");
- }
-
- public void worked(int work) {
- }
- };
- }
- return monitor;
- }
-
- /**
- * @param monitor
- * The monitor to set.
- */
- public void setMonitor(IProgressMonitor monitor) {
- this.monitor = monitor;
- }
-
- public void deleteProject() throws CoreException {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(EJBEMITTERPROJECT);
- IProgressMonitor monitor = new NullProgressMonitor();
- project.delete(true, true, monitor);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitterPlugin.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitterPlugin.java
deleted file mode 100644
index c5ebb76..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitterPlugin.java
+++ /dev/null
@@ -1,81 +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.annotations.internal.emitter;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-
-public class EjbEmitterPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static EjbEmitterPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public EjbEmitterPlugin() {
- 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 EjbEmitterPlugin 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 = EjbEmitterPlugin.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.annotations.internal.emitter.model.emitter.EjbEmitterPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EmitterUtilities.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EmitterUtilities.java
deleted file mode 100644
index 03db733..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EmitterUtilities.java
+++ /dev/null
@@ -1,50 +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.annotations.internal.emitter;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-/**
- * @author naci
- */
-public class EmitterUtilities {
-
- final static String JAVABUILDER = JavaCore.BUILDER_ID;
-
- public static void addAnnotationBuilderToProject(IConfigurationElement emitter, IProject targetProject) throws CoreException {
- String builderId = emitter.getAttribute("builderId");
- ProjectUtilities.addToBuildSpecBefore(emitter.getContributor().getName() + "." + builderId, JAVABUILDER, targetProject);
-
- }
-
- public static IConfigurationElement findEmitter(String id) {
-
- IConfigurationElement configurationElement[] = getAnnotationExtensions();
- for (int i = 0; i < configurationElement.length; i++) {
- IConfigurationElement element = configurationElement[i];
- String emitterId = element.getAttribute("name");
- if ("emitter".equals(element.getName()) && emitterId != null && emitterId.equals(id))
- return element;
- }
- return null;
- }
-
- public static IConfigurationElement[] getAnnotationExtensions() {
- IConfigurationElement[] configurationElements = Platform.getExtensionRegistry().getConfigurationElementsFor(
- "org.eclipse.jst.j2ee.ejb.annotations.emitter.template");
- return configurationElements;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EntityEjbEmitter.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EntityEjbEmitter.java
deleted file mode 100644
index 25e207b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EntityEjbEmitter.java
+++ /dev/null
@@ -1,48 +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.annotations.internal.emitter;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-
-public class EntityEjbEmitter extends EjbEmitter {
- public static final String TYPE_COMMENT = "/typeComment.javajet";
- public static final String TYPE_STUB = "/typeStub.javajet";
- public static final String METHOD_STUBS = "/methodStubs.javajet";
- public static final String FIELDS = "/fields.javajet";
- public static final String TEMPLATESDIR = "entityTemplates";
- public EntityEjbEmitter(IConfigurationElement emitterConfig)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- super(emitterConfig);
- }
- public String emitTypeComment(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_COMMENT,
- root);
- }
- public String emitTypeStub(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_STUB,
- root);
- }
- public String emitInterfaceMethods(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), METHOD_STUBS,
- root);
- }
- public String emitFields(IEnterpriseBean root) throws ClassNotFoundException,
- InstantiationException, IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), FIELDS, root);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEjbIntrospector.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEjbIntrospector.java
deleted file mode 100644
index 4d2743f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEjbIntrospector.java
+++ /dev/null
@@ -1,21 +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.annotations.internal.emitter;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-
-public interface IEjbIntrospector {
-
- public abstract EnterpriseBean getEnterpriseBean();
- public abstract void setCompilationUnit(ICompilationUnit compilationUnit);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEmitterClasspathProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEmitterClasspathProvider.java
deleted file mode 100644
index d565a1d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEmitterClasspathProvider.java
+++ /dev/null
@@ -1,23 +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.annotations.internal.emitter;
-
-import java.util.List;
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public interface IEmitterClasspathProvider {
-
- List getClasspathItems();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/MessageDrivenEjbEmitter.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/MessageDrivenEjbEmitter.java
deleted file mode 100644
index 7045f18..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/MessageDrivenEjbEmitter.java
+++ /dev/null
@@ -1,48 +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.annotations.internal.emitter;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-
-public class MessageDrivenEjbEmitter extends EjbEmitter {
- public static final String TYPE_COMMENT = "/typeComment.javajet";
- public static final String TYPE_STUB = "/typeStub.javajet";
- public static final String METHOD_STUBS = "/methodStubs.javajet";
- public static final String FIELDS = "/fields.javajet";
- public static final String TEMPLATESDIR = "messageTemplates";
- public MessageDrivenEjbEmitter(IConfigurationElement emitterConfig)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- super(emitterConfig);
- }
- public String emitTypeComment(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_COMMENT,
- root);
- }
- public String emitTypeStub(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_STUB,
- root);
- }
- public String emitInterfaceMethods(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), METHOD_STUBS,
- root);
- }
- public String emitFields(IEnterpriseBean root) throws ClassNotFoundException,
- InstantiationException, IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), FIELDS, root);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/SessionEjbEmitter.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/SessionEjbEmitter.java
deleted file mode 100644
index 41c24e4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/SessionEjbEmitter.java
+++ /dev/null
@@ -1,49 +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.annotations.internal.emitter;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-
-
-public class SessionEjbEmitter extends EjbEmitter {
- public static final String TYPE_COMMENT = "/typeComment.javajet";
- public static final String TYPE_STUB = "/typeStub.javajet";
- public static final String METHOD_STUBS = "/methodStubs.javajet";
- public static final String FIELDS = "/fields.javajet";
- public static final String TEMPLATESDIR = "sessionTemplates";
- public SessionEjbEmitter(IConfigurationElement emitterConfig)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- super(emitterConfig);
- }
- public String emitTypeComment(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_COMMENT,
- root);
- }
- public String emitTypeStub(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_STUB,
- root);
- }
- public String emitInterfaceMethods(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), METHOD_STUBS,
- root);
- }
- public String emitFields(IEnterpriseBean root) throws ClassNotFoundException,
- InstantiationException, IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), FIELDS, root);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.classpath b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.classpath
deleted file mode 100644
index 386e99a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.classpath
+++ /dev/null
@@ -1,12 +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">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/jst/**"/>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.cvsignore
deleted file mode 100644
index e0c4599..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-ejbAnnotationsUi.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.project b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.project
deleted file mode 100644
index 95911fe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.ejb.annotations.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e23025b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Apr 17 15:48:15 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index f16529c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 15:48:15 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=user
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 8f9e5ec..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,39 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb.annotations.ui; singleton:=true
-Bundle-Version: 1.1.102.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.ejb.annotation.ui.internal;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotation.ui.internal.cmp.wizards;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotation.ui.internal.preferences;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb.annotation.model;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ejb.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.datatools.connectivity;resolution:=optional,
- org.eclipse.datatools.connectivity.ui.dse;resolution:=optional
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/about.html b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/build.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/build.properties
deleted file mode 100644
index 7e7a663..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = plugin.xml,\
- .,\
- icons/,\
- plugin.properties,\
- META-INF/,\
- about.html
-src.includes = build.properties
-source.. = src/
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/checked.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/checked.gif
deleted file mode 100644
index 00da14e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/checked.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/ejbgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/ejbgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif
deleted file mode 100644
index 1823211..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/clcl16/ejb_deploy_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/clcl16/ejb_deploy_action_obj.gif
deleted file mode 100644
index db8945f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/clcl16/ejb_deploy_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/new_ejb_wiz.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/new_ejb_wiz.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/new_ejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newejb_wiz.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newejb_wiz.gif
deleted file mode 100644
index d334fa0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newentityejb_wiz.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newentityejb_wiz.gif
deleted file mode 100644
index 46684a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newentityejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newmessageejb_wiz.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newmessageejb_wiz.gif
deleted file mode 100644
index effcc3f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newmessageejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newsessionejb_wiz.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newsessionejb_wiz.gif
deleted file mode 100644
index 50e231e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/ctool16/newsessionejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/wizban/ejb_wiz.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/wizban/ejb_wiz.gif
deleted file mode 100644
index 7f2aa1e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/wizban/ejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/wizban/newejb_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/wizban/newejb_wiz_ban.gif
deleted file mode 100644
index 2ee5da2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/full/wizban/newejb_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/sessionBean_obj.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/sessionBean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/unchecked.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/unchecked.gif
deleted file mode 100644
index 7aa131a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/icons/unchecked.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.properties
deleted file mode 100644
index 2199a4a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-ejb.category_ui_=EJB
-ejb.createbean_ui_= XDoclet Enterprise JavaBean
-new.ejb.description_ui_=Create XDoclet Enterprise JavaBean
-j2ee_annotations=J2EE Annotations
-J2EEAnnotationPropertiesPage.name=J2EE Annotations
-
-Bundle-Name.0 = EJB Annotations Ui Plug-in
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.xml
deleted file mode 100644
index 4d32579..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="ProviderPreferenceMapping" name="org.eclipse.jst.j2ee.ejb.annotations.ui.providerPreferenceMapping" schema="schema/ProviderPreferenceMapping.exsd"/>
-
-
-<!--================================-->
-<!-- EJB Creation Wizard Contributions -->
-<!--================================-->
-
- <extension
- id="org.eclipse.jst.j2ee.ejb.ui.wizards"
- point="org.eclipse.ui.newWizards">
- <category
- name="EJB"
- id="org.eclipse.jst.ejb.ui">
- </category>
- <wizard
- name="%ejb.createbean_ui_"
- icon="icons/full/ctool16/newejb_wiz.gif"
- category="org.eclipse.jst.ejb.ui"
- id="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.AddEjbWizard">
- <class class="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.AddEjbWizard">
- <parameter name="javaeeartifact" value="true"/>
- <parameter name="menuIndex" value="40" />
- </class>
- <description>
- %new.ejb.description_ui_
- </description>
- </wizard>
- </extension>
-
-<!--================================-->
-<!-- ANNOTATION PREFERENCES -->
-<!--================================-->
-
-<!-- Not used anymore
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- name="%j2ee_annotations"
- class="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.preferences.AnnotationPreferencePage"
- id="org.eclipse.jst.j2ee.ejb.annotation.ui.preferences">
- </page>
-
- </extension>
--->
-<!-- =========== org.eclipse.jst.j2ee.internal.J2EEAnnotationPropertiesPage ============ -->
-
-<!--
- <extension point="org.eclipse.ui.propertyPages">
- <page
- objectClass="org.eclipse.core.resources.IProject"
- name="%J2EEAnnotationPropertiesPage.name"
- class="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.preferences.AnnotationPreferencePage"
- id="J2EEAnnotationPropertiesPage">
- <filter
- name="nature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </filter>
- </page>
-
- <page
- objectClass="org.eclipse.jdt.core.IJavaProject"
- name="%J2EEAnnotationPropertiesPage.name"
- class="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.preferences.AnnotationPreferencePage"
- id="J2EEAnnotationPropertiesPage">
- <filter
- name="nature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </filter>
- </page>
- </extension>
--->
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/schema/ProviderPreferenceMapping.exsd b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/schema/ProviderPreferenceMapping.exsd
deleted file mode 100644
index 5f9559b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/schema/ProviderPreferenceMapping.exsd
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.ejb.annotations.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.ejb.annotations.ui" id="ProviderPreferenceMapping" name="org.eclipse.jst.j2ee.ejb.annotations.ui.providerPreferenceMapping"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="mapping"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="mapping">
- <annotation>
- <documentation>
- Provide a mapping between an annotation type and it's preference page
- </documentation>
- </annotation>
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The name of the provider.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="preferencePage" type="string" use="required">
- <annotation>
- <documentation>
- The preference page key.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/EjbAnnotationsUiPlugin.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/EjbAnnotationsUiPlugin.java
deleted file mode 100644
index 0b3c68d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/EjbAnnotationsUiPlugin.java
+++ /dev/null
@@ -1,101 +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.annotation.ui.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class EjbAnnotationsUiPlugin extends AbstractUIPlugin {
-
- public static final String PLUGINID= "org.eclipse.jst.j2ee.ejb.annotations.ui";
- //The shared instance.
- private static EjbAnnotationsUiPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public EjbAnnotationsUiPlugin() {
- 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 EjbAnnotationsUiPlugin 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 = EjbAnnotationsUiPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public ImageDescriptor getImageDescriptor(String path) {
- ImageDescriptor imageDescriptor = EjbAnnotationsUiPlugin.imageDescriptorFromPlugin(PLUGINID,path);
- return imageDescriptor;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- try {
- if (resourceBundle == null)
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.ui.EjbAnnotationsUiPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-
- public static void log(String message, Throwable throwable)
- {
- getDefault().getLog().log(new Status(IStatus.ERROR,PLUGINID,message,throwable ));
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/AddContainerManagedEntityBeanWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/AddContainerManagedEntityBeanWizardPage.java
deleted file mode 100644
index 0bd4950..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/AddContainerManagedEntityBeanWizardPage.java
+++ /dev/null
@@ -1,184 +0,0 @@
-
-/***************************************************************************************************
- * Copyright (c) 2005, 2006 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
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal.cmp.wizards;
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IContainerManagedEntityBeanDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.IBeanWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-
-public class AddContainerManagedEntityBeanWizardPage extends DataModelWizardPage implements IBeanWizardPage{
-
-
-
- private Text ejbNameText;
- private Text displayNameText;
- private Combo usecaseButton;
- private Combo versionButton;
- private Text schemaText;
-
-
-
- public AddContainerManagedEntityBeanWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(IEJBAnnotationConstants.ADD_EJB_CMPWIZARD_PAGE_DESC);
- this.setTitle(IEJBAnnotationConstants.ADD_EJB_CMPWIZARD_PAGE_TITLE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.common.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{
- IEnterpriseBeanClassDataModelProperties.EJB_NAME,
- IContainerManagedEntityBeanDataModelProperties.DATASOURCE,
- IContainerManagedEntityBeanDataModelProperties.SCHEMA,
- IContainerManagedEntityBeanDataModelProperties.VERSION,
- IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME,
- IEnterpriseBeanClassDataModelProperties.DESCRIPTION};
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- Composite group = new Composite(composite, SWT.NULL);
- group.setLayout(new GridLayout(2, false));
- group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- createNameDescription(group);
- createVersionGroup(group);
- createUsecaseTypeGroup(group);
- displayNameText.setFocus();
-
- IStatus projectStatus = validateProjectName();
- if (!projectStatus.isOK()) {
- setErrorMessage(projectStatus.getMessage());
- composite.setEnabled(false);
- }
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- protected IStatus validateProjectName() {
- // check for empty
- if (model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME) == null || model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME).trim().length() == 0) {
- return WTPCommonPlugin.createErrorStatus(IEJBAnnotationConstants.NO_EJB_PROJECTS);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected void createNameDescription(Composite composite) {
- // ejb name
- Label ejbNameLabel = new Label(composite, SWT.LEFT);
- ejbNameLabel.setText(IEJBAnnotationConstants.EJB_NAME_LABEL);
- ejbNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- ejbNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- ejbNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(ejbNameText, IEnterpriseBeanClassDataModelProperties.EJB_NAME, null);
-
-
- Label schemaLabel = new Label(composite, SWT.LEFT);
- schemaLabel.setText(IEJBAnnotationConstants.SCHEMA_NAME_LABEL);
- schemaLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- schemaText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- schemaText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(schemaText, IContainerManagedEntityBeanDataModelProperties.SCHEMA, null);
-
- // display name
- Label displayNameLabel = new Label(composite, SWT.LEFT);
- displayNameLabel.setText(IEJBAnnotationConstants.DISPLAY_NAME_LABEL);
- displayNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- displayNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- displayNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(displayNameText, IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME, null);
-
- // description
- Label descLabel = new Label(composite, SWT.LEFT);
- descLabel.setText(IEJBAnnotationConstants.DESCRIPTION_LABEL);
- descLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- final Text descText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- descText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(descText, IEnterpriseBeanClassDataModelProperties.DESCRIPTION, null);
- }
-
- protected void createUsecaseTypeGroup(Composite composite) {
-
- // description
- Label usecaseTypeLabel = new Label(composite, SWT.LEFT);
- usecaseTypeLabel.setText(IEJBAnnotationConstants.ENTITY_USECASE_LABEL);
- usecaseTypeLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- usecaseButton = new Combo(composite,SWT.DROP_DOWN | SWT.READ_ONLY);
- usecaseButton.setItems(new String[]{IEJBAnnotationConstants.CMP_FROM_TABLE,IEJBAnnotationConstants.CMP_FROM_BEAN});
- usecaseButton.setText(IEJBAnnotationConstants.CMP_FROM_TABLE);
- usecaseButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- usecaseButton.select(0);
- //synchHelper.synchCombo(usecaseTypeLabel, IContainerManagedEntityBeanDataModelProperties.TYPE, null);
-
- }
- protected void createVersionGroup(Composite composite) {
-
- // description
- Label versionLabel = new Label(composite, SWT.LEFT);
- versionLabel.setText(IEJBAnnotationConstants.ENTITY_VERSION_LABEL);
- versionLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- versionButton = new Combo(composite,SWT.DROP_DOWN | SWT.READ_ONLY);
- versionButton.setItems(new String[]{ContainerManagedEntity.VERSION_1_X,ContainerManagedEntity.VERSION_2_X});
- versionButton.setText(IEJBAnnotationConstants.CMP_FROM_TABLE);
- versionButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- versionButton.select(0);
- synchHelper.synchCombo(versionButton, IContainerManagedEntityBeanDataModelProperties.VERSION, null);
-
- }
-
- public boolean canFlipToNextPage() {
- return super.canFlipToNextPage();
- }
-
-
- public String getDisplayName() {
- return displayNameText.getText();
- }
-
- public String getEjbName() {
- return model.getStringProperty(IEnterpriseBeanClassDataModelProperties.EJB_NAME);
- }
-
- public boolean isJavaBean() {
- if( usecaseButton == null)
- return false;
- return usecaseButton.getSelectionIndex() == 1;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/AddContainerManagedEntityEjbWizard.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/AddContainerManagedEntityEjbWizard.java
deleted file mode 100644
index ed82dd5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/AddContainerManagedEntityEjbWizard.java
+++ /dev/null
@@ -1,265 +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.annotation.ui.internal.cmp.wizards;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.datatools.connectivity.IConnectionProfile;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.ContainerManagedEntityBeanDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IContainerManagedEntityBeanDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.IEJBUIContextIds;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.NewEjbClassOptionsWizardPage;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.NewEjbClassWizardPage;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.NewEjbWizard;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-
-public class AddContainerManagedEntityEjbWizard extends NewEjbWizard {
- protected NewEjbClassWizardPage newJavaClassWizardPage = null;
-
- protected AddContainerManagedEntityBeanWizardPage addEntityBeanWizardPage = null;
-
- protected NewEjbClassOptionsWizardPage newEjbClassOptionsWizardPage = null;
-
- private ConnectionSelectionPage connectionPage;
-
- private ChooseTableWizardPage tablePage;
-
- public static final String PAGE_ONE_NAME = "entity.pageOne"; //$NON-NLS-1$
-
- public static final String PAGE_TWO_NAME = "entity.pageTwo"; //$NON-NLS-1$
-
- public static final String PAGE_THREE_NAME = "entity.pageThree"; //$NON-NLS-1$
-
- public static final String CMP_TABLE_PAGE = "org.eclipse.jst.ejb.ui.cmp.TablePage";
-
- public static final String JDBCPAGE = "org.eclipse.jst.ejb.ui.cmp.NewCWJDBCPage";
-
- public static final String CONNECTION_PAGE = "org.eclipse.jst.ejb.ui.cmp.ConnectionPage";
-
- /**
- * @param model
- */
- public AddContainerManagedEntityEjbWizard(IDataModel model) {
- super(model);
- setWindowTitle(IEJBAnnotationConstants.ADD_EJB_WIZARD_WINDOW_TITLE);
- setDefaultPageImageDescriptor(EjbAnnotationsUiPlugin.getDefault()
- .getImageDescriptor("icons/full/wizban/newejb_wiz_ban.gif")); //$NON-NLS-1$
- }
-
- public AddContainerManagedEntityEjbWizard() {
- this(null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- */
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- super.init(workbench, selection);
- IProject project = getDefaultEjbProject();
- if (project != null) {
- getDataModel().setProperty(
- IArtifactEditOperationDataModelProperties.PROJECT_NAME,
- project.getName());
- }
- initializeEjbNameListener(getDataModel());
- }
-
- private void initializeEjbNameListener(final IDataModel dataModel) {
- dataModel.addListener(new IDataModelListener() {
-
- public void propertyChanged(DataModelEvent event) {
- if (INewJavaClassDataModelProperties.CLASS_NAME.equals(event
- .getPropertyName())) {
- String className = (String) event.getProperty();
- int i = className.toLowerCase().indexOf("bean");
- if (i < 0)
- i = className.toLowerCase().indexOf("ejb");
- if (i >= 0)
- className = className.substring(0, i);
- if (className.length() > 0) {
- // Unset these properties. They will be set with new
- // values when EJB_NAME property is set.
- dataModel
- .setProperty(
- IContainerManagedEntityBeanDataModelProperties.DATASOURCE,
- null);
- dataModel
- .setProperty(
- IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME,
- null);
- dataModel
- .setProperty(
- IEnterpriseBeanClassDataModelProperties.DESCRIPTION,
- null);
- dataModel
- .setProperty(
- IContainerManagedEntityBeanDataModelProperties.SCHEMA,
- null);
-
- // Set the EJB_NAME property. Call to
- // DataModelProvider.propertySet() will be triggered
- // that will reset the above properties.
- dataModel
- .setProperty(
- IEnterpriseBeanClassDataModelProperties.EJB_NAME,
- className);
- }
- }
- }
- });
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new ContainerManagedEntityBeanDataModelProvider();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void doAddPages() {
- try {
- newJavaClassWizardPage = new NewEjbClassWizardPage(
- getDataModel(),
- PAGE_ONE_NAME,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_TITLE,
- J2EEProjectUtilities.EJB);
- newJavaClassWizardPage
- .setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_2);
- addPage(newJavaClassWizardPage);
-
- addEntityBeanWizardPage = new AddContainerManagedEntityBeanWizardPage(
- getDataModel(), PAGE_TWO_NAME);
- addEntityBeanWizardPage
- .setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_4);
- addPage(addEntityBeanWizardPage);
- addEntityBeanWizardPage.setPageComplete(false);
-
- // This adds the JDBC connection configuration page which allows
- // user to
- // configure the properties for a new JDBC connection.
- connectionPage = new ConnectionSelectionPage(getDataModel(),
- AddContainerManagedEntityEjbWizard.CONNECTION_PAGE);
- addPage(connectionPage);
-
- // This adds the JDBC connection configuration page which allows
- // user to
- // configure the properties for a new JDBC connection.
- tablePage = new ChooseTableWizardPage(getDataModel(),
- AddContainerManagedEntityEjbWizard.CMP_TABLE_PAGE);
- addPage(tablePage);
- tablePage.setWizard(this);
-
- newEjbClassOptionsWizardPage = new NewEjbClassOptionsWizardPage(
- getDataModel(),
- PAGE_THREE_NAME,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
- IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_TITLE);
- newEjbClassOptionsWizardPage
- .setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_3);
- addPage(newEjbClassOptionsWizardPage);
- } catch (NoClassDefFoundError noClassDef) {
- //TODO: Externalize this string past 2.0
- EjbAnnotationsUiPlugin.log("Ejb 2.1 cmp wizard needs DTP. Please install eclipse data tools.", noClassDef);
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.common.ui.wizard.WTPWizard#runForked()
- */
- protected boolean runForked() {
- return true;
- }
-
- public IConnectionProfile getConnectionInfo() {
- return connectionPage.getSelectedConnection();
- }
-
- public void updateTables() {
- if (tablePage != null)
- tablePage.updateTables();
- }
-
- public boolean isJavaBean() {
- if (addEntityBeanWizardPage != null)
- return addEntityBeanWizardPage.isJavaBean();
- return false;
- }
-
- public boolean canFinish() {
- if (newJavaClassWizardPage != null
- && newJavaClassWizardPage.isPageComplete()
- && addEntityBeanWizardPage != null
- && connectionPage != null
- && tablePage != null
- && addEntityBeanWizardPage.isPageComplete()
- && (addEntityBeanWizardPage.isJavaBean() || connectionPage
- .isPageComplete()) && tablePage.isPageComplete()) {
- return true;
- }
-
- return false;
- }
-
- public IWizardPage getNextPage(IWizardPage page) {
-
- IWizardPage next = super.getNextPage(page);
- if (next == tablePage)
- this.updateTables();
- return next;
- }
-
- public String getNextPage(String currentPageName,
- String expectedNextPageName) {
- if (null != expectedNextPageName
- && expectedNextPageName.equals(CONNECTION_PAGE)
- && addEntityBeanWizardPage.isJavaBean()) {
- return IDMPageHandler.PAGE_AFTER + CONNECTION_PAGE;
- }
- return super.getNextPage(currentPageName, expectedNextPageName);
- }
-
- public String getPreviousPage(String currentPageName,
- String expectedPreviousPageName) {
- if (expectedPreviousPageName.equals(CONNECTION_PAGE)
- && addEntityBeanWizardPage.isJavaBean()) {
- return IDMPageHandler.PAGE_BEFORE + CONNECTION_PAGE;
- }
- return super.getPreviousPage(currentPageName, expectedPreviousPageName);
- }
-
- public boolean testConnection() {
- return true;
- }
-
- public IProject getDefaultEjbProject() {
- return super.getDefaultEjbProject();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/CMPUtils.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/CMPUtils.java
deleted file mode 100644
index 91b0600..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/CMPUtils.java
+++ /dev/null
@@ -1,163 +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.annotation.ui.internal.cmp.wizards;
-
-import java.sql.Types;
-
-public class CMPUtils {
-
- protected static String[] jdbcTypes = { "ARRAY", "BIGINT", "BINARY", "BIT", "BLOB", "BOOLEAN", "CHAR", "CLOB", "DATALINK", "DATE",
- "DECIMAL", "DISTINCT", "DOUBLE", "FLOAT", "INTEGER", "JAVA_OBJECT", "LONGVARBINARY", "LONGVARCHAR", "NULL", "NUMERIC",
- "OTHER", "REAL", "REF", "SMALLINT", "STRUCT", "TIME", "TIMESTAMP", "TINYINT", "VARBINARY", "VARCHAR" };// EjbConstants.LABEL_JDBCTYPES;
- protected static String[] sqlTypes = { "BIGINT", "BINARY", "BIT", "BLOB", "BOOLEAN", "CHAR", "CLOB", "DATE", "DECIMAL", "DOUBLE",
- "FLOAT", "INTEGER", "JAVA_OBJECT", "LONGVARBINARY", "LONGVARCHAR", "NULL", "NUMERIC", "REAL", "REF", "SMALLINT", "STRUCT",
- "TIME", "TIMESTAMP", "TINYINT", "VARBINARY", "VARCHAR" };
-
- public static String getSqlType(int type) {
- switch (type) {
- case Types.ARRAY:
- return "ARRAY";
- case Types.BIGINT:
- return "BIGINT";
- case Types.BINARY:
- return "BINARY";
- case Types.BIT:
- return "BIT";
- case Types.BLOB:
- return "BLOB";
- case Types.BOOLEAN:
- return "BOOLEAN";
- case Types.CHAR:
- return "CHAR";
- case Types.CLOB:
- return "CLOB";
- case Types.DATALINK:
- return "DATALINK";
- case Types.DATE:
- return "DATE";
- case Types.DECIMAL:
- return "DECIMAL";
- case Types.DISTINCT:
- return "DISTINCT";
- case Types.DOUBLE:
- return "DOUBLE";
- case Types.FLOAT:
- return "FLOAT";
- case Types.INTEGER:
- return "INTEGER";
- case Types.JAVA_OBJECT:
- return "JAVA_OBJECT";
- case Types.LONGVARBINARY:
- return "LONGVARBINARY";
- case Types.LONGVARCHAR:
- return "LONGVARCHAR";
- case Types.NULL:
- return "NULL";
- case Types.NUMERIC:
- return "NUMERIC";
- case Types.OTHER:
- return "OTHER";
- case Types.REAL:
- return "REAL";
- case Types.REF:
- return "REF";
- case Types.SMALLINT:
- return "SMALLINT";
- case Types.STRUCT:
- return "STRUCT";
- case Types.TIME:
- return "TIME";
- case Types.TIMESTAMP:
- return "TIMESTAMP";
- case Types.VARBINARY:
- return "VARBINARY";
- case Types.VARCHAR:
- return "VARCHAR";
-
- }
- return "NULL";
- }
-
- public static String getAttributeType(int type) {
- switch (type) {
- case Types.ARRAY:
- return "java.lang.Object[]";
- case Types.BIGINT:
- return "java.lang.Long";
- case Types.BINARY:
- return "java.lang.Byte[]";
- case Types.BIT:
- return "java.lang.Byte";
- case Types.BLOB:
- return "java.lang.Byte[]";
- case Types.BOOLEAN:
- return "java.lang.Boolean";
- case Types.CHAR:
- return "java.lang.Character";
- case Types.CLOB:
- return "java.lang.Character[]";
- case Types.DATALINK:
- return "java.lang.String";
- case Types.DATE:
- return "java.sql.Date";
- case Types.DECIMAL:
- return "java.math.BigDecimal";
- case Types.DISTINCT:
- return "java.lang.String";
- case Types.DOUBLE:
- return "java.lang.Double";
- case Types.FLOAT:
- return "java.lang.Float";
- case Types.INTEGER:
- return "java.lang.Integer";
- case Types.JAVA_OBJECT:
- return "java.lang.Object";
- case Types.LONGVARBINARY:
- return "java.lang.String";
- case Types.LONGVARCHAR:
- return "java.lang.String";
- case Types.NULL:
- return "java.lang.String";
- case Types.NUMERIC:
- return "java.math.BigDecimal";
- case Types.OTHER:
- return "java.lang.String";
- case Types.REAL:
- return "java.math.BigDecimal";
- case Types.REF:
- return "java.lang.String";
- case Types.SMALLINT:
- return "java.lang.Integer";
- case Types.STRUCT:
- return "java.lang.Object";
- case Types.TIME:
- return "java.sql.Time";
- case Types.TIMESTAMP:
- return "java.sql.Timestamp";
- case Types.VARBINARY:
- return "java.lang.Object";
- case Types.VARCHAR:
- return "java.lang.String";
-
- }
- return "java.lang.String";
- }
-
- public static int getSqlTypeFromJDBC(int jdbcType)
- {
- for (int i = 0; i < sqlTypes.length; i++) {
- String sqlType = sqlTypes[i];
- if(sqlType.equals(jdbcTypes[jdbcType]))
- return i;
- }
- return -1;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/ChooseTableWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/ChooseTableWizardPage.java
deleted file mode 100644
index ca6271c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/ChooseTableWizardPage.java
+++ /dev/null
@@ -1,718 +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.annotation.ui.internal.cmp.wizards;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.datatools.connectivity.IConnection;
-import org.eclipse.datatools.connectivity.IConnectionProfile;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.internal.ui.refactoring.contentassist.ControlContentAssistHelper;
-import org.eclipse.jdt.internal.ui.refactoring.contentassist.JavaTypeCompletionProcessor;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.CMPAttributeDelegate;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IContainerManagedEntityBeanDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-public class ChooseTableWizardPage extends DataModelWizardPage {
-
- protected final Image fChecked = EjbAnnotationsUiPlugin.getDefault().getImageDescriptor("icons/checked.gif").createImage();
-
- protected final Image fUnchecked = EjbAnnotationsUiPlugin.getDefault().getImageDescriptor("icons/unchecked.gif").createImage();
-
- private String[] sqlTypes = CMPUtils.sqlTypes;
-
- private Combo catalogButton;
-
- private Table attributeTable;
-
- private TableViewer attributeTableViewer;
-
- private Button add;
-
- private Button remove;
-
- private ArrayList tableList = new ArrayList();
-
- public void dispose() {
- super.dispose();
- fUnchecked.dispose();
- fChecked.dispose();
- }
-
- public ChooseTableWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(IEJBAnnotationConstants.ADD_CMP_TABLE_WIZARD_PAGE_DESC);
- this.setTitle(IEJBAnnotationConstants.ADD_CMP_TABLE_WIZARD_PAGE_TITLE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.common.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[] { IContainerManagedEntityBeanDataModelProperties.ATTRIBUTES,
- IContainerManagedEntityBeanDataModelProperties.TABLE };
- }
-
- protected List getAttributes() {
- List attr = (List) this.getDataModel().getProperty(IContainerManagedEntityBeanDataModelProperties.ATTRIBUTES);
- if (!this.getDataModel().isPropertySet(IContainerManagedEntityBeanDataModelProperties.ATTRIBUTES)) {
- this.getDataModel().setProperty(IContainerManagedEntityBeanDataModelProperties.ATTRIBUTES, attr);
- }
- return attr;
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- Composite group = new Composite(composite, SWT.NULL);
- group.setLayout(new GridLayout(2, false));
- group.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-
- createCatalogGroup(group);
- attributeTable = createTable(composite);
- attributeTableViewer = createTableViewer(attributeTable);
-
- return composite;
- }
-
- protected void createCatalogGroup(Composite composite) {
-
- // description
- Label catalogLabel = new Label(composite, SWT.LEFT);
- catalogLabel.setText(IEJBAnnotationConstants.CMP_TABLE_CHOOSE_TABLE);
- catalogLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- if (((AddContainerManagedEntityEjbWizard) this.getWizard()).isJavaBean()) {
- catalogButton = new Combo(composite, SWT.DROP_DOWN);
-
- } else {
- catalogButton = new Combo(composite, SWT.DROP_DOWN);// |
- // SWT.READ_ONLY)
- }
- synchHelper.synchCombo(catalogButton, IContainerManagedEntityBeanDataModelProperties.TABLE, null);
- catalogButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_VERTICAL));
- catalogButton.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent e) {
- if (tableList.size() >= 1 && catalogButton.getSelectionIndex() != -1) {
- fillTableWith((String) tableList.get(catalogButton.getSelectionIndex()));
- attributeTable.removeAll();
- attributeTable.setData(getAttributes());
- attributeTableViewer.setInput(getAttributes());
- attributeTableViewer.refresh();
- }
- }
-
- public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- this.widgetDefaultSelected(e);
- }
- });
- updateTables();
-
- }
-
- private void fillTableWith(String tableName) {
- Connection connection = null;
- ArrayList attributes = new ArrayList();
- if (!((AddContainerManagedEntityEjbWizard) this.getWizard()).isJavaBean()) {
- try {
- IConnectionProfile connectionInfo = getConnectionInfo();
- if (connectionInfo == null)
- return;
-// String passw = connectionInfo.getPassword();
-// if (passw == null || passw.length() == 0)
-// passw = "password";
-// connectionInfo.setPassword(passw);
-
- IStatus connectionStatus = connectionInfo.connect();
-
- if (! connectionStatus.isOK())
- return;
- IConnection dbConnection = connectionInfo.getManagedConnection("java.sql.Connection").getConnection();
- connection = (Connection)dbConnection.getRawConnection();
-
- DatabaseMetaData metaData = connection.getMetaData();
- String schema = null;
- int scIndex = tableName.indexOf(".");
- if (scIndex >= 0) {
- schema = tableName.substring(0, scIndex);
- tableName = tableName.substring(scIndex + 1);
- }
-
- ResultSet columns = metaData.getColumns(null, schema, tableName, "%");
- while (columns.next()) {
- int datasize = columns.getInt("COLUMN_SIZE");
- int digits = columns.getInt("DECIMAL_DIGITS");
-
- CMPAttributeDelegate atr = new CMPAttributeDelegate();
- atr.setName(columns.getString("COLUMN_NAME").toLowerCase());
- atr.setAttributeType(CMPUtils.getAttributeType(columns.getInt("DATA_TYPE")));
- atr.setJdbcType(CMPUtils.getSqlType(columns.getInt("DATA_TYPE")));
- atr.setSqlType(columns.getString("TYPE_NAME"));
- atr.setColumnName(columns.getString("COLUMN_NAME"));
- atr.setDecimalDigits(digits);
- atr.setColumnSize(datasize);
- attributes.add(atr);
- }
- ResultSet primaryKeys = metaData.getPrimaryKeys(null, schema, tableName);
- while (primaryKeys.next()) {
- String key = primaryKeys.getString("COLUMN_NAME");
- Iterator iterator = attributes.iterator();
- while (iterator.hasNext()) {
- CMPAttributeDelegate attr = (CMPAttributeDelegate) iterator.next();
- if (key.equals(attr.getColumnName()))
- attr.setKey(true);
- }
- }
-
- } catch (Throwable ex) {
- ex.printStackTrace();
- MessageDialog.openError(this.getShell(), IEJBAnnotationConstants.CANNOT_CONNECT,
- IEJBAnnotationConstants.CHECK_PROPERTIES);
- } finally {
-// if (connection != null)
-// try {
-// connection.close();
-// } catch (SQLException e) {
-// }
- }
- }
- this.getDataModel().setProperty(IContainerManagedEntityBeanDataModelProperties.ATTRIBUTES, attributes);
-
- }
-
- public void updateTables() {
- if (catalogButton == null)
- return;
- if (((AddContainerManagedEntityEjbWizard) this.getWizard()).isJavaBean()) {
- catalogButton.removeAll();
- return;
- }
- Connection connection = null;
- tableList = new ArrayList();
- try {
- IConnectionProfile connectionInfo = getConnectionInfo();
- if (connectionInfo == null)
- return;
-
- IStatus connectionStatus = connectionInfo.connect();
-
- if (! connectionStatus.isOK())
- return;
-
- IConnection dbConnection = connectionInfo.getManagedConnection("java.sql.Connection").getConnection();
- connection = (Connection)dbConnection.getRawConnection();
- DatabaseMetaData metaData = connection.getMetaData();
- String[] names = { "TABLE" };
- ResultSet rs = metaData.getSchemas();
- ResultSet tableNames = null;
- while (rs.next()) {
-
- tableNames = metaData.getTables(null, rs.getString(1), "%", names);
- while (tableNames.next()) {
- tableList.add(rs.getString(1) + "." + tableNames.getString("TABLE_NAME"));
- }
- }
-
- ResultSet sqlTypeNames = metaData.getTypeInfo();
- ArrayList types = new ArrayList();
- while (sqlTypeNames.next()) {
- types.add(sqlTypeNames.getString("TYPE_NAME"));
- }
-
- sqlTypeNames = metaData.getUDTs(null, "%", "%", null);
- while (sqlTypeNames.next()) {
- types.remove(sqlTypeNames.getString("TYPE_NAME"));
- }
- sqlTypes = (String[]) types.toArray(new String[types.size()]);
-
- } catch (Throwable ex) {
- ex.printStackTrace();
- MessageDialog.openError(this.getShell(), IEJBAnnotationConstants.CANNOT_CONNECT, IEJBAnnotationConstants.CHECK_PROPERTIES);
- } finally {
-// if (dbConnection != null)
-// try {
-// connection.close();
-// } catch (SQLException e) {
-// }
- }
- catalogButton.setItems((String[]) tableList.toArray(new String[tableList.size()]));
- catalogButton.select(0);
- if (tableList.size() > 0) {
- fillTableWith((String) tableList.get(0));
- catalogButton.setEnabled(true);
- if (attributeTableViewer != null)
- attributeTableViewer.refresh();
- }
-
- if (remove != null)
- remove.setEnabled(false);
-
- }
-
- public IConnectionProfile getConnectionInfo() {
- return ((AddContainerManagedEntityEjbWizard) getWizard()).getConnectionInfo();
- }
-
- /**
- * Create the Table
- */
- private Table createTable(Composite parent) {
- int style = SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.HIDE_SELECTION;
-
- GridLayout layout;
- GridData gridData;
- Group libraryPanel = new Group(parent, SWT.NONE);
- libraryPanel.setText(IEJBAnnotationConstants.CMP_MANAGED_FIELDS);
- layout = new GridLayout(2, false);
- libraryPanel.setLayout(layout);
- gridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 2;
- gridData.heightHint = 300;
- libraryPanel.setLayoutData(gridData);
-
- attributeTable = new Table(libraryPanel, style);
- gridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 2;
- attributeTable.setLayoutData(gridData);
-
- attributeTable.setLinesVisible(true);
- attributeTable.setHeaderVisible(true);
-
- // 1st column with image/checkboxes - NOTE: The SWT.CENTER has no
- // effect!!
- TableColumn column = new TableColumn(attributeTable, SWT.LEFT, 0);
- column.setText(IEJBAnnotationConstants.ATTRIBUTE_NAME);
- column.setWidth(60);
-
- // 2 column with task Description
- column = new TableColumn(attributeTable, SWT.LEFT, 1);
- column.setText(IEJBAnnotationConstants.ATTRIBUTE_COLUMN);
- column.setWidth(60);
-
- column = new TableColumn(attributeTable, SWT.LEFT, 2);
- column.setText(IEJBAnnotationConstants.ATTRIBUTE_TYPE);
- column.setWidth(120);
-
- column = new TableColumn(attributeTable, SWT.LEFT, 3);
- column.setText(IEJBAnnotationConstants.ATTRIBUTE_JDBCTYPE);
- column.setWidth(80);
-
- column = new TableColumn(attributeTable, SWT.LEFT, 4);
- column.setText(IEJBAnnotationConstants.ATTRIBUTE_SQLTYPE);
- column.setWidth(80);
-
- // 2 column with task Description
- column = new TableColumn(attributeTable, SWT.LEFT, 5);
- column.setText(IEJBAnnotationConstants.ATTRIBUTE_COLUMNSIZE);
- column.setWidth(60);
-
- column = new TableColumn(attributeTable, SWT.LEFT, 6);
- column.setText(IEJBAnnotationConstants.ATTRIBUTE_DECIMALDIGITS);
- column.setWidth(60);
-
- column = new TableColumn(attributeTable, SWT.CENTER, 7);
- column.setText(IEJBAnnotationConstants.ATTRIBUTE_READONLY);
- column.setWidth(80);
-
- column = new TableColumn(attributeTable, SWT.CENTER, 8);
- column.setText(IEJBAnnotationConstants.ATTRIBUTE_ISKEY);
- column.setWidth(80);
- addAttributeButtons(libraryPanel);
- attributeTable.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent e) {
- attributeTable.getSelectionCount();
- remove.setEnabled(attributeTable.getSelectionCount() > 0);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
-
- }
- });
- return attributeTable;
- }
-
- private void addAttributeButtons(Composite parent) {
- add = new Button(parent, SWT.PUSH);
- add.setText(IEJBAnnotationConstants.ATTRIBUTE_ADD); //$NON-NLS-1$
- GridData data = new GridData();
- data.horizontalSpan = 1;
- data.horizontalAlignment = GridData.BEGINNING;
- add.setLayoutData(data);
- add.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
-
- public void widgetSelected(SelectionEvent e) {
- CMPAttributeDelegate atr = new CMPAttributeDelegate();
- getAttributes().add(atr);
- ChooseTableWizardPage.this.validatePage();
- attributeTableViewer.refresh();
- }
- });
- remove = new Button(parent, SWT.PUSH);
- remove.setText(IEJBAnnotationConstants.ATTRIBUTE_REMOVE); //$NON-NLS-1$
- data = new GridData();
- data.horizontalSpan = 1;
- data.horizontalAlignment = GridData.BEGINNING;
- remove.setLayoutData(data);
- remove.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
-
- public void widgetSelected(SelectionEvent e) {
- TableItem ti = attributeTable.getSelection()[0];
- CMPAttributeDelegate attributeDelegate = (CMPAttributeDelegate) ti.getData();
- getAttributes().remove(attributeDelegate);
- ChooseTableWizardPage.this.validatePage();
- attributeTableViewer.refresh();
- remove.setEnabled(false);
-
- }
- });
- remove.setEnabled(false);
- }
-
- /**
- * Create the TableViewer
- */
- private TableViewer createTableViewer(Table table) {
-
- TableViewer tableViewer = new TableViewer(table);
- tableViewer.setUseHashlookup(true);
-
- tableViewer.setColumnProperties(columnNames);
- tableViewer.setLabelProvider(new FieldLabelProvider());
- tableViewer.setContentProvider(new FieldContentProvider());
-
- CellEditor[] editors = new CellEditor[columnNames.length];
-
- TextCellEditor textEditor = new TextCellEditor(table);
- ((Text) textEditor.getControl()).setTextLimit(200);
- editors[0] = textEditor;
-
- TextCellEditor textEditor2 = new TextCellEditor(table);
- ((Text) textEditor2.getControl()).setTextLimit(200);
- editors[1] = textEditor2;
-
- // //$NON-NLS-1$
- //
- TextCellEditor textEditor3 = new TextCellEditor(table);
- ((Text) textEditor3.getControl()).setTextLimit(200);
- IProject project = ((AddContainerManagedEntityEjbWizard) this.getWizard()).getDefaultEjbProject();
- IPackageFragmentRoot[] sources = J2EEProjectUtilities.getSourceContainers(project);
- if (sources != null && sources.length >= 1) {
- JavaTypeCompletionProcessor fFieldTypeCompletionProcessor = new JavaTypeCompletionProcessor(false, false);
- fFieldTypeCompletionProcessor.setPackageFragment(sources[0].getPackageFragment(""));
- ControlContentAssistHelper.createTextContentAssistant(((Text) textEditor3.getControl()), fFieldTypeCompletionProcessor);
- }
- editors[2] = textEditor3;
-
- editors[3] = new ComboBoxCellEditor(table, CMPUtils.jdbcTypes, SWT.READ_ONLY);
-
- // TextCellEditor textEditor4 = new TextCellEditor(table);
- // ((Text) textEditor4.getControl()).setTextLimit(100);
- // editors[4] = textEditor4;
- editors[4] = new ComboBoxCellEditor(table, sqlTypes, SWT.READ_ONLY);
-
- TextCellEditor textEditor5 = new TextCellEditor(table);
- ((Text) textEditor5.getControl()).setTextLimit(200);
- editors[5] = textEditor5;
-
- TextCellEditor textEditor6 = new TextCellEditor(table);
- ((Text) textEditor6.getControl()).setTextLimit(200);
- editors[6] = textEditor6;
-
- editors[7] = new CheckboxCellEditor(table, SWT.CENTER);
-
- editors[8] = new CheckboxCellEditor(table, SWT.CENTER);
-
- // Assign the cell editors to the viewer
- tableViewer.setCellEditors(editors);
- // Set the cell modifier for the viewer
- tableViewer.setCellModifier(new FieldCellModifier());
- tableViewer.setInput(getAttributes());
- return tableViewer;
- }
-
- protected static String[] columnNames = { IEJBAnnotationConstants.ATTRIBUTE_NAME, IEJBAnnotationConstants.ATTRIBUTE_COLUMN,
- IEJBAnnotationConstants.ATTRIBUTE_TYPE, IEJBAnnotationConstants.ATTRIBUTE_SQLTYPE,
- IEJBAnnotationConstants.ATTRIBUTE_JDBCTYPE, IEJBAnnotationConstants.ATTRIBUTE_COLUMNSIZE,
- IEJBAnnotationConstants.ATTRIBUTE_DECIMALDIGITS, IEJBAnnotationConstants.ATTRIBUTE_READONLY,
- IEJBAnnotationConstants.ATTRIBUTE_ISKEY };
-
- protected int getColumnIndex(String columName) {
- if (columName == null)
- return -1;
- for (int i = 0; i < columnNames.length; i++) {
- String col = columnNames[i];
- if (columName.equals(col))
- return i;
-
- }
- return -1;
- }
-
- public class FieldContentProvider implements IStructuredContentProvider {
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public Object[] getElements(Object parent) {
- return getAttributes().toArray();
- }
- }
-
- public class FieldLabelProvider extends LabelProvider implements ITableLabelProvider {
- public String getColumnText(Object obj, int index) {
-
- CMPAttributeDelegate fieldMapping = (CMPAttributeDelegate) obj;
- switch (index) {
- case 0: // Local
- return fieldMapping.getName();
- case 1: // Local
- return fieldMapping.getColumnName();
- case 2: // Local
- return fieldMapping.getAttributeType();
- case 3: // Local
- return fieldMapping.getJdbcType();
- case 4: // Local
- return fieldMapping.getSqlType();
- case 5:
- if (fieldMapping.isVariableSizedType()) {
- return "" + fieldMapping.getColumnSize();
- }
- return "";
- case 6:
- if (fieldMapping.isDecimal()) {
- return "" + fieldMapping.getDecimalDigits();
- }
- return "";
- case 7: // Local
- return "";
- case 8: // Local
- return "";
- }
- return "";
- }
-
- public String getColumnText(Viewer v, Object obj, int index) {
- return getColumnText(obj, index);
- }
-
- public Image getColumnImage(Object obj, int index) {
- CMPAttributeDelegate fieldMapping = (CMPAttributeDelegate) obj;
- switch (index) {
- case 7: // Local
- if (fieldMapping.isReadOnly())
- return fChecked;
- else
- return fUnchecked;
-
- case 8: // Local
- if (fieldMapping.isKey())
- return fChecked;
- else
- return fUnchecked;
- case 9: // Local
- if (fieldMapping.isTransient())
- return fChecked;
- else
- return fUnchecked;
- }
- return null;
- }
-
- public Image getColumnImage(Viewer v, Object obj, int index) {
- return getColumnImage(obj, index);
- }
- }
-
- public class FieldCellModifier implements ICellModifier {
-
- public boolean canModify(Object element, String property) {
- CMPAttributeDelegate attribute = (CMPAttributeDelegate) element;
- if (IEJBAnnotationConstants.ATTRIBUTE_DECIMALDIGITS.equals(property)) {
- if (attribute.isDecimal())
- return true;
- return false;
- }
- if (IEJBAnnotationConstants.ATTRIBUTE_COLUMNSIZE.equals(property)) {
- if (attribute.isVariableSizedType())
- return true;
- return false;
- }
- return true;
- }
-
- public Object getValue(Object element, String property) {
- int columnIndex = getColumnIndex(property);
- CMPAttributeDelegate fieldMapping = (CMPAttributeDelegate) element;
-
- Object result = "";
- switch (columnIndex) {
-
- case 0:
- return fieldMapping.getName();
-
- case 1:
- return fieldMapping.getColumnName();
- case 2:
- return fieldMapping.getAttributeType();
- case 3:
- String val = fieldMapping.getJdbcType();
- for (int i = 0; i < CMPUtils.jdbcTypes.length; i++) {
- String t = CMPUtils.jdbcTypes[i];
- if (t.equals(val))
- return new Integer(i);
- }
- return new Integer(0);
- case 4:
- val = fieldMapping.getSqlType();
- for (int i = 0; i < sqlTypes.length; i++) {
- String t = sqlTypes[i];
- if (t.equals(val))
- return new Integer(i);
- }
- return new Integer(0);
- case 5:
- if (fieldMapping.isVariableSizedType()) {
- return "" + fieldMapping.getColumnSize();
- }
- return "";
- case 6:
- if (fieldMapping.isDecimal()) {
- return "" + fieldMapping.getDecimalDigits();
- }
- return "";
- case 7:
- return Boolean.valueOf(fieldMapping.isReadOnly());
- case 8:
- return Boolean.valueOf(fieldMapping.isKey());
- case 9:
- return Boolean.valueOf(fieldMapping.isTransient());
- default:
- result = "";
- }
- return result;
- }
-
- /**
- * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object,
- * java.lang.String, java.lang.Object)
- */
- public void modify(Object element, String property, Object value) {
- int columnIndex = getColumnIndex(property);
- TableItem tItem = (TableItem) element;
- CMPAttributeDelegate fieldMapping = (CMPAttributeDelegate) tItem.getData();
-
- switch (columnIndex) {
-
- case 0:
- fieldMapping.setName((String) value);
- break;
-
- case 1:
- fieldMapping.setColumnName((String) value);
- break;
- case 2:
- fieldMapping.setAttributeType((String) value);
- break;
- case 3:
- fieldMapping.setJdbcType(CMPUtils.jdbcTypes[((Integer) value).intValue()]);
- int sqli = CMPUtils.getSqlTypeFromJDBC(((Integer) value).intValue());
- if (sqli >= 0) {
- fieldMapping.setSqlType(sqlTypes[sqli]);
- tItem.getParent().redraw();
- }
- break;
- case 4:
- String sqlType = sqlTypes[((Integer) value).intValue()];
- fieldMapping.setSqlType(sqlType);
- break;
- case 5:
- if (fieldMapping.isVariableSizedType()) {
- int colSize = Integer.parseInt((String) value);
- fieldMapping.setColumnSize(colSize);
- }
- break;
- case 6:
- if (fieldMapping.isDecimal()) {
- int decDigits = Integer.parseInt((String) value);
- fieldMapping.setDecimalDigits(decDigits);
- }
- break;
- case 7:
- boolean readValue = ((Boolean) value).booleanValue();
- fieldMapping.setReadOnly(readValue);
- break;
- case 8:
- boolean newValue = ((Boolean) value).booleanValue();
- fieldMapping.setKey(newValue);
- break;
- case 9:
- fieldMapping.setTransient(((Boolean) value).booleanValue());
- break;
- }
- ChooseTableWizardPage.this.validatePage();
- attributeTableViewer.refresh();
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/ConnectionSelectionPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/ConnectionSelectionPage.java
deleted file mode 100644
index 050a755..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/cmp/wizards/ConnectionSelectionPage.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005, 2006 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
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal.cmp.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.datatools.connectivity.IConnectionProfile;
-import org.eclipse.datatools.connectivity.ProfileManager;
-import org.eclipse.datatools.connectivity.ui.actions.AddProfileViewAction;
-import org.eclipse.datatools.connectivity.ui.wizards.NewConnectionProfileWizard;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-
-public class ConnectionSelectionPage extends DataModelWizardPage implements SelectionListener {
-
- protected boolean myFirstTime = true;
-
- protected Button reconnectButton;
-
- private Button newConnectionButton;
-
- private boolean connected;
-
- private List existingConnectionsList;
-
- private Hashtable existingConnections;
-
- private Label propertiesLabel;
-
- private Table connectionPropertiesTable;
-
- public ConnectionSelectionPage(IDataModel model, String pageName, String title, ImageDescriptor titleImage) {
- super(model, pageName, title, titleImage);
- }
-
- public ConnectionSelectionPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(IEJBAnnotationConstants.CMP_CONNECTION_PAGE_DESC);
- this.setTitle(IEJBAnnotationConstants.CMP_CONNECTION_PAGE_TITLE);
- }
-
- public Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.verticalSpacing = 5;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- newConnectionButton = new Button(composite, SWT.PUSH);
- newConnectionButton.setText(IEJBAnnotationConstants.CMP_CONNECTION_NEW_BUTTON); //$NON-NLS-1$
- GridData gd = new GridData();
- gd.verticalAlignment = GridData.BEGINNING;
- newConnectionButton.setLayoutData(gd);
-
- Composite indentationComposite = new Composite(composite, SWT.NONE);
- layout = new GridLayout();
- layout.numColumns = 2;
- layout.verticalSpacing = 5;
- indentationComposite.setLayout(layout);
- indentationComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Group existingConnectionsGroup = new Group(indentationComposite, SWT.NONE);
- existingConnectionsGroup.setText(IEJBAnnotationConstants.CMP_CONNECTION_AVAILABLE); //$NON-NLS-1$
- layout = new GridLayout();
- layout.numColumns = 1;
- layout.verticalSpacing = 5;
- existingConnectionsGroup.setLayout(layout);
- gd = new GridData(GridData.FILL_BOTH);
- existingConnectionsGroup.setLayoutData(gd);
-
- existingConnectionsList = new List(existingConnectionsGroup, SWT.BORDER | SWT.V_SCROLL);
- gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL);
- gd.heightHint = 100;
- existingConnectionsList.setLayoutData(gd);
-
- propertiesLabel = new Label(existingConnectionsGroup, SWT.NONE);
- propertiesLabel.setText(IEJBAnnotationConstants.CMP_CONNECTION_PROPERTIES); //$NON-NLS-1$
- gd = new GridData();
- propertiesLabel.setLayoutData(gd);
-
- connectionPropertiesTable = new Table(existingConnectionsGroup, SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- connectionPropertiesTable.setLayoutData(gd);
- connectionPropertiesTable.setLinesVisible(true);
- connectionPropertiesTable.setHeaderVisible(true);
-
- TableColumn tc1 = new TableColumn(connectionPropertiesTable, SWT.NONE);
- tc1.setText(IEJBAnnotationConstants.CMP_CONNECTION_PROPERTY); //$NON-NLS-1$
- tc1.setResizable(true);
- tc1.setWidth(140);
-
- TableColumn tc2 = new TableColumn(connectionPropertiesTable, SWT.NONE);
- tc2.setText(IEJBAnnotationConstants.CMP_CONNECTION_VALUE); //$NON-NLS-1$
- tc2.setResizable(true);
- tc2.setWidth(250);
-
- initializeDialogUnits(composite);
- setControl(composite);
-
- newConnectionButton.addListener(SWT.Selection, this);
- existingConnectionsList.addListener(SWT.Selection, this);
-
- newConnectionButton.setSelection(true);
- initializeValues();
- setPageComplete(true);
- addReconnectButton(composite);
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
- */
- class NewConnectionWizard extends NewConnectionProfileWizard {
-
- public void addCustomPages() {
- }
-
- public Properties getProfileProperties() {
- return new Properties();
- }
-
- }
-
- public void handleEvent(Event event) {
- Widget source = event.widget;
- if (source == newConnectionButton) {
- try {
- EjbAnnotationsUiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(
- "org.eclipse.wst.rdb.server.ui.navigator.serverExplorer");
- } catch (PartInitException e) {
- }
- IConnectionProfile[] profiles = ProfileManager.getInstance().getProfilesByCategory(
- "org.eclipse.datatools.connectivity.db.category");
- // ConnectionInfo[] infos =
- // ProfileConnectionManager.getProfileConnectionManagerInstance().getAllNamedConnectionInfo();
- java.util.List nameList = new ArrayList(profiles.length);
- for (int i = 0, n = profiles.length; i < n; i++) {
- if (!nameList.contains(profiles[i].getName())) {
- nameList.add(profiles[i].getName().toLowerCase());
- }
- }
- String[] names = (String[]) nameList.toArray(new String[nameList.size()]);
- AddProfileViewAction action = new AddProfileViewAction("org.eclipse.datatools.connectivity.db.category");
- action.run();
- // NewConnectionProfileWizard wizard = new NewConnectionWizard();
- // wizard.init(PlatformUI.getWorkbench(), null);
- // wizard.setNeedsProgressMonitor(false);
- // WizardDialog dialog = new WizardDialog(this.getShell(), wizard);
- // dialog.create();
- // dialog.open();
- initializeValues();
- } else if (source == existingConnectionsList) {
- updateConnectionProperties();
- setPageComplete(true);
- reconnectButton.setEnabled(true);
- }
-
- reconnectButton.setEnabled(true);
- isValidConnection();
- }
-
- /**
- * Adds the reconnection button
- *
- * @param parent
- * the parent composite
- */
- private void addReconnectButton(Composite parent) {
- reconnectButton = new Button(parent, SWT.PUSH);
- reconnectButton.setText("Reconnect"); // TODO - TRANSLATE THIS
- GridData data = new GridData();
- data.horizontalSpan = 2;
- data.horizontalAlignment = GridData.BEGINNING;
- reconnectButton.setLayoutData(data);
- reconnectButton.addSelectionListener(this);
- }
-
- public boolean isConnected() {
- return connected;
- }
-
- /**
- * Calls when default selection occurs (eg return in Text)
- *
- * @param evt
- * the Selection event
- */
- public void widgetDefaultSelected(SelectionEvent evt) {
- // ignore
- }
-
- /**
- * Calls when selection occurs
- *
- * @param evt
- * the selection event
- */
- public void widgetSelected(SelectionEvent evt) {
- Object source = evt.getSource();
- if (source == reconnectButton) {
- IConnectionProfile info = getSelectedConnection();
- if (true) {
- // if (userDialog.open() == Window.OK) {
- // String us = userDialog.getUserNameInformation();
- // String pa = userDialog.getPasswordInformation();
- // info.setUserName(us);
- // info.setPassword(pa);
- // // try to connect
- try {
- this.getSelectedConnection().connect(null);
- reconnectButton.setEnabled(false);
- connected = true;
- } catch (Exception ex) {
- reconnectButton.setEnabled(true);
- connected = false;
- MessageDialog.openError(this.getShell(), "Cannot connect", // TODO:
- // TRANSLATE
- ex.getMessage());
- }
- isValidConnection();
- }
- }
- }
-
- private void initializeValues() {
- existingConnectionsList.removeAll();
- IConnectionProfile[] connInfos = getConnectionsToDisplay();
- if (connInfos != null) {
- existingConnections = new Hashtable();
- java.util.List sortedConnections = Arrays.asList(connInfos);
- sortConnections(sortedConnections);
- Iterator connections = sortedConnections.iterator();
- while (connections.hasNext()) {
- IConnectionProfile con = (IConnectionProfile) connections.next();
- existingConnections.put(con.getName(), con);
- existingConnectionsList.add(con.getName());
- }
- }
-
- if (existingConnectionsList.getItemCount() > 0) {
- existingConnectionsList.select(0);
- updateConnectionProperties();
- }
- newConnectionButton.setSelection(true);
- }
-
- protected void sortConnections(java.util.List connections) {
- Comparator c = new Comparator() {
- public int compare(Object o1, Object o2) {
- String s1 = ((IConnectionProfile) o1).getName();
- String s2 = ((IConnectionProfile) o2).getName();
- return s1.compareToIgnoreCase(s2);
- }
- };
-
- Collections.sort(connections, c);
- }
-
- /**
- * Returns either the existing connection selected by the user. If the user
- * has indicated they would like to use a new connection then this method
- * returns null.
- *
- * @return A ConnectionInfo object representing the users selection in the
- * wizard page
- */
- public IConnectionProfile getSelectedConnection() {
- if (existingConnections == null || existingConnectionsList == null || existingConnectionsList.getSelection().length == 0)
- return null;
- IConnectionProfile connection = (IConnectionProfile) existingConnections.get(existingConnectionsList.getSelection()[0]);
- return connection;
- }
-
- /**
- * Returns the list of existing connections to display to the user. Override
- * this method to provide a filtered list of connections.
- *
- * @return A array of ConnectionInfo objects that should be displayed in the
- * existing connections list
- */
- protected IConnectionProfile[] getConnectionsToDisplay() {
- return ProfileManager.getInstance().getProfilesByCategory("org.eclipse.datatools.connectivity.db.category");
- }
-
- /**
- * Refreshes this page
- */
- public void refresh() {
- reconnectButton.setEnabled(true);
- connected = false;
- initializeValues();
- isValidConnection();
- }
-
- private void updateConnectionProperties() {
- connectionPropertiesTable.removeAll();
- if (existingConnectionsList.getSelectionIndex() > -1) {
- IConnectionProfile selectedConnection = (IConnectionProfile) existingConnections.get((String) existingConnectionsList
- .getSelection()[0]);
- if (selectedConnection != null) {
- Properties properties = selectedConnection.getBaseProperties();
- if (properties != null) {
- Enumeration keys = properties.keys();
- while (keys.hasMoreElements()) {
- Object pkey = keys.nextElement();
- TableItem tableItem = new TableItem(connectionPropertiesTable, SWT.NONE);
- tableItem.setText(new String[] { pkey.toString(), "" + properties.getProperty((String) pkey) });
- }
- }
- }
- }
- }
-
- protected String[] getValidationPropertyNames() {
- return null;
- }
-
- public boolean isPageComplete() {
- return connected;
- // return this.isValidConnection();
- }
-
- protected boolean isValidConnection() {
- boolean isOK = false;
- try {
- IConnectionProfile connectionInfo = this.getSelectedConnection();
- if (connectionInfo != null) {
- isOK = this.getSelectedConnection().isConnected();
- }
- } catch (Throwable e) {
- }
- if (isOK) {
- this.setErrorMessage(null);
- setMessage("Connected succesfully", IStatus.OK);// TODO: TRANSLATE
- connected = true;
- this.setPageComplete(true);
- return true;
- }
- this.setErrorMessage("No Connection"); // TODO: TRANSLATE
- connected = false;
- this.setPageComplete(false);
- return false;
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/AnnotationPreferencePage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/AnnotationPreferencePage.java
deleted file mode 100644
index 81c0c2a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/AnnotationPreferencePage.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004,2005 Eteration Bilisim A.S.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal.preferences;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.preferences.AnnotationPreferenceStore;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.utility.AnnotationUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.IWorkbenchPropertyPage;
-
-public class AnnotationPreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage,IWorkbenchPropertyPage, SelectionListener {
-
- DialogPanel panel;
-
- public AnnotationPreferencePage() {
- super();
- fProject= null;
- fData= null;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
- public void init(IWorkbench workbench) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- protected Composite createContainer(Composite parent) {
- panel = new DialogPanel(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.makeColumnsEqualWidth = false;
- panel.setLayout(layout);
- GridData gridData = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- panel.setLayoutData(gridData);
- return panel;
- }
-
- /*
- * @see PreferencePage#createContents(Composite)
- */
- protected Control createContents(Composite parent) {
- // noDefaultAndApplyButton();
- Composite composite = createContainer(parent);
- GridLayout gridLayout = new GridLayout();
- gridLayout.marginHeight = 0;
- gridLayout.marginWidth = 0;
- composite.setLayout(gridLayout);
-
- Composite defPanel = new Composite(composite, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- defPanel.setLayout(layout);
- GridData gridData = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- defPanel.setLayoutData(gridData);
-
- //ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.jst.j2ee.ejb.annotation.ui.internal.preferences.preferences");
-
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- gridData.horizontalSpan = 4;
- label.setLayoutData(gridData);
- label.setText(Messages.label_set_j2ee_annotation_preference);
-
- panel.preferences = new Control[1];
- panel.preferences[0] = panel
- .createLabeledCombo(
- 1,
- false,
- true,
- Messages.label_active_annotation_provider,
- Messages.desc_active_annotation_provider,
- AnnotationPreferenceStore
- .getProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER),
- AnnotationUtilities.getProviderNames(), defPanel);
- final Combo annotationProvider = (Combo) panel.preferences[0];
- ModifyListener listener = new ModifyListener() {
-
- public void modifyText(ModifyEvent e) {
- String provider = annotationProvider.getText();
- AnnotationPreferencePage.this.setValid(provider != null);
-
- }
- };
-
- annotationProvider.addModifyListener(listener);
- return composite;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.preference.PreferencePage#isValid()
- */
- public boolean isValid() {
- return true;
- }
-
- public boolean performOk() {
-
- String itemValue = "";
-
- Combo combo = ((Combo) panel.preferences[0]);
- itemValue = combo.getItem(combo.getSelectionIndex());
- AnnotationPreferenceStore.setProperty(
- AnnotationPreferenceStore.ANNOTATIONPROVIDER, itemValue);
- return super.performOk();
- }
-
- private IProject fProject; // project or null
- private Map fData; // page data
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()
- */
- public IAdaptable getElement() {
- return fProject;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
- */
- public void setElement(IAdaptable element) {
- fProject= (IProject) element.getAdapter(IResource.class);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#applyData(java.lang.Object)
- */
- public void applyData(Object data) {
- if (data instanceof Map) {
- fData= (Map) data;
- }
-
- }
-
- protected Map getData() {
- return fData;
- }
-
- protected boolean useProjectSettings() {
- return isProjectPreferencePage();
- }
-
- protected boolean isProjectPreferencePage() {
- return fProject != null;
- }
-
- protected IProject getProject() {
- return fProject;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/DialogPanel.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/DialogPanel.java
deleted file mode 100644
index f712774..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/DialogPanel.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004,2005 Eteration Bilisim A.S.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal.preferences;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-
-
-public class DialogPanel extends Composite {
-
- public Control preferences[] = null;
-
- public Button fActive[] = null;
-
- public DialogPanel(Composite parent, int style) {
- super(parent, style);
- }
-
- public Text createLabeledText(int i, boolean checked, String title,
- String tip, String value, Composite defPanel) {
- return this.createLabeledText(i, true, checked, title, tip, value,
- defPanel);
- }
-
- public Text createLabeledText(int i, boolean addActiveButton,
- boolean checked, String title, String tip, String value,
- Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
- label.setToolTipText(tip);
-
- if (addActiveButton) {
- Button fButton = new Button(defPanel, SWT.CHECK);
-
- gridData = new GridData(GridData.BEGINNING);
- gridData.horizontalSpan = 1;
- fButton.setLayoutData(gridData);
- fButton.setSelection(checked);
- fActive[i] = fButton;
- }
- Text fText = new Text(defPanel, SWT.SHADOW_IN | SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = (addActiveButton ? 2 : 3);
- fText.setLayoutData(gridData);
- fText.setText(value);
- fText.setToolTipText(tip);
- return fText;
- }
-
- public Button createLabeledCheck(int i, boolean checked, String title,
- String tip, boolean value, Composite defPanel) {
- return createLabeledCheck(i, true, checked, title, tip, value, defPanel);
- }
-
- public Button createLabeledCheck(int i, boolean addActiveButton,
- boolean checked, String title, String tip, boolean value,
- Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
- label.setToolTipText(tip);
-
- Button fButton = new Button(defPanel, SWT.CHECK);
- gridData = new GridData();
- gridData.horizontalSpan = 3;
- fButton.setLayoutData(gridData);
- fButton.setSelection(value);
- fButton.setToolTipText(tip);
- fButton.setSelection(checked);
- fActive[i] = fButton;
- return fButton;
- }
-
- public Combo createLabeledCombo(int itemI, boolean checked, String title,
- String tip, String value, String[] choices, Composite defPanel) {
-
- return createLabeledCombo(itemI, true, checked, title, tip, value,
- choices, defPanel);
- }
-
- public Combo createLabeledCombo(int itemI, boolean addActiveButton,
- boolean checked, String title, String tip, String value,
- String[] choices, Composite defPanel) {
-
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
- label.setToolTipText(tip);
-
- if (addActiveButton) {
- Button fButton = new Button(defPanel, SWT.CHECK);
- gridData = new GridData();
- gridData.horizontalSpan = 1;
- fButton.setLayoutData(gridData);
- fButton.setSelection(checked);
- fActive[itemI] = fButton;
- }
-
- Combo fCombo = new Combo(defPanel, SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = (addActiveButton ? 2 : 3);
- fCombo.setLayoutData(gridData);
- fCombo.setToolTipText(tip);
- int selected = 0;
- for (int i = 0; i < choices.length; i++) {
- String item = choices[i];
- if (value.equals(item))
- selected = i;
- fCombo.add(item);
- }
- fCombo.select(selected);
- return fCombo;
- }
-
- public Text createLabeledPath(int i, boolean checked, String title,
- String tip, String value, Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- // gridData.horizontalSpan = 1;
- label.setLayoutData(gridData);
- label.setText(title);
-
- final Text fText = new Text(defPanel, SWT.SHADOW_IN | SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 1;
- fText.setLayoutData(gridData);
- fText.setText(value);
- Button fButton = new Button(defPanel, SWT.PUSH);
- fButton.setText("Browse...");
- fButton.setLayoutData(new GridData());
- fButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- DirectoryDialog dlg = new DirectoryDialog(DialogPanel.this
- .getShell());
- dlg.setFilterPath(fText.getText());
- String res = dlg.open();
- if (res != null) {
- fText.setText(res);
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
-
- });
-
- return fText;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/Messages.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/Messages.java
deleted file mode 100644
index 0f5a9c4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/Messages.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal.preferences;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.ejb.annotation.ui.internal.preferences.preferences";//$NON-NLS-1$
-
- private Messages() {
- // Do not instantiate
- }
-
- public static String label_set_j2ee_annotation_preference;
- public static String label_active_annotation_provider;
- public static String desc_active_annotation_provider;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/preferences.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/preferences.properties
deleted file mode 100644
index 217e0ae..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/preferences/preferences.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-label_set_j2ee_annotation_preference=Set J2EE Annotation Preferences
-label_active_annotation_provider=Active Annotation Provider:
-desc_active_annotation_provider=Choose the annotation provider that you will use for J2EE development and artifacts
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddEjbWizard.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddEjbWizard.java
deleted file mode 100644
index 355b6a5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddEjbWizard.java
+++ /dev/null
@@ -1,140 +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.annotation.ui.internal.wizards;
-
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.cmp.wizards.AddContainerManagedEntityEjbWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-
-public class AddEjbWizard extends NewEjbWizard {
- protected ChooseEjbTypeWizardPage chooseEjbTypeWizardPage = null;
- private static final String PAGE_ONE = "pageOne"; //$NON-NLS-1$
- private AddSessionEjbWizard sessionEjbWizard;
- private AddMessageDrivenEjbWizard messageDrivenEjbWizard;
- private AddContainerManagedEntityEjbWizard containerManagedEntityEjbWizard;
-
-
- /**
- * @param model
- */
- public AddEjbWizard(IDataModel model) {
- super(model);
- setWindowTitle(IEJBAnnotationConstants.ADD_EJB_WIZARD_WINDOW_TITLE);
- setDefaultPageImageDescriptor(EjbAnnotationsUiPlugin.getDefault().getImageDescriptor("icons/full/wizban/newejb_wiz_ban.gif")); //$NON-NLS-1$
- }
-
- public AddEjbWizard() {
- this(null);
- }
-
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- super.init(workbench, selection);
- this.setForcePreviousAndNextButtons(true);
- // Otherwise number of pages will be used (1) without the nested wizards
- this.sessionEjbWizard = new AddSessionEjbWizard();
- this.messageDrivenEjbWizard = new AddMessageDrivenEjbWizard();
- this.containerManagedEntityEjbWizard = new AddContainerManagedEntityEjbWizard();
-
- sessionEjbWizard.init(workbench, selection);
- sessionEjbWizard.addPages();
- messageDrivenEjbWizard.init(workbench, selection);
- messageDrivenEjbWizard.addPages();
- containerManagedEntityEjbWizard.init(workbench, selection);
- containerManagedEntityEjbWizard.addPages();
- }
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void doAddPages() {
- chooseEjbTypeWizardPage = new ChooseEjbTypeWizardPage(getDataModel(),PAGE_ONE);
- chooseEjbTypeWizardPage.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_0);
- addPage(chooseEjbTypeWizardPage);
-
- }
-
-
-
- public boolean canFinish() {
- if( "SessionBean".equals(chooseEjbTypeWizardPage.getEJBType())){
- if (sessionEjbWizard != null && sessionEjbWizard.canFinish()) {
- return true;
- }
- }else if( "MessageDrivenBean".equals(chooseEjbTypeWizardPage.getEJBType())){
- if (messageDrivenEjbWizard != null && messageDrivenEjbWizard.canFinish()) {
- return true;
- }
- }else if( "ContainerManagedEntityBean".equals(chooseEjbTypeWizardPage.getEJBType())){
- if (containerManagedEntityEjbWizard != null && containerManagedEntityEjbWizard.canFinish()) {
- return true;
- }
- }
- return false;
- }
-
- public IWizardPage getNextPage(IWizardPage page) {
- IWizardPage nextPage = super.getNextPage(page);
- IWizard wizard = this;
- if( page == chooseEjbTypeWizardPage && "SessionBean".equals(chooseEjbTypeWizardPage.getEJBType())){
- wizard = sessionEjbWizard;
- sessionEjbWizard.getDataModel().setProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER,getDataModel().getProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER));
- } else if( page == chooseEjbTypeWizardPage && "MessageDrivenBean".equals(chooseEjbTypeWizardPage.getEJBType())){
- wizard = messageDrivenEjbWizard;
- sessionEjbWizard.getDataModel().setProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER,getDataModel().getProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER));
- }else if( page == chooseEjbTypeWizardPage && "ContainerManagedEntityBean".equals(chooseEjbTypeWizardPage.getEJBType())){
- wizard = containerManagedEntityEjbWizard;
- containerManagedEntityEjbWizard.getDataModel().setProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER,getDataModel().getProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER));
- }
- if( wizard != this && wizard !=null)
- nextPage = wizard.getStartingPage();
- return nextPage;
- }
-
- public IWizardPage getPreviousPage(IWizardPage page) {
- IWizardPage previousPage = super.getPreviousPage(page);
- return previousPage;
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new SessionBeanDataModelProvider();
- }
-
- /**
- * Subclasses should override to return false if the running operation cannot be run forked.
- *
- * @return
- */
- protected boolean runForked() {
- return true;
- }
-
- protected boolean prePerformFinish() {
- // Sub wizards for ejb types will run the operations.
- return false;
- }
-
- public void dispose() {
- super.dispose();
- if (sessionEjbWizard != null)
- sessionEjbWizard.dispose();
- if (messageDrivenEjbWizard != null)
- messageDrivenEjbWizard.dispose();
- if (containerManagedEntityEjbWizard != null)
- containerManagedEntityEjbWizard.dispose();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddMessageDrivenBeanWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddMessageDrivenBeanWizardPage.java
deleted file mode 100644
index bfdbce8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddMessageDrivenBeanWizardPage.java
+++ /dev/null
@@ -1,181 +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.annotation.ui.internal.wizards;
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.DestinationType;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IMessageDrivenBeanDataModelProperties;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-
-public class AddMessageDrivenBeanWizardPage extends DataModelWizardPage implements IBeanWizardPage{
-
-
- private Text ejbNameText;
- private Text jndiNameText;
- private Text displayNameText;
-
- private Combo destinationButton;
-
-
- private Combo transactionButton;
-
- public AddMessageDrivenBeanWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_DESC);
- this.setTitle(IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_TITLE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.common.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{
- IEnterpriseBeanClassDataModelProperties.EJB_NAME,
- IMessageDrivenBeanDataModelProperties.DESTINATIONNAME,
- IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME,
- IEnterpriseBeanClassDataModelProperties.DESCRIPTION};
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- Composite group = new Composite(composite, SWT.NULL);
- group.setLayout(new GridLayout(2, false));
- group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- createNameDescription(group);
- createDestinationGroup(group);
- createTransactionGroup(group);
- displayNameText.setFocus();
-
- IStatus projectStatus = validateProjectName();
- if (!projectStatus.isOK()) {
- setErrorMessage(projectStatus.getMessage());
- composite.setEnabled(false);
- }
-
- return composite;
- }
-
- protected IStatus validateProjectName() {
- // check for empty
- if (model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME) == null || model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME).trim().length() == 0) {
- return WTPCommonPlugin.createErrorStatus(IEJBAnnotationConstants.NO_EJB_PROJECTS);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected void createNameDescription(Composite composite) {
- // ejb name
- Label ejbNameLabel = new Label(composite, SWT.LEFT);
- ejbNameLabel.setText(IEJBAnnotationConstants.EJB_NAME_LABEL);
- ejbNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- ejbNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- ejbNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(ejbNameText, IEnterpriseBeanClassDataModelProperties.EJB_NAME, null);
-
- // jndi name
- Label jndiNameLabel = new Label(composite, SWT.LEFT);
- jndiNameLabel.setText(IEJBAnnotationConstants.DESTINATION_NAME_LABEL);
- jndiNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- jndiNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- jndiNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(jndiNameText, IMessageDrivenBeanDataModelProperties.DESTINATIONNAME, null);
-
- // display name
- Label displayNameLabel = new Label(composite, SWT.LEFT);
- displayNameLabel.setText(IEJBAnnotationConstants.DISPLAY_NAME_LABEL);
- displayNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- displayNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- displayNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(displayNameText, IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME, null);
-
- // description
- Label descLabel = new Label(composite, SWT.LEFT);
- descLabel.setText(IEJBAnnotationConstants.DESCRIPTION_LABEL);
- descLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- final Text descText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- descText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(descText, IEnterpriseBeanClassDataModelProperties.DESCRIPTION, null);
- }
-
- protected void createDestinationGroup(Composite composite) {
-
- // description
- Label destinationLabel = new Label(composite, SWT.LEFT);
- destinationLabel.setText(IEJBAnnotationConstants.DESTINATION_LABEL);
- destinationLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- destinationButton = new Combo(composite,SWT.DROP_DOWN | SWT.READ_ONLY);
- destinationButton.setItems(new String[]{DestinationType.QUEUE_LITERAL.getName(),DestinationType.TOPIC_LITERAL.getName()});
- destinationButton.setText(DestinationType.QUEUE_LITERAL.getName());
- destinationButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- destinationButton.select(0);
- synchHelper.synchCombo(destinationButton, IMessageDrivenBeanDataModelProperties.DESTINATIONTYPE, null);
-
- }
-
- protected void createTransactionGroup(Composite composite) {
-
- // description
- Label txLabel = new Label(composite, SWT.LEFT);
- txLabel.setText(IEJBAnnotationConstants.TRANSACTION_LABEL);
- txLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- transactionButton = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
- transactionButton.setItems(new String[]{TransactionType.CONTAINER_LITERAL.getName(),TransactionType.BEAN_LITERAL.getName()});
- transactionButton.setText(TransactionType.CONTAINER_LITERAL.getName());
- transactionButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- transactionButton.select(0);
- synchHelper.synchCombo(transactionButton, IEnterpriseBeanClassDataModelProperties.TRANSACTIONTYPE, null);
-
- }
-
-
-
- public boolean canFlipToNextPage() {
- return super.canFlipToNextPage();
- }
-
- public boolean canFinish() {
- return false;
- }
-
-
-
- public String getDisplayName() {
- return displayNameText.getText();
- }
-
- public String getEjbName() {
- return model.getStringProperty(IEnterpriseBeanClassDataModelProperties.EJB_NAME);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddMessageDrivenEjbWizard.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddMessageDrivenEjbWizard.java
deleted file mode 100644
index 3465d3b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddMessageDrivenEjbWizard.java
+++ /dev/null
@@ -1,138 +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.annotation.ui.internal.wizards;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IMessageDrivenBeanDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.MessageDrivenBeanDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-public class AddMessageDrivenEjbWizard extends NewEjbWizard {
- protected NewEjbClassWizardPage newJavaClassWizardPage = null;
- protected AddMessageDrivenBeanWizardPage addMessageDrivenBeanWizardPage = null;
- protected NewEjbClassOptionsWizardPage newEjbClassOptionsWizardPage = null;
-
- public static final String PAGE_ONE_NAME = "message.pageOne"; //$NON-NLS-1$
- public static final String PAGE_TWO_NAME = "message.pageTwo"; //$NON-NLS-1$
- public static final String PAGE_THREE_NAME = "message.pageThree"; //$NON-NLS-1$
-
- /**
- * @param model
- */
- public AddMessageDrivenEjbWizard(IDataModel model) {
- super(model);
- setWindowTitle(IEJBAnnotationConstants.ADD_EJB_WIZARD_WINDOW_TITLE);
- setDefaultPageImageDescriptor(EjbAnnotationsUiPlugin.getDefault().getImageDescriptor("icons/full/wizban/newejb_wiz_ban.gif")); //$NON-NLS-1$
- }
-
- public AddMessageDrivenEjbWizard() {
- this(null);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- */
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- super.init(workbench,selection);
- IProject project = getDefaultEjbProject();
- if (project != null) {
- getDataModel().setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, project.getName());
- }
- initializeEjbNameListener(getDataModel());
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new MessageDrivenBeanDataModelProvider();
- }
-
- private void initializeEjbNameListener(final IDataModel dataModel) {
- dataModel.addListener(new IDataModelListener(){
-
- public void propertyChanged(DataModelEvent event) {
- if( INewJavaClassDataModelProperties.CLASS_NAME.equals(event.getPropertyName()))
- {
- String className = (String)event.getProperty();
- int i = className.toLowerCase().indexOf("bean");
- if (i < 0)
- i= className.toLowerCase().indexOf("ejb");
- if (i >= 0)
- className = className.substring(0,i);
- if (className.length() > 0) {
- // Unset these properties. They will be set with new
- // values when EJB_NAME property is set.
- dataModel.setProperty(IMessageDrivenBeanDataModelProperties.DESTINATIONNAME, null);
- dataModel.setProperty(IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME, null);
- dataModel.setProperty(IEnterpriseBeanClassDataModelProperties.DESCRIPTION, null);
-
- // Set the EJB_NAME property. Call to
- // DataModelProvider.propertySet() will be triggered
- // that will reset the above properties.
- dataModel.setProperty(IEnterpriseBeanClassDataModelProperties.EJB_NAME, className);
- }
- }
- }});
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void doAddPages() {
- newJavaClassWizardPage = new NewEjbClassWizardPage(getDataModel(), PAGE_ONE_NAME,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_TITLE, J2EEProjectUtilities.EJB);
- newJavaClassWizardPage.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_2);
- addPage(newJavaClassWizardPage);
-
- addMessageDrivenBeanWizardPage = new AddMessageDrivenBeanWizardPage(getDataModel(), PAGE_TWO_NAME);
- addMessageDrivenBeanWizardPage.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_1);
- addPage(addMessageDrivenBeanWizardPage);
- addMessageDrivenBeanWizardPage.setPageComplete(false);
-
- newEjbClassOptionsWizardPage = new NewEjbClassOptionsWizardPage(getDataModel(), PAGE_THREE_NAME,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC, IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_TITLE);
- newEjbClassOptionsWizardPage.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_3);
- addPage(newEjbClassOptionsWizardPage);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.common.ui.wizard.WTPWizard#runForked()
- */
- protected boolean runForked() {
- return true;
- }
-
- public boolean canFinish() {
- if (newJavaClassWizardPage != null && newJavaClassWizardPage.isPageComplete() && addMessageDrivenBeanWizardPage != null
- && addMessageDrivenBeanWizardPage.isPageComplete()) {
- return true;
- }
-
- return false;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddSessionBeanWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddSessionBeanWizardPage.java
deleted file mode 100644
index df484e5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddSessionBeanWizardPage.java
+++ /dev/null
@@ -1,185 +0,0 @@
-
-/***************************************************************************************************
- * Copyright (c) 2005, 2006 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
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards;
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.ISessionBeanDataModelProperties;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-
-public class AddSessionBeanWizardPage extends DataModelWizardPage implements IBeanWizardPage{
-
-
- private Text ejbNameText;
- private Text jndiNameText;
- private Text displayNameText;
-
- private Combo statelessButton;
-
-
- private Combo transactionButton;
-
- public AddSessionBeanWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_DESC);
- this.setTitle(IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_TITLE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.common.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{
- IEnterpriseBeanClassDataModelProperties.EJB_NAME,
- IEnterpriseBeanClassDataModelProperties.JNDI_NAME,
- IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME,
- IEnterpriseBeanClassDataModelProperties.DESCRIPTION};
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- Composite fields = new Composite(composite, SWT.NULL);
- fields.setLayout(new GridLayout(2, false));
- fields.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- createNameDescription(fields);
- createStatelessGroup(fields);
- createTransactionGroup(fields);
- displayNameText.setFocus();
-
- IStatus projectStatus = validateProjectName();
- if (!projectStatus.isOK()) {
- setErrorMessage(projectStatus.getMessage());
- composite.setEnabled(false);
- }
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- protected IStatus validateProjectName() {
- // check for empty
- if (model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME) == null || model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME).trim().length() == 0) {
- return WTPCommonPlugin.createErrorStatus(IEJBAnnotationConstants.NO_EJB_PROJECTS);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected void createNameDescription(Composite composite) {
- // ejb name
- Label ejbNameLabel = new Label(composite, SWT.LEFT);
- ejbNameLabel.setText(IEJBAnnotationConstants.EJB_NAME_LABEL);
- ejbNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- ejbNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- ejbNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(ejbNameText, IEnterpriseBeanClassDataModelProperties.EJB_NAME, null);
-
- // jndi name
- Label jndiNameLabel = new Label(composite, SWT.LEFT);
- jndiNameLabel.setText(IEJBAnnotationConstants.JNDI_NAME_LABEL);
- jndiNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- jndiNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- jndiNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(jndiNameText, IEnterpriseBeanClassDataModelProperties.JNDI_NAME, null);
-
- // display name
- Label displayNameLabel = new Label(composite, SWT.LEFT);
- displayNameLabel.setText(IEJBAnnotationConstants.DISPLAY_NAME_LABEL);
- displayNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- displayNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- displayNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(displayNameText, IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME, null);
-
- // description
- Label descLabel = new Label(composite, SWT.LEFT);
- descLabel.setText(IEJBAnnotationConstants.DESCRIPTION_LABEL);
- descLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- final Text descText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- descText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(descText, IEnterpriseBeanClassDataModelProperties.DESCRIPTION, null);
- }
-
- protected void createStatelessGroup(Composite composite) {
-
- // description
- Label statelessLabel = new Label(composite, SWT.LEFT);
- statelessLabel.setText(IEJBAnnotationConstants.STATELESS_LABEL);
- statelessLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- statelessButton = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
- statelessButton.setItems(new String[]{SessionType.STATELESS_LITERAL.getName(),SessionType.STATEFUL_LITERAL.getName()});
- statelessButton.setText(SessionType.STATELESS_LITERAL.getName());
- statelessButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchCombo(statelessButton, ISessionBeanDataModelProperties.STATELESS, null);
- statelessButton.select(0);
-
- }
-
- protected void createTransactionGroup(Composite composite) {
- // description
- Label txLabel = new Label(composite, SWT.LEFT);
- txLabel.setText(IEJBAnnotationConstants.TRANSACTION_LABEL);
- txLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- transactionButton = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
- transactionButton.setItems(new String[]{TransactionType.CONTAINER_LITERAL.getName(),TransactionType.BEAN_LITERAL.getName()});
- transactionButton.setText(TransactionType.CONTAINER_LITERAL.getName());
- transactionButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- synchHelper.synchCombo(transactionButton, IEnterpriseBeanClassDataModelProperties.TRANSACTIONTYPE, null);
- transactionButton.select(0);
-
- }
-
-
-
- public boolean canFlipToNextPage() {
- return super.canFlipToNextPage();
- }
-
- public boolean canFinish() {
- return false;
- }
-
-
-
- public String getDisplayName() {
- return displayNameText.getText();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.ui.internal.IBeanWizardPage#getEjbName()
- */
- public String getEjbName() {
- return model.getStringProperty(IEnterpriseBeanClassDataModelProperties.EJB_NAME);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddSessionEjbWizard.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddSessionEjbWizard.java
deleted file mode 100644
index a451024..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/AddSessionEjbWizard.java
+++ /dev/null
@@ -1,141 +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.annotation.ui.internal.wizards;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-public class AddSessionEjbWizard extends NewEjbWizard {
- protected NewEjbClassWizardPage newJavaClassWizardPage = null;
- protected AddSessionBeanWizardPage addSessionBeanWizardPage = null;
- protected NewEjbClassOptionsWizardPage newEjbClassOptionsWizardPage = null;
-
- public static final String PAGE_ONE_NAME = "session.pageOne"; //$NON-NLS-1$
- public static final String PAGE_TWO_NAME = "session.pageTwo"; //$NON-NLS-1$
- public static final String PAGE_THREE_NAME = "session.pageThree"; //$NON-NLS-1$
-
-
- /**
- * @param model
- */
- public AddSessionEjbWizard(IDataModel model) {
- super(model);
-
- setWindowTitle(IEJBAnnotationConstants.ADD_EJB_WIZARD_WINDOW_TITLE);
- setDefaultPageImageDescriptor(EjbAnnotationsUiPlugin.getDefault().getImageDescriptor("icons/full/wizban/newejb_wiz_ban.gif")); //$NON-NLS-1$
- }
-
- public AddSessionEjbWizard() {
- this(null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- */
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- super.init(workbench,selection);
- IProject project = getDefaultEjbProject();
- if (project != null) {
- getDataModel().setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, project.getName());
- }
- initializeEjbNameListener(getDataModel());
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new SessionBeanDataModelProvider();
- }
-
- private void initializeEjbNameListener(final IDataModel dataModel) {
- dataModel.addListener(new IDataModelListener(){
-
- public void propertyChanged(DataModelEvent event) {
- if( INewJavaClassDataModelProperties.CLASS_NAME.equals(event.getPropertyName()))
- {
- String className = (String)event.getProperty();
- int i = className.toLowerCase().indexOf("bean");
- if(i < 0 )
- i= className.toLowerCase().indexOf("ejb");
- if( i >= 0)
- className = className.substring(0,i);
- if( className.length() > 0 ) {
- // Unset these properties. They will be set with new
- // values when EJB_NAME property is set.
- dataModel.setProperty(IEnterpriseBeanClassDataModelProperties.JNDI_NAME, null);
- dataModel.setProperty(IEnterpriseBeanClassDataModelProperties.DISPLAY_NAME, null);
- dataModel.setProperty(IEnterpriseBeanClassDataModelProperties.DESCRIPTION, null);
-
- // Set the EJB_NAME property. Call to
- // DataModelProvider.propertySet() will be triggered
- // that will reset the above properties.
- dataModel.setProperty(IEnterpriseBeanClassDataModelProperties.EJB_NAME, className);
- }
- }
- }});
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void doAddPages() {
- newJavaClassWizardPage = new NewEjbClassWizardPage(
- getDataModel(),
- PAGE_ONE_NAME,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_TITLE,
- J2EEProjectUtilities.EJB);
- newJavaClassWizardPage.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_2);
- addPage(newJavaClassWizardPage);
-
-
- addSessionBeanWizardPage = new AddSessionBeanWizardPage(getDataModel(), PAGE_TWO_NAME);
- addSessionBeanWizardPage.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_1);
- addPage(addSessionBeanWizardPage);
- addSessionBeanWizardPage.setPageComplete(false);
-
- newEjbClassOptionsWizardPage = new NewEjbClassOptionsWizardPage(
- getDataModel(),
- PAGE_THREE_NAME,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
- IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_TITLE);
- newEjbClassOptionsWizardPage.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_3);
- addPage(newEjbClassOptionsWizardPage);
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.common.ui.wizard.WTPWizard#runForked()
- */
- protected boolean runForked() {
- return true;
- }
-
- public boolean canFinish() {
- if ( newJavaClassWizardPage != null && newJavaClassWizardPage.isPageComplete() && addSessionBeanWizardPage != null && addSessionBeanWizardPage.isPageComplete() ) {
- return true;
- }
-
-
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/ChooseEjbTypeWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/ChooseEjbTypeWizardPage.java
deleted file mode 100644
index 455f6ca..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/ChooseEjbTypeWizardPage.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005, 2006 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
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- **************************************************************************************************/
-
-
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.preferences.AnnotationPreferenceStore;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IAnnotationProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.utility.AnnotationUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author naci
- */
-public class ChooseEjbTypeWizardPage extends DataModelWizardPage {
-
- protected Button sessionType;
- protected Button messageDrivenType;
- protected Button containerManagedEntityType;
-
- protected ChooseEjbTypeWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- this.setDescription(IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_DESC);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[] { IEnterpriseBeanClassDataModelProperties.EJB_TYPE };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite aComposite = new Composite(parent, SWT.NULL);
- aComposite.setLayout(new GridLayout());
- aComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
- aComposite.setSize(aComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- aComposite.setFont(parent.getFont());
- createEjbTypeGroup(aComposite);
- createAnnotationProviderGroup(aComposite);
- addPreferenceLink(aComposite);
-
- setControl(aComposite);
- Dialog.applyDialogFont(parent);
- return aComposite;
-
- }
-
- protected void createEjbTypeGroup(Composite parent) {
- Composite ejbTypeGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- ejbTypeGroup.setLayout(layout);
- ejbTypeGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-
- sessionType = new Button(ejbTypeGroup, SWT.RADIO);
- sessionType.setText(Messages.label_session_bean); //$NON-NLS-1$
- sessionType.setSelection(true);
- sessionType.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent e) {
- if (sessionType.getSelection()) {
- ChooseEjbTypeWizardPage.this.model.setProperty(IEnterpriseBeanClassDataModelProperties.EJB_TYPE, "SessionBean");
- validateProvider();
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- this.widgetSelected(e);
- }
- });
-
- messageDrivenType = new Button(ejbTypeGroup, SWT.RADIO);
- messageDrivenType.setText(Messages.label_message_driven_bean); //$NON-NLS-1$
- messageDrivenType.setSelection(false);
- messageDrivenType.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent e) {
- if (messageDrivenType.getSelection()) {
- ChooseEjbTypeWizardPage.this.model.setProperty(IEnterpriseBeanClassDataModelProperties.EJB_TYPE,
- "MessageDrivenBean");
- validateProvider();
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- this.widgetSelected(e);
- }
- });
-
-
- containerManagedEntityType = new Button(ejbTypeGroup, SWT.RADIO);
- containerManagedEntityType.setText(Messages.label_container_managed_entity_bean); //$NON-NLS-1$
- containerManagedEntityType.setSelection(false);
- containerManagedEntityType
- .addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent e) {
- if (containerManagedEntityType.getSelection()) {
- ChooseEjbTypeWizardPage.this.model
- .setProperty(
- IEnterpriseBeanClassDataModelProperties.EJB_TYPE,
- "ContainerManagedEntityBean");
- validateProvider();
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- this.widgetSelected(e);
- }
- });
- }
-
- protected void createAnnotationProviderGroup(Composite parent) {
- Composite annotationGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout(2, false);
- annotationGroup.setLayout(layout);
- annotationGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-
- //Label label = new Label(annotationGroup, SWT.WRAP);
- //label.setText("Annotation Provider:");
- //label.setToolTipText("Choose the annotation provider that will be used to create java classes and J2EE artifacts");
-
- // annotationProvider = new Combo(annotationGroup, SWT.RADIO);
- String preferred = AnnotationPreferenceStore.getProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER);
- ChooseEjbTypeWizardPage.this.model.setProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER, preferred);
- // String providerS = provider[0];
- // for (int i = 0; i < provider.length; i++) {
- // String name = provider[i];
- // annotationProvider.add(name);
- // if (preferred.equals(name)) {
- // providerS = name;
- // annotationProvider.select(i);
- // selected = true;
- // }
- //
- // }
- // if (!selected) {
- // providerS = provider[0];
- // annotationProvider.select(0);
- // }
-
- validateProvider();
-
- if (model != null)
- model.setProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER, preferred);
-
- }
-
- public String getEJBType() {
- return model.getStringProperty(IEnterpriseBeanClassDataModelProperties.EJB_TYPE);
- }
-
- public boolean isPageComplete() {
- String provider = AnnotationPreferenceStore.getProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER);
- IAnnotationProvider annotationProvider = null;
- try {
- annotationProvider = AnnotationUtilities.findAnnotationProviderByName(provider);
- } catch (Exception e) {
- return false;
- }
-
- return (annotationProvider != null && annotationProvider.isValid());
- }
-
- private void addPreferenceLink(final Composite composite) {
- /*
- * TODO: Bug 161150
- *
- * If there's no preference mapping, don't link to a nonexistant page?
- * Perhaps add a combo here, letting the user select from the list of
- * annotation providers, with a button next to it allowing them to edit
- * that provider's preferences?
- *
- * Would we need eventually project-specific preferences? I don't know.
- */
- if( getPreferencePageId() != null ) {
- Link link = new Link(composite, SWT.NONE);
- link.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 3, 1));
- link.setText(Messages.label_change_your_provider_preference);
-
- link.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (showPreferencePage(composite)) {
- }
- validateProvider();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- });
- }
- }
-
- protected boolean showPreferencePage(Composite composite) {
- PreferenceManager manager = PlatformUI.getWorkbench().getPreferenceManager();
- String id = getPreferencePageId();
- if( id != null ) {
- IPreferenceNode node = manager.find(id);
- PreferenceManager manager2 = new PreferenceManager();
- manager2.addToRoot(node);
- final PreferenceDialog dialog = new PreferenceDialog(composite.getShell(), manager2);
- final boolean[] result = new boolean[] { false };
- BusyIndicator.showWhile(composite.getDisplay(), new Runnable() {
- public void run() {
- dialog.create();
- if (dialog.open() == Window.OK)
- result[0] = true;
- }
- });
- return result[0];
- }
- return true;
- }
-
- private String getPreferencePageId() {
- String provider = AnnotationPreferenceStore.getProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER);
- IConfigurationElement[] configurationElements = Platform.getExtensionRegistry().getConfigurationElementsFor(
- "org.eclipse.jst.j2ee.ejb.annotations.ui.ProviderPreferenceMapping");
-
- for( int i = 0; i < configurationElements.length; i++ ) {
- if( provider.equals(configurationElements[i].getAttribute("name"))) {
- return configurationElements[i].getAttribute("preferencePage");
- }
- }
-
- return null;
- }
-
- private void validateProvider() {
- String provider = AnnotationPreferenceStore.getProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER);
- ChooseEjbTypeWizardPage.this.model.setProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER, provider);
- IAnnotationProvider annotationProvider = null;
- try {
- annotationProvider = AnnotationUtilities.findAnnotationProviderByName(provider);
- } catch (Exception ex) {
- }
- if (annotationProvider != null && annotationProvider.isValid()) {
- this.setErrorMessage(null);
- this.setPageComplete(true);
- } else
- this.setErrorMessage(Messages.msg_err_annotation_provider_not_valid);
- getContainer().updateMessage();
- }
-
- public boolean canFlipToNextPage() {
- return isPageComplete();// &&
- // wizard.getPageGroupManager().hasNextPage();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/IBeanWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/IBeanWizardPage.java
deleted file mode 100644
index 3e5df2f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/IBeanWizardPage.java
+++ /dev/null
@@ -1,18 +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.annotation.ui.internal.wizards;
-
-
-public interface IBeanWizardPage {
-
- public String getEjbName();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/IEJBUIContextIds.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/IEJBUIContextIds.java
deleted file mode 100644
index 26961c6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/IEJBUIContextIds.java
+++ /dev/null
@@ -1,23 +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.annotation.ui.internal.wizards;
-
-public interface IEJBUIContextIds {
-
- public static final String PLUGIN_SERVLET_UI = "org.eclipse.jst.j2ee.infopop."; //$NON-NLS-1$
-
- public static final String ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_0 = PLUGIN_SERVLET_UI + "antejb0000"; //$NON-NLS-1$
- public static final String ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_1 = PLUGIN_SERVLET_UI + "antejb1000"; //$NON-NLS-1$
- public static final String ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_2 = PLUGIN_SERVLET_UI + "antejb1100"; //$NON-NLS-1$
- public static final String ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_3 = PLUGIN_SERVLET_UI + "antejb1200"; //$NON-NLS-1$
- public static final String ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_4 = PLUGIN_SERVLET_UI + "antejb4000"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/Messages.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/Messages.java
deleted file mode 100644
index 9b0a011..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.wizards";//$NON-NLS-1$
-
- private Messages() {
- // Do not instantiate
- }
-
- public static String label_session_bean;
- public static String label_message_driven_bean;
- public static String label_container_managed_entity_bean;
- public static String label_change_your_provider_preference;
- public static String msg_err_annotation_provider_not_valid;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/NewEjbClassOptionsWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/NewEjbClassOptionsWizardPage.java
deleted file mode 100644
index 8d7ada3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/NewEjbClassOptionsWizardPage.java
+++ /dev/null
@@ -1,29 +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.annotation.ui.internal.wizards;
-
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassOptionsWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author naci
- *
- */
-public class NewEjbClassOptionsWizardPage extends NewJavaClassOptionsWizardPage {
-
- public NewEjbClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName, pageDesc, pageTitle);
- }
-
- public void refreshInterfaces(Object interfaces)
- {
- interfaceViewer.setInput(interfaces);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/NewEjbClassWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/NewEjbClassWizardPage.java
deleted file mode 100644
index f752ee6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/NewEjbClassWizardPage.java
+++ /dev/null
@@ -1,74 +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.annotation.ui.internal.wizards;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-
-public class NewEjbClassWizardPage extends NewJavaClassWizardPage {
-
- public NewEjbClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle, String moduleType) {
- super(model, pageName, pageDesc, pageTitle, moduleType);
- }
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
- return composite;
- }
-
- protected void createNewComponent() {
- IDataModel aModel = DataModelFactory.createDataModel(new EjbFacetProjectCreationDataModelProvider());
- FacetDataModelMap map = (FacetDataModelMap) aModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel ejbModel = map.getFacetDataModel(J2EEProjectUtilities.EJB);
- ejbModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, false);
- ejbModel.setBooleanProperty(IEjbFacetInstallDataModelProperties.CREATE_CLIENT, false);
- EjbProjectWizard componentCreationWizard = new EjbProjectWizard(aModel);
-
- WizardDialog dialog = new WizardDialog(getShell(), componentCreationWizard);
- if (Window.OK == dialog.open()) {
- String newProjectName = aModel.getStringProperty( IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
- this.setProjectName(newProjectName);
- }
- }
-
- protected boolean isProjectValid(IProject project) {
- boolean result = super.isProjectValid(project);
- if (result) {
- // check additionally if the project has the jst.ejb.xdoclet facet
- result = false;
- IFacetedProject faceted = null;
- try {
- faceted = ProjectFacetsManager.create(project);
- if (faceted != null &&
- (faceted.hasProjectFacet(ProjectFacetsManager.getProjectFacet("jst.ejb.xdoclet")))) {
- result = true;
- }
- } catch (CoreException e) {
- }
- }
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/NewEjbWizard.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/NewEjbWizard.java
deleted file mode 100644
index 83b39e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/NewEjbWizard.java
+++ /dev/null
@@ -1,85 +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.annotation.ui.internal.wizards;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-public abstract class NewEjbWizard extends DataModelWizard implements INewWizard {
-
- /**
- * @param model
- */
- public NewEjbWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * Default constructor
- */
- public NewEjbWizard() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- */
- public void init(IWorkbench workbench, IStructuredSelection selection) {
-
- }
-
- protected IProject getDefaultEjbProject() {
- IProject project = null;
- IStructuredSelection selection = getCurrentSelection();
- if (selection != null && selection.getFirstElement() != null) {
- project = ProjectUtilities.getProject(selection.getFirstElement());
- if(project == null && selection.getFirstElement() instanceof IAdaptable){
- IResource res= (IResource) ((IAdaptable) selection.getFirstElement()).getAdapter(IResource.class);
- if(res != null)
- project = res.getProject();
- }
-
- }
- if (project == null) {
- IProject[] projects = ProjectUtilities.getAllProjects();
- for (int i = 0; i < projects.length; i++) {
- if (J2EEProjectUtilities.isEJBProject(projects[i]))
- project = projects[i];
- }
- }
- return project;
- }
-
- protected IStructuredSelection getCurrentSelection() {
- IWorkbenchWindow window = J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- if (window != null) {
- ISelection selection = window.getSelectionService().getSelection();
- if (selection instanceof IStructuredSelection) {
- return (IStructuredSelection) selection;
- }
- }
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/wizards.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/wizards.properties
deleted file mode 100644
index c0bdbe1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/wizards/wizards.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-label_session_bean=Session Bean
-label_message_driven_bean=Message Driven Bean
-label_container_managed_entity_bean=Container Managed Entity Bean
-label_change_your_provider_preference=You can change your provider <a>preferences</a>
-
-msg_err_annotation_provider_not_valid=Annotation provider definition is not valid, please check the preferences.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.classpath b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.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.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.cvsignore b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.cvsignore
deleted file mode 100644
index 52e14e1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-xdocletAnnotation.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.project b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.project
deleted file mode 100644
index 4e87526..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.ejb.annotations.xdoclet</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.ejb.annotations.xdoclet/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c1ec977..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu May 10 18:34:39 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF
deleted file mode 100644
index 4d682c5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,48 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb.annotations.xdoclet; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAnnotationPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.action;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.provider;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.util;x-internal:=true
-Require-Bundle: org.eclipse.jst.j2ee.ejb.annotations.emitter;visibility:=reexport;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb.annotation.model;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ant.core;bundle-version="[3.1.100,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ant.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/about.html b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/build.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/build.properties
deleted file mode 100644
index f711cc1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = plugin.xml,\
- .,\
- ejb-merge.xml,\
- templates/,\
- META-INF/,\
- about.html,\
- plugin.properties,\
- schema/,\
- icons/
-src.includes = build.properties
-source.. = src/
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/ejb-merge.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/ejb-merge.xml
deleted file mode 100644
index e0bff6e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/ejb-merge.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<merge:options
- indent=" "
- braceStyle="matching"
- block="\s*@\s*generated\s*NOT\s*\n"
- xmlns:merge="http://www.eclipse.org/org/eclipse/emf/codegen/jmerge/Options">
-
-
- <merge:dictionaryPattern
- name="generatedMember"
- select="Member/getComment"
- match="\s*@\s*(gen)erated\s*\n"/>
-
-
- <merge:dictionaryPattern
- name="modifiedMember"
- select="Member/getComment"
- match="\s*@\s*(modify)\s*\n"/>
-
-
-
- <merge:pull
- targetMarkup="^gen$"
- sourceGet="Method/getBody"
- sourceTransfer="(\s*//\s*begin-user-code.*?//\s*end-user-code\s*)\n"
- targetPut="Method/setBody"/>
-
- <!-- copy comments except between the begin-user-doc
- and end-user-doc tags -->
- <merge:pull
- sourceMarkup="^gen$"
- sourceGet="Member/getComment"
- sourceTransfer="(\s*<!--\s*begin-user-doc.*?end-user-doc\s*-->\s*)"
- targetMarkup="^gen$"
- targetPut="Member/setComment"/>
-
-
-
- <!-- Requests generator to replace the complete comment -->
- <merge:pull
- sourceMarkup="^gen$"
- sourceGet="Member/getComment"
- targetMarkup="^modify$"
- targetPut="Member/setComment"/>
-
- <merge:pull
- sourceGet="Member/getFlags"
- targetMarkup="^gen$"
- targetPut="Member/setFlags"/>
-
- <merge:pull
- sourceGet="Initializer/getBody"
- targetMarkup="^gen$"
- targetPut="Initializer/setBody"/>
-
- <merge:pull
- sourceGet="Type/getSuperclass"
- targetMarkup="^gen$"
- targetPut="Type/setSuperclass"/>
-
- <merge:pull
- sourceGet="Type/getSuperInterfaces"
- sourceTransfer="(\s*@\s*extends|\s*@\s*implements)(.*?)\n"
- targetMarkup="^gen$"
- targetPut="Type/addSuperInterface"/>
-
- <merge:pull
- sourceGet="Field/getType"
- targetMarkup="^gen$"
- targetPut="Field/setType"/>
- <merge:pull
- sourceGet="Field/getInitializer"
- targetMarkup="^gen$"
- targetPut="Field/setInitializer"/>
-
- <merge:pull
- sourceGet="Method/getReturnType"
- targetMarkup="^gen$"
- targetPut="Method/setReturnType"/>
- <merge:pull
- sourceGet="Method/getExceptions"
- targetMarkup="^gen$"
- targetPut="Method/addException"/>
-
-
-
- <!-- if there are generated code fragments that are not in the
- new generated code remove them. Usefule when renaming methods/fields -->
- <merge:sweep markup="^gen$" select="Member"/>
- <merge:sweep markup="^gen$" select="Type"/>
-
-</merge:options>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/icons/xdoclet.gif b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/icons/xdoclet.gif
deleted file mode 100644
index 0703c30..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/icons/xdoclet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/icons/xdoclet.jpg b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/icons/xdoclet.jpg
deleted file mode 100644
index 3f180ae..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/icons/xdoclet.jpg
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.properties
deleted file mode 100644
index 5dbebbb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-name_xdoclet=XDoclet
-name_ejbdoclet=ejbdoclet
-name_webdoclet=webdoclet
-XDocletPropertiesPage.name=XDoclet
-XDocletEJBPropertiesPage.name=ejbdoclet
-XDocletWebPropertiesPage.name=webdoclet
-
-
-action.runxdoclet=Run XDoclet
-
-facet.webdoclet=WebDoclet (XDoclet)
-facet.webdoclet.description=Enables the project to run Webdoclet post-processing on annotated servlets.
-
-facet.ejbdoclet=EJBDoclet (XDoclet)
-facet.ejbdoclet.description=Enables the project to run EjbDoclet post-processing on annotated ejbs
-
-preset.webdoclet=Dynamic Web Project with XDoclet
-preset.webdoclet.description=Web project with XDoclet authoring support.
-
-preset.ejbdoclet=EJB Project with XDoclet
-
-validationMarkerName = XDoclet Facet Problem
-Bundle-Name.0 = Xdoclet Annotations Plug-in
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.xml
deleted file mode 100644
index 494abcb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.xml
+++ /dev/null
@@ -1,817 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="xdocletRuntime" name="XDoclet Runtime" schema="schema/xdocletRuntime.exsd"/>
- <extension-point id="webdocletTaskProvider" name="Task providers for webdoclet" schema="schema/webdocletTaskProvider.exsd"/>
- <extension-point id="ejbDocletTaskProvider" name="A task provider class for ejbdoclet" schema="schema/ejbDocletTaskProvider.exsd"/>
-
- <extension point="org.eclipse.core.resources.builders"
- id="xdocletbuilder"
- name="XDoclet Builder">
- <builder>
- <run
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletBuilder" >
- </run>
- </builder>
- </extension>
-
- <extension
- point="org.eclipse.core.resources.markers"
- id="xdoclet.marker"
- name="%validationMarkerName">
- <super type="org.eclipse.core.resources.problemmarker"/>
- <persistent value="true"/>
- </extension>
-
-
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- name="%name_xdoclet"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletPreferencePage"
- id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.preference">
- </page>
- <page
- name="%name_ejbdoclet"
- category="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.preference"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletEJBPreferencePage"
- id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejb.preference">
- </page>
- <page
- name="%name_webdoclet"
- category="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.preference"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletWebPreferencePage"
- id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.web.preference">
- </page>
- </extension>
-
-
-<!-- =========== org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletPreferencePage ============ -->
-
-
- <extension point="org.eclipse.ui.propertyPages">
- <page
- adaptable="true"
- objectClass="org.eclipse.core.resources.IProject"
- name="%XDocletPropertiesPage.name"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletPreferencePage"
- id="XDocletPropertiesPage">
- <filter
- name="nature"
- value="org.eclipse.wst.common.project.facet.core.nature">
- </filter>
- </page>
-
-<!-- =========== org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletEJBPreferencePage ============ -->
-
- <page
- adaptable="true"
- objectClass="org.eclipse.core.resources.IProject"
- name="%XDocletEJBPropertiesPage.name"
- category="XDocletPropertiesPage"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletEJBPreferencePage"
- id="XDocletEJBPropertiesPage">
- <filter
- name="nature"
- value="org.eclipse.wst.common.project.facet.core.nature">
- </filter>
- </page>
-
-<!-- =========== org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletWebPreferencePage ============ -->
-
- <page
- adaptable="true"
- objectClass="org.eclipse.core.resources.IProject"
- name="%XDocletWebPropertiesPage.name"
- category="XDocletPropertiesPage"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletWebPreferencePage"
- id="XDocletWebPropertiesPage">
- <filter
- name="nature"
- value="org.eclipse.wst.common.project.facet.core.nature">
- </filter>
- </page>
- </extension>
-
-
-<!-- =========== XDoclet Code Emmitters ============ -->
-
- <extension
- point="org.eclipse.jst.j2ee.ejb.annotations.emitter.template">
- <emitter
-
- name="XDoclet"
- classpathProvider="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ClasspathProvider"
- builderId="xdocletbuilder"
- ejbIntrospector="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XdocletIntrospector"
- mergeController="ejb-merge.xml"
- entityTemplates="templates/ejb/entity"
- messageTemplates="templates/ejb/message"
- sessionTemplates="templates/ejb/session">
- </emitter>
- </extension>
-
- <extension
- point="org.eclipse.jst.j2ee.ejb.annotation.model.ejbGenerator">
-
- <provider
- name="XDoclet"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.provider.XDocletAnnotationProvider" />
- <ejbGenerator
- name="XDoclet"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.provider.XDocletAnnotationProvider" />
- </extension>
-
-
- <!-- -->
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- objectClass="org.eclipse.core.resources.IProject"
- nameFilter="*"
- id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet">
- <filter name="nature" value="org.eclipse.wst.common.project.facet.core.nature"/>
- <enablement>
- <or>
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.web.xdoclet"/>
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.ejb.xdoclet"/>
- </or>
- </enablement>
- <action
- label="%action.runxdoclet"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.action.RunXDocletAction"
- menubarPath="additions"
- enablesFor="+"
- id="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.action.RunXDocletAction">
- </action>
- </objectContribution>
- </extension>
-
- <!-- ================================================ -->
- <!-- XDoclet PROJECT WEB FACETS -->
- <!-- ================================================ -->
-
-
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="jst.web.xdoclet">
- <label>%facet.webdoclet</label>
- <description>%facet.webdoclet.description</description>
- <icon>icons/xdoclet.gif</icon>
- </project-facet>
-
- <project-facet-version facet="jst.web.xdoclet" version="1.2.1">
- <constraint>
- <and>
- <requires facet="jst.web" version="[2.2-2.3]"/>
- </and>
- </constraint>
- </project-facet-version>
-
- <project-facet-version facet="jst.web.xdoclet" version="1.2.2">
- <constraint>
- <and>
- <requires facet="jst.web" version="[2.2-2.3]"/>
- </and>
- </constraint>
- </project-facet-version>
-
- <project-facet-version facet="jst.web.xdoclet" version="1.2.3">
- <constraint>
- <and>
- <requires facet="jst.web" version="[2.2"/>
- </and>
- </constraint>
- </project-facet-version>
-
-
-
- <action type="install" facet="jst.web.xdoclet" version="[1.2.1-1.2.3]">
- <delegate class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet.XDocletFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet.XDocletWebFacetInstallDataModelProvider"/>
- </action>
- <action type="uninstall" facet="jst.web.xdoclet" version="[1.2.1-1.2.3]">
- <delegate class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet.XDocletFacetUninstallDelegate"/>
- </action>
-
- <event-handler type="RUNTIME_CHANGED" facet="jst.web.xdoclet" version="[1.2.1-1.2.3]">
- <delegate class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet.XDocletFacetRuntimeChangedDelegate"/>
- </event-handler>
-
- <action type="version-change" facet="jst.web.xdoclet" version="[1.2.1-1.2.3]">
- <delegate class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet.XDocletFacetVersionChangeDelegate"/>
- </action>
-
-
- <preset id="preset.jst.web.xdoclet">
- <label>%preset.webdoclet</label>
- <description>%preset.webdoclet.description</description>
- <facet id="jst.java" version="1.4" />
- <facet id="jst.web" version="2.4"/>
- <facet id="jst.web.xdoclet" version="1.2.3" />
- </preset>
-
- <!-- ================================================ -->
- <!-- XDoclet PROJECT EJB FACETS -->
- <!-- ================================================ -->
-
- <project-facet id="jst.ejb.xdoclet">
- <label>%facet.ejbdoclet</label>
- <description>%facet.ejbdoclet.description</description>
- <icon>icons/xdoclet.gif</icon>
- </project-facet>
-
- <project-facet-version facet="jst.ejb.xdoclet" version="1.2.1">
- <constraint>
- <and>
- <requires facet="jst.ejb" version="1.1,2.0"/>
- <conflicts group="ejb.annotated.generation"/>
- </and>
- </constraint>
- <group-member id="ejb.annotated.generation"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.ejb.xdoclet" version="1.2.2">
- <constraint>
- <and>
- <requires facet="jst.ejb" version="1.1,2.0"/>
- <conflicts group="ejb.annotated.generation"/>
- </and>
- </constraint>
- <group-member id="ejb.annotated.generation"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.ejb.xdoclet" version="1.2.3">
- <constraint>
- <and>
- <requires facet="jst.ejb" version="[1.1-2.1]"/>
- <conflicts group="ejb.annotated.generation"/>
- </and>
- </constraint>
- <group-member id="ejb.annotated.generation"/>
- </project-facet-version>
-
- <action type="install" facet="jst.ejb.xdoclet" version="[1.2.1-1.2.3]">
- <delegate class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet.XDocletFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet.XDocletEjbFacetInstallDataModelProvider"/>
- </action>
- <action type="uninstall" facet="jst.ejb.xdoclet" version="[1.2.1-1.2.3]">
- <delegate class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet.XDocletFacetUninstallDelegate"/>
- </action>
- <event-handler type="RUNTIME_CHANGED" facet="jst.ejb.xdoclet" version="[1.2.1-1.2.3]">
- <delegate class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet.XDocletFacetRuntimeChangedDelegate"/>
- </event-handler>
- <action type="version-change" facet="jst.ejb.xdoclet" version="[1.2.1-1.2.3]">
- <delegate class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet.XDocletFacetVersionChangeDelegate"/>
- </action>
-
-
- <preset id="preset.jst.ejb.xdoclet">
- <label>%preset.ejbdoclet</label>
- <facet id="jst.java" version="1.4" />
- <facet id="jst.ejb" version="2.1"/>
- <facet id="jst.ejb.xdoclet" version="1.2.3" />
- </preset>
- </extension>
-
-
- <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
- <supported>
- <runtime-component any="true"/>
- <facet id="jst.web.xdoclet" version="1.2.1,1.2.2,1.2.3"/>
- </supported>
- <supported>
- <runtime-component any="true"/>
- <facet id="jst.ejb.xdoclet" version="1.2.1,1.2.2,1.2.3"/>
- </supported>
- </extension>
-
-
- <!-- ================================================ -->
- <!-- EJB Tag set definitions for XDoclet -->
- <!-- ================================================ -->
- <extension
- id="EJBTagSets"
- point="org.eclipse.jst.common.annotations.controller.AnnotationTagSet">
- <AnnotationTagSet
- name="ejb">
- </AnnotationTagSet>
- </extension>
- <extension
- id="EJBAnnotationInfo"
- point="org.eclipse.jst.common.annotations.controller.AnnotationTagInfo">
- <AnnotationTagInfo tagSet="ejb" tagName="value-object" scope="type"
- multiplicity="*">
- <attrib name="abstract" type="bool"/>
- <attrib name="extends"/>
- <attrib name="implements"/>
- <attrib name="match"/>
- <attrib name="name">
- <unique scope="type"/>
- </attrib>
- <attrib name="generatePKConstructor" type="bool"/>
- </AnnotationTagInfo>
-
- <AnnotationTagInfo tagSet="ejb" tagName="value-object" scope="method">
- <attrib name="match"/>
- <attrib name="compose"/>
- <attrib name="compose-name"/>
- <attrib name="aggregate"/>
- <attrib name="aggregate-name"/>
- <attrib name="members"/>
- <attrib name="members-name"/>
- <attrib name="relation"/>
- <attrib name="type"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="session"
- scope="type">
- <attrib
- use="required"
- name="name">
- <unique scope="module"/>
- </attrib>
- <attrib
- name="description">
- </attrib>
- <attrib
- name="display-name">
- </attrib>
- <attrib
- name="small-icon">
- </attrib>
- <attrib
- name="large-icon">
- </attrib>
- <attrib
- name="generate"
- type="bool">
- </attrib>
- <attrib
- name="jndi-name">
- </attrib>
- <attrib
- name="local-jndi-name">
- </attrib>
- <attrib
- name="view-type" type="enum">
- <enumValues value="local"/>
- <enumValues value="remote"/>
- <enumValues value="both"/>
- </attrib>
- <attrib
- name="type" type="enum">
- <enumValues value="Stateless"/>
- </attrib>
- <attrib
- name="transaction-type" type="enum">
- <enumValues value="Container"/>
- <enumValues value="Bean"/>
- </attrib>
- <attrib
- name="remote-business-interface"
- type="javaType">
- </attrib>
- <attrib
- name="local-business-interface"
- type="javaType">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo tagSet="ejb" tagName="relation" scope="method">
- <attrib name="name" use="required"/>
- <attrib name="role-name" use="required"/>
- <attrib name="cascade-delete"/>
- <attrib name="target-ejb"/>
- <attrib name="target-role-name"/>
- <attrib name="target-cascade-delete"/>
- <attrib name="target-multiple"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="bean"
- scope="type">
- <attrib
- use="required"
- name="name">
- <unique scope="module"/>
- </attrib>
- <attrib
- name="description">
- </attrib>
- <attrib
- name="display-name">
- </attrib>
- <attrib
- name="small-icon">
- </attrib>
- <attrib
- name="large-icon">
- </attrib>
- <attrib
- name="generate"
- type="bool">
- </attrib>
- <attrib
- name="jndi-name">
- </attrib>
- <attrib
- name="local-jndi-name">
- </attrib>
- <attrib
- name="view-type" type="enum">
- <enumValues value="local"/>
- <enumValues value="remote"/>
- <enumValues value="both"/>
- </attrib>
- <attrib
- name="type" type="enum">
- <enumValues value="CMP"/>
- <enumValues value="BMP"/>
- <enumValues value="Stateless"/>
- <enumValues value="Stateful"/>
- </attrib>
- <attrib
- name="transaction-type" type="enum">
- <enumValues value="Container"/>
- <enumValues value="Bean"/>
- </attrib>
- <attrib
- name="reentrant"
- type="bool">
- </attrib>
- <attrib
- name="cmp-version" type="enum">
- <enumValues value="2.x"/>
- </attrib>
- <attrib
- name="schema">
- </attrib>
- <attrib
- name="primkey-field">
- </attrib>
- <attrib
- name="use-soft-locking"
- type="bool">
- </attrib>
- <attrib
- name="message-selector">
- </attrib>
- <attrib
- name="acknowledge-mode" type="enum">
- <enumValues value="Auto-acknowledge"/>
- <enumValues value="Dups-ok-acknowledge"/>
- </attrib>
- <attrib
- name="destination-type" type="enum">
- <enumValues value="javax.jms.Queue"/>
- <enumValues value="javax.jms.Topic"/>
- </attrib>
- <attrib
- name="subscription-durability" type="enum">
- <enumValues value="Durable"/>
- <enumValues value="NonDurable"/>
- </attrib>
- <attrib
- name="remote-business-interface"
- type="javaType">
- </attrib>
- <attrib
- name="local-business-interface"
- type="javaType">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo tagSet="ejb" tagName="select" scope="method" multiplicity="*">
- <attrib name="query" use="required"/>
- <attrib name="result-type-mapping" type="enum">
- <enumValues value="none"/>
- <enumValues value="Local"/>
- <enumValues value="Remote"/>
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo tagSet="ejb" tagName="ejb-external-ref" scope="type" multiplicity="*">
- <attrib name="ref-name" use="required"/>
- <attrib name="view-type" use="required" type="enum">
- <enumValues value="local"/>
- <enumValues value="remote"/>
- </attrib>
- <attrib name="link" use="required"/>
- <attrib name="type" use="required" type="enum">
- <enumValues value="Entity"/>
- <enumValues value="Session"/>
- </attrib>
- <attrib name="home" type="javaType" use="required"/>
- <attrib name="business" type="javaType" use="required"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="home-method"
- scope="method">
- <attrib
- name="view-type"
- description="ath.view-type.home-method"
- type="enum">
- <enumValues value="local"/>
- <enumValues value="remote"/>
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="interface-method"
- scope="method">
- <attrib
- name="view-type"
- description="ath.view-type.interface-method"
- type="enum">
- <enumValues value="local"/>
- <enumValues value="remote"/>
- <enumValues value="both"/>
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="create-method"
- scope="method">
- <attrib
- name="view-type"
- description="ath.view-type.create-method"
- type="enum">
- <enumValues value="local"/>
- <enumValues value="remote"/>
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="env-entry"
- scope="type" multiplicity="*">
- <attrib name="name" use="required">
- </attrib>
- <attrib name="description"/>
- <attrib name="type" type="enum">
- <enumValues value="java.lang.Boolean"/>
- <enumValues value="java.lang.Byte"/>
- <enumValues value="java.lang.Character"/>
- <enumValues value="java.lang.String"/>
- <enumValues value="java.lang.Short"/>
- <enumValues value="java.lang.Integer"/>
- <enumValues value="java.lang.Long"/>
- <enumValues value="java.lang.Float"/>
- <enumValues value="java.lang.Double"/>
- </attrib>
- <attrib name="value"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="ejb-ref"
- scope="type" multiplicity="*">
-
- <attrib name="ejb-name" use="required"/>
- <attrib name="view-type" use="required" type="enum">
- <enumValues value="local"/>
- <enumValues value="remote"/>
- </attrib>
- <attrib name="ref-name"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="security-role-ref"
- scope="type" multiplicity="*">
- <attrib name="role-name" use="required"/>
- <attrib name="role-link" use="required"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="security-identity"
- scope="type">
- <attrib name="description"/>
- <attrib name="use-caller-identity" type="bool"/>
- <attrib name="run-as"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="resource-ref"
- scope="type" multiplicity="*">
- <attrib name="res-ref-name" use="required"/>
- <attrib name="res-type" use="required" type="javaType"/>
- <attrib name="res-auth" use="required" type="enum">
- <enumValues value="Container"/>
- <enumValues value="Application"/>
- </attrib>
- <attrib name="res-sharing-scope" type="enum">
- <enumValues value="Shareable"/>
- <enumValues value="Unshareable"/>
- </attrib>
- <attrib name="jndi-name"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="resource-env-ref"
- scope="type" multiplicity="*">
- <attrib name="name" use="required"/>
- <attrib name="type" use="required" type="javaType"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="interface"
- scope="type">
- <attrib name="extends"/>
- <attrib name="local-extends"/>
- <attrib name="generate" type="bool"/>
- <attrib name="remote-class"/>
- <attrib name="local-class"/>
- <attrib name="remote-pattern"/>
- <attrib name="local-pattern"/>
- <attrib name="pattern"/>
- <attrib name="remote-package"/>
- <attrib name="local-package"/>
- <attrib name="package"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="home"
- scope="type">
- <attrib name="extends"/>
- <attrib name="local-extends"/>
- <attrib name="generate" type="bool"/>
- <attrib name="remote-class"/>
- <attrib name="local-class"/>
- <attrib name="remote-pattern"/>
- <attrib name="local-pattern"/>
- <attrib name="pattern"/>
- <attrib name="remote-package"/>
- <attrib name="local-package"/>
- <attrib name="package"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="pk"
- scope="type">
- <attrib name="class" use="required"/>
- <attrib name="pattern"/>
- <attrib name="package"/>
- <attrib name="generate" type="bool"/>
- <attrib name="extends" type="javaType"/>
- <attrib name="implements" type="javaType"/>
- <attrib name="role-name"/>
- <attrib name="unchecked" type="bool"/>
- <attrib name="method-intf" type="enum">
- <enumValues value="Home"/>
- <enumValues value="LocalHome"/>
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="pk-field"
- scope="method">
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="persistence"
- scope="type">
- <attrib name="table-name"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="persistence"
- scope="method">
- <attrib name="column-name"/>
- <attrib name="jdbc-type" type="enum">
- <enumValues value="ARRAY"/>
- <enumValues value="BIGINT"/>
- <enumValues value="BINARY"/>
- <enumValues value="BIT"/>
- <enumValues value="BLOB"/>
- <enumValues value="BOOLEAN"/>
- <enumValues value="CHAR"/>
- <enumValues value="CLOB"/>
- <enumValues value="DATALINK"/>
- <enumValues value="DATE"/>
- <enumValues value="DECIMAL"/>
- <enumValues value="DISTINCT"/>
- <enumValues value="DOUBLE"/>
- <enumValues value="FLOAT"/>
- <enumValues value="INTEGER"/>
- <enumValues value="JAVA_OBJECT"/>
- <enumValues value="LONGVARBINARY"/>
- <enumValues value="LONGVARCHAR"/>
- <enumValues value="NULL"/>
- <enumValues value="NUMERIC"/>
- <enumValues value="OTHER"/>
- <enumValues value="REAL"/>
- <enumValues value="REF"/>
- <enumValues value="SMALLINT"/>
- <enumValues value="STRUCT"/>
- <enumValues value="TIME"/>
- <enumValues value="TIMESTAMP"/>
- <enumValues value="TINYINT"/>
- <enumValues value="VARBINARY"/>
- <enumValues value="VARCHAR"/>
- </attrib>
- <attrib name="sql-type"/>
- <attrib name="read-only"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="finder"
- scope="type"
- multiplicity="*">
- <attrib name="view-type" type="enum">
- <enumValues value="local"/>
- <enumValues value="remote"/>
- <enumValues value="both"/>
- </attrib>
- <attrib name="description"/>
- <attrib name="signature" use="required"/>
- <attrib name="unchecked" type="bool"/>
- <attrib name="role-name"/>
- <attrib name="query" use="required"/>
- <attrib name="result-type-mapping" type="enum">
- <enumValues value="none"/>
- <enumValues value="Local"/>
- <enumValues value="Remote"/>
- </attrib>
- <attrib name="transaction-type"/>
- <attrib name="method-intf" type="enum">
- <enumValues value="Home"/>
- <enumValues value="LocalHome"/>
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo tagSet="ejb" tagName="transaction" scope="method">
- <attrib name="type" use="required" type="enum">
- <enumValues value="NotSupported"/>
- <enumValues value="Supports"/>
- <enumValues value="Required"/>
- <enumValues value="RequiresNew"/>
- <enumValues value="Mandatory"/>
- <enumValues value="Never"/>
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo tagSet="ejb" tagName="transaction" scope="type">
- <attrib name="type" use="required" type="enum">
- <enumValues value="NotSupported"/>
- <enumValues value="Supports"/>
- <enumValues value="Required"/>
- <enumValues value="RequiresNew"/>
- <enumValues value="Mandatory"/>
- <enumValues value="Never"/>
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo tagSet="ejb" tagName="facade-method" scope="method">
- <attrib name="invalidate" type="bool"/>
- <attrib name="cache" type="bool"/>
- <attrib name="immutable" type="bool"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="ejb"
- tagName="util"
- scope="type">
-
- <attrib name="generate" use="required" type="enum">
- <enumValues value="no"/>
- <enumValues value="logical"/>
- <enumValues value="physical"/>
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo tagSet="ejb" tagName="facade" scope="type">
- <attrib name="name"/>
- <attrib name="description"/>
- <attrib name="display-name"/>
- <attrib name="small-icon"/>
- <attrib name="large-icon"/>
- <attrib name="jndi-name"/>
- <attrib name="local-jndi-name"/>
- <attrib name="view-type" type="enum">
- <enumValues value="local"/>
- <enumValues value="remote"/>
- <enumValues value="both"/>
- </attrib>
- <attrib name="type" use="required" type="enum">
- <enumValues value="Stateless"/>
- <enumValues value="Stateful"/>
- </attrib>
- <attrib name="transaction-type" type="enum">
- <enumValues value="Bean"/>
- <enumValues value="Container"/>
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo tagSet="ejb" tagName="remote-facade" scope="type"/>
- <AnnotationTagInfo tagSet="ejb" tagName="permission" scope="method">
- <attrib name="role-name"/>
- <attrib name="unchecked" type="bool"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo tagSet="ejb" tagName="permission" scope="type">
- <attrib name="role-name"/>
- <attrib name="unchecked" type="bool"/>
- </AnnotationTagInfo>
-
- </extension>
-
- <extension
- point="org.eclipse.jst.j2ee.ejb.annotations.ui.ProviderPreferenceMapping">
- <mapping
- name="XDoclet"
- preferencePage="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.preference"/>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/schema/ejbDocletTaskProvider.exsd b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/schema/ejbDocletTaskProvider.exsd
deleted file mode 100644
index 2837c5e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/schema/ejbDocletTaskProvider.exsd
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.ejb.annotations.xdoclet">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.ejb.annotations.xdoclet" id="ejbDocletTaskProvider" name="EJB Doclet Task Provider"/>
- </appInfo>
- <documentation>
- Allows extenders to define tasks that can run during ejbdoclet processing. The task must be supported by XDoclet. Task properties editable by a dynamic UI generated from the extension point.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="EjbdocletTaskProvider"/>
- <element ref="TaskProperty" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="AnnotationProvider" minOccurs="0" maxOccurs="3"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="EjbdocletTaskProvider">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="description" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="defaultSelection" type="boolean" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="TaskProperty">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="default" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="type">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="string">
- </enumeration>
- <enumeration value="boolean">
- </enumeration>
- <enumeration value="enum">
- </enumeration>
- <enumeration value="file">
- </enumeration>
- <enumeration value="dir">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="restriction" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="include" type="boolean" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="AnnotationProvider">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.IXDocletRuntimeAnnotation"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="type" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="entity">
- </enumeration>
- <enumeration value="session">
- </enumeration>
- <enumeration value="mdb">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="include" type="boolean" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <pre>
- <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>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- org.eclipse.jst.j2ee.ejb.annotations.xdoclet.runtime plugin
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 Eteration A.S. and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/schema/webdocletTaskProvider.exsd b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/schema/webdocletTaskProvider.exsd
deleted file mode 100644
index be54597..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/schema/webdocletTaskProvider.exsd
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.ejb.annotations.xdoclet">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.ejb.annotations.xdoclet" id="webdocletTaskProvider" name="Web Doclet Task Provider"/>
- </appInfo>
- <documentation>
- Allows extenders to define tasks that can run during webdoclet processing. The task must be supported by XDoclet. Task properties editable by a dynamic UI generated from the extension point.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="WebdocletTaskProvider"/>
- <element ref="TaskProperty" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="WebdocletTaskProvider">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="description" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="defaultSelection" type="boolean" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="TaskProperty">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="default" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="type">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="string">
- </enumeration>
- <enumeration value="boolean">
- </enumeration>
- <enumeration value="enum">
- </enumeration>
- <enumeration value="file">
- </enumeration>
- <enumeration value="dir">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="include" type="boolean" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="restriction" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <pre>
- <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="XDoclet Generated Name"
- 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>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- org.eclipse.jst.j2ee.ejb.annotations.xdoclet.runtime plugin
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 Eteration A.S. and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/schema/xdocletRuntime.exsd b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/schema/xdocletRuntime.exsd
deleted file mode 100644
index 808c52d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/schema/xdocletRuntime.exsd
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.ejb.annotations.xdoclet">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.ejb.annotations.xdoclet" id="xdocletRuntime" name="XDoclet Runtime"/>
- </appInfo>
- <documentation>
- xDocletRuntime Extension allows us to add new xdoclet runtimes as extensions. For example to add XDoclet 2 support we will only need to define an extension.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="RuntimeVersion"/>
- <element ref="RuntimeLib" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="RuntimeVersion">
- <complexType>
- <attribute name="xdoclet" type="string">
- <annotation>
- <documentation>
- XDoclet Version
- </documentation>
- </annotation>
- </attribute>
- <attribute name="ejb" type="string">
- <annotation>
- <documentation>
- Supported EJB Versions
- </documentation>
- </annotation>
- </attribute>
- <attribute name="servlet" type="string">
- <annotation>
- <documentation>
- Supported Servlet Version
- </documentation>
- </annotation>
- </attribute>
- <attribute name="jsp" type="string">
- <annotation>
- <documentation>
- Supported Servlet Version
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="RuntimeLib">
- <complexType>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="location" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <pre>
- <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>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- org.eclipse.jst.j2ee.ejb.annotations.xdoclet.runtime plugin
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 Eteration A.S. and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ClasspathProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ClasspathProvider.java
deleted file mode 100644
index 9bd8873..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ClasspathProvider.java
+++ /dev/null
@@ -1,39 +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.annotations.internal.xdoclet;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.DefaultClasspathProvider;
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-public class ClasspathProvider extends DefaultClasspathProvider {
- public ClasspathProvider() {
- // Default constructor
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.internal.emitter.DefaultClasspathProvider#getClasspathItems()
- */
- public List getClasspathItems() {
- List list = super.getClasspathItems();
- list.add("org.eclipse.jst.j2ee.ejb.annotations.xdoclet");
- list.add("org.eclipse.jst.common.frameworks");
- list.add("org.eclipse.wst.common.frameworks");
- return list;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/IXDocletRuntimeAnnotation.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/IXDocletRuntimeAnnotation.java
deleted file mode 100644
index f3c3740..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/IXDocletRuntimeAnnotation.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-
-public interface IXDocletRuntimeAnnotation {
-
- public final static String entity = "entity";
-
- public final static String session = "session";
-
- public final static String mdb = "mdb";
-
- String getTypeAnnotations(IProject project, IEnterpriseBean beanModel);
- public abstract void setPreferenceStore(XDocletPreferenceStore preferenceStore);
- public abstract XDocletPreferenceStore getPreferenceStore();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/Logger.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/Logger.java
deleted file mode 100644
index 1b7eb2b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/Logger.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.xdoclet"; //$NON-NLS-1$
-
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
- }
-
- /**
- * @return true if the platform is debugging
- */
- public static boolean isDebugging() {
- return Platform.inDebugMode();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletAnnotationPlugin.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletAnnotationPlugin.java
deleted file mode 100644
index d519abe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletAnnotationPlugin.java
+++ /dev/null
@@ -1,108 +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.annotations.internal.xdoclet;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class XDocletAnnotationPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static XDocletAnnotationPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
- public static final String PLUGINID = "org.eclipse.jst.j2ee.ejb.annotations.xdoclet";
- /**
- * The constructor.
- */
- public XDocletAnnotationPlugin() {
- 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 XDocletAnnotationPlugin 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 = XDocletAnnotationPlugin.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.annotations.internal.emitter.model.xdoclet.XDocletAnnotationPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeDefaultPreferences(org.eclipse.jface.preference.IPreferenceStore)
- */
- protected void initializeDefaultPreferences(IPreferenceStore store) {
- XDocletPreferenceStore.initializeDefaultPreferences(store);
- }
-
-
- public static ImageDescriptor createImageDescriptor(URL root, String file) {
- try {
- URL urlToImage =
- new URL(root,file);
- return ImageDescriptor.createFromURL(urlToImage);
- } catch (MalformedURLException e) {
- Logger.logException(e);
- return null;
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletAntProjectBuilder.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletAntProjectBuilder.java
deleted file mode 100644
index 2cf5db5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletAntProjectBuilder.java
+++ /dev/null
@@ -1,218 +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.annotations.internal.xdoclet;
-
-import java.io.File;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.util.AntLauncherUtility;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public abstract class XDocletAntProjectBuilder {
-
- protected URL templateUrl;
-
- XDocletPreferenceStore preferenceStore = null;
-
- IProject project;
-
- IResource resource;
-
- Properties properties;
-
- public static class Factory {
-
- public static XDocletAntProjectBuilder newInstance(IResource resource) {
- IVirtualResource[] vResources = ComponentCore.createResources(resource);
- XDocletAntProjectBuilder antProjectBuilder = null;
- if (vResources.length == 0)
- return null;
- if (J2EEProjectUtilities.isEJBProject(vResources[0].getComponent().getProject()))
- antProjectBuilder = new XDocletEjbAntProjectBuilder();
-
- else if (J2EEProjectUtilities.isDynamicWebProject(vResources[0].getComponent().getProject()))
- antProjectBuilder = new XDocletWebAntProjectBuilder();
- antProjectBuilder.setProject(vResources[0].getComponent().getProject());
- antProjectBuilder.setResource(resource);
- return antProjectBuilder;
- }
-
- }
-
- public XDocletAntProjectBuilder() {
- super();
- }
-
- private XDocletPreferenceStore initPreferenceStore(IProject project) {
- if (preferenceStore == null) {
- preferenceStore = XDocletPreferenceStore.forProject(project);
-
- }
- return preferenceStore;
- }
-
- protected String asClassPath(IJavaProject project) throws CoreException {
- String[] cp = createClassPath(project);
- StringBuffer buf = new StringBuffer(256);
- for (int i = 0; i < cp.length; i++) {
- String string = cp[i];
- buf.append(string);
- if (i != cp.length - 1)
- buf.append(File.pathSeparatorChar);
- }
- return buf.toString();
- }
-
- protected String[] createClassPath(IJavaProject project) throws CoreException {
- String[] cp = JavaRuntime.computeDefaultRuntimeClassPath(project);
- return cp;
- }
-
-
- public void buildUsingAnt(final IResource beanClass,final IProgressMonitor monitor) throws CoreException {
- initPreferenceStore(beanClass.getProject());
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-
-
-
- public void run(IProgressMonitor aMonitor) throws CoreException {
- IJavaProject javaProject = JavaCore.create(beanClass.getProject());
- try {
- IPackageFragmentRoot packageFragmentRoot = getPackageFragmentRootOrFirst(beanClass);
- String beanPath = constructAnnotatedClassList(packageFragmentRoot, beanClass);
-
- Properties properties = createAntBuildProperties(beanClass, javaProject, packageFragmentRoot, beanPath);
- XDocletAntProjectBuilder.this.setProperties(properties);
- HashMap templates = createTemplates(beanPath);
-
- AntLauncherUtility antLauncher = new AntLauncherUtility(templateUrl, beanClass.getParent().getLocation(), properties,
- templates);
- antLauncher.setUseLauncher(true);
- antLauncher.launch(getTaskName(), aMonitor);
- XDocletAntProjectBuilder.this.refreshProjects(beanClass.getProject(), aMonitor);
- } catch (Exception e) {
- Logger.logException(e);
- }
- }
- };
-
- ResourcesPlugin.getWorkspace().run(runnable, null, IWorkspace.AVOID_UPDATE, monitor);
-
- }
-
- private IPackageFragmentRoot getPackageFragmentRootOrFirst(IResource beanClass) throws JavaModelException {
- try {
- ICompilationUnit compilationUnit = JavaCore.createCompilationUnitFrom((IFile) beanClass);
- return this.getPackageFragmentRoot(compilationUnit);
- } catch (RuntimeException e) {
- }
-
- IContainer container = J2EEProjectUtilities.getSourceFolderOrFirst(beanClass.getProject(), "ejbModule");
- return JavaCore.create(beanClass.getProject()).findPackageFragmentRoot(container.getFullPath());
- }
-
- protected abstract String getTaskName();
-
- protected abstract void refreshProjects(IProject project, IProgressMonitor monitor) throws CoreException;
-
- protected abstract HashMap createTemplates(String beanPath);
-
- protected abstract Properties createAntBuildProperties(IResource resource, IJavaProject javaProject,
- IPackageFragmentRoot packageFragmentRoot, String beanPath);
-
- protected abstract String constructAnnotatedClassList(IPackageFragmentRoot root, IResource changedBean);
-
- /**
- * @param path2
- * @param root
- * @return
- */
- protected IPath makeRelativeTo(IPath path, IPackageFragmentRoot root) {
- if (root == null)
- return path;
- try {
- IPath rpath = root.getCorrespondingResource().getProjectRelativePath();
- if (rpath.isPrefixOf(path))
- return path.removeFirstSegments(rpath.matchingFirstSegments(path));
- } catch (JavaModelException e) {
- Logger.logException(e);
- }
-
- return path;
- }
-
- protected IPackageFragmentRoot getPackageFragmentRoot(ICompilationUnit res) {
- IJavaElement current = res;
- do {
- if (current instanceof IPackageFragmentRoot)
- return (IPackageFragmentRoot) current;
- current = current.getParent();
- } while (current != null);
- return null;
- }
-
- protected IPath getJavaProjectOutputContainer(IJavaProject proj) throws JavaModelException {
- IPath path = proj.getOutputLocation();
- if (path == null)
- return null;
- if (path.segmentCount() == 1)
- return path;
- return ((IContainer) proj.getProject()).getFolder(path.removeFirstSegments(1)).getProjectRelativePath();
- }
-
- public XDocletPreferenceStore getPreferenceStore() {
- return preferenceStore;
- }
-
- public IProject getProject() {
- return project;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public Properties getProperties() {
- return properties;
- }
-
- public void setProperties(Properties properties) {
- this.properties = properties;
- }
-
- public IResource getResource() {
- return resource;
- }
-
- public void setResource(IResource resource) {
- this.resource = resource;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuildUtility.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuildUtility.java
deleted file mode 100644
index da23943..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuildUtility.java
+++ /dev/null
@@ -1,132 +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.annotations.internal.xdoclet;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-
-public class XDocletBuildUtility {
-
- public static final Object FAMILY_MANUAL_BUILD = new Object();
- private static final String XDOCLETBUILDER = "org.eclipse.jst.j2ee.ejb.annotations.xdoclet.xdocletbuilder";
-
- class BuildJob extends Job {
-
- private final IProject fProject;
- ICommand xdocletBuilder;
-
- private BuildJob(String name, IProject project) {
- super(name);
- fProject = project;
- xdocletBuilder = getXDocletBuilder(project);
-
-
- }
-
- public boolean isCoveredBy(IProject aProject) {
-
- return fProject != null && fProject.equals(aProject);
- }
-
- public boolean belongsTo(Object family) {
- return family == XDocletBuildUtility.FAMILY_MANUAL_BUILD;
- }
-
- protected IStatus run(IProgressMonitor monitor) {
- if (xdocletBuilder != null) {
- try {
- fProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
- } catch (CoreException e) {
- Logger.logException(e);
- return Status.CANCEL_STATUS;
- }
- }
- return Status.OK_STATUS;
- }
-
- protected ICommand getXDocletBuilder(IProject aProject) {
- IProjectDescription description;
- try {
- description = aProject.getDescription();
-
- if (description == null) {
- return null;
- }
-
- ICommand[] commands = description.getBuildSpec();
- for (int i = 0; i < commands.length; ++i) {
- if (commands[i].getBuilderName().equals(XDOCLETBUILDER)) {
- return commands[i];
- }
- }
- } catch (CoreException e) {
- Logger.logException(e);
- }
- return null;
-
- }
-
- }
-
- public static void runNecessaryBuilders(IProgressMonitor monitor, IProject project) throws CoreException {
- if (project != null)
- runNecessaryBuildersForProject(project, monitor);
- else {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- runNecessaryBuildersForProject(projects[i], monitor);
- }
-
- }
- }
-
- private static void runNecessaryBuildersForProject(IProject aProject, IProgressMonitor monitor) throws CoreException {
-
- Job[] buildJobs = Platform.getJobManager().find(FAMILY_MANUAL_BUILD);
- for (int i = 0; i < buildJobs.length; i++) {
- Job curr = buildJobs[i];
- if (curr instanceof BuildJob) {
- BuildJob job = (BuildJob) curr;
- if (job.isCoveredBy(aProject)) {
- curr.cancel(); // cancel all other build jobs of our kind
- }
- }
- }
-
- XDocletBuildUtility buildUtility = new XDocletBuildUtility();
- XDocletBuildUtility.BuildJob buildJob = buildUtility.new BuildJob("XDoclet Build", aProject);
- buildJob.schedule(1000L);
-
- }
-
- protected ICommand getXDocletBuilder(IProjectDescription description) throws CoreException {
- if (description == null) {
- return null;
- }
-
- ICommand[] commands = description.getBuildSpec();
- for (int i = 0; i < commands.length; ++i) {
- if (commands[i].getBuilderName().equals(XDOCLETBUILDER)) {
- return commands[i];
- }
- }
- return null;
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuilder.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuilder.java
deleted file mode 100644
index 24424b0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuilder.java
+++ /dev/null
@@ -1,384 +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.annotations.internal.xdoclet;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-
-public class XDocletBuilder extends IncrementalProjectBuilder implements IExecutableExtension {
-
- private static final String JAVASOURCE_TYPE = "org.eclipse.jdt.core.javaSource"; //$NON-NLS-1$
-
- private static final boolean performValidateEdit = false;
-
- private static final String[] XDOCLETBUILDINCLUDEFILES = { "ejb-jar.xml", "web.xml", "bean.java", "servlet.java",
- "controller.java", "ejb.java", "mdb.java" };
-
- private static boolean isGloballyEnabled = true;
-
- /**
- * Add the XDocletBuilder to the build spec of a single IProject
- *
- * @param project -
- * the IProject to add to, when needed
- */
- public static void add(IProgressMonitor monitor, IProject project, Object validateEditContext) {
- if (project == null || !project.isAccessible()) {
- return;
- }
- boolean isBuilderPresent = false;
- try {
- IFile descriptionFile = project.getFile(IProjectDescription.DESCRIPTION_FILE_NAME);
- if (descriptionFile.exists() && descriptionFile.isAccessible()) {
- IProjectDescription description = project.getDescription();
- ICommand[] commands = description.getBuildSpec();
- if (commands != null) {
- for (int i = 0; i < commands.length; i++) {
- String builderName = commands[i].getBuilderName();
- // builder name will be null if it has not been set
- if (builderName != null && builderName.equals(getBuilderId())) {
- isBuilderPresent = true;
- break;
- }
- }
- }
- if (!isBuilderPresent && !monitor.isCanceled()) {
- // validate for edit
- IStatus status = null;
- if (performValidateEdit) {
- ISchedulingRule validateEditRule = null;
- try {
-
- IFile[] validateFiles = new IFile[] { descriptionFile };
- IWorkspace workspace = descriptionFile.getWorkspace();
- validateEditRule = workspace.getRuleFactory().validateEditRule(validateFiles);
- Job.getJobManager().beginRule(validateEditRule, monitor);
- status = workspace.validateEdit(validateFiles, null);
- } finally {
- if (validateEditRule != null) {
- Job.getJobManager().endRule(validateEditRule);
- }
- }
- }
- if (status == null || status.isOK()) {
- // add the builder
- ICommand newCommand = description.newCommand();
- newCommand.setBuilderName(getBuilderId());
- ICommand[] newCommands = null;
- if (commands != null) {
- newCommands = new ICommand[commands.length + 1];
- System.arraycopy(commands, 0, newCommands, 0, commands.length);
- newCommands[commands.length] = newCommand;
- } else {
- newCommands = new ICommand[1];
- newCommands[0] = newCommand;
- }
- description.setBuildSpec(newCommands);
- /*
- * This 'refresh' was added since unit tests were
- * throwing exceptions about being out of sync. That may
- * indicate a "deeper" problem such as needing to use
- * scheduling rules, (although there don't appear to be
- * examples of that) or something similar.
- */
- // project.refreshLocal(IResource.DEPTH_ZERO,
- // subMonitorFor(monitor, 1,
- // IProgressMonitor.UNKNOWN));
- try {
- project.setDescription(description, monitor);
- } catch (CoreException e) {
- if (performValidateEdit) {
- Logger
- .log(
- Logger.WARNING,
- "Description for project \"" + project.getName() + "\" could not be updated despite successful build"); //$NON-NLS-2$//$NON-NLS-1$
- } else {
- Logger.log(Logger.WARNING,
- "Description for project \"" + project.getName() + "\" could not be updated"); //$NON-NLS-2$//$NON-NLS-1$
- }
- }
- }
- }
- } else {
- Logger.log(Logger.WARNING, "Description for project \"" + project.getName() + "\" could not be updated"); //$NON-NLS-2$//$NON-NLS-1$
- }
- } catch (Exception e) {
- // if we can't read the information, the project isn't open,
- // so it can't run auto-validate
- Logger.logException("Exception caught when adding Model Builder", e); //$NON-NLS-1$
- }
- }
-
- /**
- * Adds the Builder to every project in the Workspace
- *
- * @param root
- */
- public synchronized static void add(IProgressMonitor monitor, IWorkspaceRoot root, Object validateEditContext) {
- IProject[] allProjects = root.getProjects();
- IProgressMonitor localMonitor = monitor;
- localMonitor.beginTask("Starting to add builder to projects with EJB modules", 1); //$NON-NLS-1$
- for (int i = 0; i < allProjects.length && !monitor.isCanceled(); i++) {
- if (XDocletPreferenceStore.forProject(allProjects[i]).getBooleanProperty(XDocletPreferenceStore.XDOCLETBUILDERACTIVE)) {
- add(localMonitor, allProjects[i], validateEditContext);
- }
- localMonitor.worked(1);
- }
- localMonitor.done();
- }
-
- public static String getBuilderId() {
- return "org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.xdocletbuilder"; //$NON-NLS-1$
- }
-
- public static IProgressMonitor monitorFor(IProgressMonitor monitor) {
- if (monitor == null)
- return new NullProgressMonitor();
- return monitor;
- }
-
- private String fName = "XDoclet Builder"; //$NON-NLS-1$
-
- /**
- *
- */
- public XDocletBuilder() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.internal.events.InternalBuilder#build(int,
- * java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
- */
- protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
- IProject currentProject = getProject();
- // Currently, just use the Task Tags preference
- boolean locallyEnabled = XDocletPreferenceStore.forProject(currentProject).getBooleanProperty(
- XDocletPreferenceStore.XDOCLETBUILDERACTIVE);
- if (!locallyEnabled || currentProject == null || !currentProject.isAccessible() || !isValidRuntime(currentProject)) {
- return new IProject[] { currentProject };
- }
-
- IResourceDelta delta = getDelta(currentProject);
- IProgressMonitor localMonitor = monitor;
- localMonitor.beginTask(getDisplayName(), 1);
-
- if (!localMonitor.isCanceled()) {
- // check the kind of delta if one was given
- if (kind == FULL_BUILD || kind == CLEAN_BUILD || delta == null) {
- doFullBuild(kind, args, localMonitor, getProject());
- } else {
- doIncrementalBuild(kind, args, localMonitor);
- }
- }
- localMonitor.worked(1);
- localMonitor.done();
-
- return new IProject[] { getProject() };
- }
-
- void build(int kind, Map args, IResource resource, IContentType[] types, IProgressMonitor monitor) throws CoreException {
- boolean validRuntime = resource != null && isValidRuntime(resource.getProject());
- if (!monitor.isCanceled() && resource.getType() == IResource.FILE && validRuntime) {
- XDocletAntProjectBuilder antProjectBuilder = XDocletAntProjectBuilder.Factory.newInstance(resource);
- if (antProjectBuilder != null)
- antProjectBuilder.buildUsingAnt(resource, monitor);
-
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IncrementalProjectBuilder#clean(org.eclipse.core.runtime.IProgressMonitor)
- */
- protected void clean(IProgressMonitor monitor) throws CoreException {
- super.clean(monitor);
- IProject currentProject = getProject();
- if (!isGloballyEnabled || currentProject == null || !currentProject.isAccessible()) {
- return;
- }
- // doFullBuild(IncrementalProjectBuilder.CLEAN_BUILD, new HashMap(0),
- // monitor, getProject());
- }
-
- boolean isXDocletAnnotatedResource(IResource resource) {
- IContentType[] types = null;
- if (resource.getType() == IResource.FILE && resource.isAccessible()) {
- IContentDescription d = null;
- try {
- // optimized description lookup, might not succeed
- d = ((IFile) resource).getContentDescription();
- if (d != null && JAVASOURCE_TYPE.equals(d.getContentType().getId())) {
- return XDoxletAnnotationUtil.isXDocletAnnotatedResource(resource);
- }
- } catch (CoreException e) {
- // should not be possible given the accessible and file type
- // check above
- }
- if (types == null) {
- types = Platform.getContentTypeManager().findContentTypesFor(resource.getName());
- for (int i = 0; i < types.length; i++) {
- IContentType type = types[i];
- if (JAVASOURCE_TYPE.equals(type.getId())) {
- return XDoxletAnnotationUtil.isXDocletAnnotatedResource(resource);
- }
- }
- }
- return false;
- } else if (resource.getType() == IResource.FILE && !resource.isAccessible()) {
- // Deleted - Check to see if this is an xdoclet bean!
- // This is a crude hack to make sure the build runs is a resource is
- // deleted.
- // **Bean.java **Servlet.java **Mdb.java and deployment descriptors
- String name = resource.getName();
- for (int i = 0; name != null && i < XDOCLETBUILDINCLUDEFILES.length; i++) {
- String fileName = XDOCLETBUILDINCLUDEFILES[i];
- if (name.toLowerCase().endsWith(fileName))
- return true;
-
- }
- }
- return false;
- }
-
- /**
- * Iterate through the list of resources and build each one
- *
- * @param monitor
- * @param resources
- */
- protected void doFullBuild(int kind, Map args, IProgressMonitor monitor, IProject project) {
-
- final IProgressMonitor subMonitor = monitor;
- final int localKind = kind;
- final Map localArgs = args;
-
- final IProgressMonitor visitorMonitor = monitor;
- IResourceVisitor internalBuilder = new IResourceVisitor() {
- // xdoclet builder completes the whole project at once so no need to
- // repeat the build with each annotated bean. Stop after the first
- // one
- boolean buildComplete = false;
-
- public boolean visit(IResource resource) throws CoreException {
- if (resource.getType() == IResource.FILE && buildComplete == false) {
- // for any supported file type, record the resource
- if (!buildComplete && isXDocletAnnotatedResource(resource)) {
- build(localKind, localArgs, resource, null, subMonitor);
- buildComplete = true;
- visitorMonitor.worked(1);
- }
- return false;
- }
- return true;
- }
-
- };
- try {
- project.accept(internalBuilder);
- } catch (CoreException e) {
- Logger.logException(e);
- }
- }
-
- /**
- *
- */
- protected void doIncrementalBuild(int kind, Map args, IProgressMonitor monitor) {
- IResourceDelta projectDelta = getDelta(getProject());
- if (projectDelta == null) {
- throw new IllegalArgumentException("delta is null, should do a full build"); //$NON-NLS-1$
- }
-
- final Map localArgs = args;
- final int localKind = kind;
- final IProgressMonitor localMonitor = monitor;
- IResourceDeltaVisitor participantVisitor = new IResourceDeltaVisitor() {
- // xdoclet builder completes the whole project at once so no need to
- // repeat the build with each annotated bean. Stop after the first
- // one
- boolean buildComplete = false;
-
- public boolean visit(IResourceDelta delta) throws CoreException {
- if (!localMonitor.isCanceled() && delta.getResource().getType() == IResource.FILE) {
- if (!buildComplete && isXDocletAnnotatedResource(delta.getResource())) {
- build(localKind, localArgs, delta.getResource(), null, localMonitor);
- buildComplete = true;
- }
- }
- return delta.getAffectedChildren().length > 0;
- }
- };
- try {
- projectDelta.accept(participantVisitor);
- } catch (CoreException e) {
- Logger.logException(e);
- }
- monitor.worked(1);
- }
-
- private String getDisplayName() {
- return fName;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
- * java.lang.String, java.lang.Object)
- */
- public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
- if (config != null) {
- fName = config.getDeclaringExtension().getLabel();
- }
- }
-
- public static void shutdown() {
- // Default
- }
-
- public static void startup() {
- // Default
- }
-
- public boolean isValidRuntime(IProject currentProject) {
- XDocletBuilderValidator validator = new XDocletBuilderValidator();
- boolean valid = false;
- try {
- valid = validator.validate(currentProject);
- } catch (CoreException e) {
- }
- return valid;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuilderValidator.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuilderValidator.java
deleted file mode 100644
index cd87775..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuilderValidator.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2006 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.annotations.internal.xdoclet;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.Messages;
-
-public class XDocletBuilderValidator {
-
- public static final String MARKER_ID = XDocletAnnotationPlugin.PLUGINID
- + ".xdoclet.marker"; //$NON-NLS-1$
-
- public boolean validate(final IProject currentProject) throws CoreException
-
- {
- final boolean isValidRuntime = isValidRuntime(currentProject);
- clearMarkers(currentProject, MARKER_ID);
-
- if (!isValidRuntime) {
- createWarningMarker(currentProject, MARKER_ID,
- Messages.xdoclet_runtime_invalid);
- }
- return isValidRuntime;
- }
-
- public IMarker createWarningMarker(IProject project, String type,
- final String message)
-
- throws CoreException
-
- {
- return createMarker(project, IMarker.SEVERITY_ERROR, type, message);
- }
-
- public void clearMarkers(IProject project)
- throws CoreException {
- clearMarkers(project,MARKER_ID);
- }
-
- private void clearMarkers(IProject project, String type)
- throws CoreException {
- final IMarker[] existing = project.findMarkers(type, false,
- IResource.DEPTH_ZERO);
- for (int i = 0; i < existing.length; i++) {
- IMarker marker = existing[i];
- marker.delete();
-
- }
- }
-
- private IMarker createMarker(IProject project, int severity, String type,
- String message)
-
- throws CoreException
-
- {
- final IMarker[] existing = project.findMarkers(type, false,
- IResource.DEPTH_ZERO);
-
- for (int i = 0; i < existing.length; i++) {
- final IMarker m = existing[i];
-
- if (m.getAttribute(IMarker.SEVERITY, -1) == severity
- && m.getAttribute(IMarker.MESSAGE, "").equals(message)) //$NON-NLS-1$
- {
- return m;
- }
- }
-
- final IMarker m = project.createMarker(type);
-
- m.setAttribute(IMarker.MESSAGE, message);
- m.setAttribute(IMarker.SEVERITY, severity);
-
- return m;
- }
-
- public boolean isValidRuntime(IProject currentProject) {
-
- XDocletPreferenceStore store = XDocletPreferenceStore
- .forProject(currentProject);
- XDocletRuntime runtime = XDocletExtensionUtil.getRuntime(store
- .getProperty(XDocletPreferenceStore.XDOCLETVERSION));
- runtime.setHome(store.getProperty(XDocletPreferenceStore.XDOCLETHOME));
- return runtime.isValid();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletEjbAntProjectBuilder.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletEjbAntProjectBuilder.java
deleted file mode 100644
index ea3aea9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletEjbAntProjectBuilder.java
+++ /dev/null
@@ -1,305 +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.annotations.internal.xdoclet;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IParent;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-
-public class XDocletEjbAntProjectBuilder extends XDocletAntProjectBuilder {
- IProject clientProject;
-
- public XDocletEjbAntProjectBuilder() {
- super();
- templateUrl = Platform.getBundle(XDocletAnnotationPlugin.PLUGINID).getEntry("/templates/builder/xdoclet.xml"); //$NON-NLS-1$
-
- }
-
- /**
- * @return
- */
- protected String getTaskName() {
- return "ejbdoclet"; //$NON-NLS-1$
- }
-
- /**
- * @param beanPath
- * @return
- */
- protected HashMap createTemplates(String beanPath) {
- HashMap templates = new HashMap();
- templates.put("@beans@", beanPath); //$NON-NLS-1$
-
- templates.put("@docletTasks@", createDocletTasks()); //$NON-NLS-1$
-
- return templates;
- }
-
- private String createDocletTasks() {
- IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint(
- "org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider").getExtensions();
- StringBuffer tasks = new StringBuffer(512);
- for (int i = 0; extensions != null && i < extensions.length; i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = extension.getConfigurationElements();
- if (elements == null)
- continue;
- try {
- String pluginDescriptor = elements[0].getDeclaringExtension().getContributor().getName();
-
- org.osgi.framework.Bundle bundle = Platform.getBundle(pluginDescriptor);
- Class c = bundle.loadClass(elements[0].getAttribute("class"));
- if (c != null) {
- XDocletTaskProvider docletTaskProvider = (XDocletTaskProvider) c.newInstance();
-
- docletTaskProvider.setClientProject(clientProject);
- docletTaskProvider.setPreferenceStore(this.preferenceStore);
- docletTaskProvider.setExtension(extension);
- docletTaskProvider.setProperties(this.getProperties());
- docletTaskProvider.setProject(this.getProject());
- if (preferenceStore.getBooleanProperty(elements[0].getAttribute("id") + ".defaultSelection")) {
- tasks.append("\n");
- tasks.append(docletTaskProvider.getTask());
- tasks.append("\n");
- }
- }
- } catch (Exception e) {
- Logger.logException(e);
- }
- }
- return tasks.toString();
- }
-
- /**
- * @param resource
- * @param javaProject
- * @param packageFragmentRoot
- * @param beanPath
- * @return
- * @throws JavaModelException
- */
- public Properties createAntBuildProperties(IResource resource, IJavaProject javaProject, IPackageFragmentRoot packageFragmentRoot,
- String beanPath) {
- Properties properties = new Properties();
- StructureEdit core = null;
- EJBArtifactEdit ejbEdit = null;
- try {
- core = StructureEdit.getStructureEditForRead(javaProject.getProject());
- List ejbs = new ArrayList();
- getAllAnnotatedEjbs(packageFragmentRoot, ejbs);
-
- String projectDir = resource.getProject().getLocation().toString();
- String moduleDir = packageFragmentRoot.getResource().getLocation().toString();
-
- properties.put("ejb", resource.getProject().getName()); //$NON-NLS-1$
- properties.put("ejb.project.dir", projectDir); //$NON-NLS-1$
- properties.put("ejb.project.classpath", asClassPath(javaProject)); //$NON-NLS-1$
- properties.put("ejb.module.src", moduleDir); //$NON-NLS-1$
- properties.put("ejb.module.gen", packageFragmentRoot.getResource().getLocation().toString()); //$NON-NLS-1$
- properties.put("ejb.bin.dir", this.getJavaProjectOutputContainer(javaProject).toString()); //$NON-NLS-1$
-
- properties.put("xdoclet.home", getPreferenceStore().getProperty(XDocletPreferenceStore.XDOCLETHOME)); //$NON-NLS-1$
- URL url = Platform.getBundle("org.apache.ant").getEntry("/"); //$NON-NLS-1$ //$NON-NLS-2$
- url = FileLocator.toFileURL(url);
- File file = new File(url.getFile());
- properties.put("ant.home", file.getAbsolutePath()); //$NON-NLS-1$
- WorkbenchComponent ejbModule = core.getComponent();
- // For deleted resources we cannot find the module
- // So assume the first module in the project (currently)
- // there is only one anyway...
- IProject proj = javaProject.getProject();
-
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(proj);
-
- int ejbLevelI = J2EEVersionConstants.EJB_2_0_ID;
- try {
- ejbLevelI = ejbEdit.getEJBJarXmiResource().getModuleVersionID();
- } catch (RuntimeException e) {
- }
- String ejbLevel = J2EEProjectUtilities.getJ2EEProjectVersion(proj);
- if ((ejbLevel == null || ejbLevel.length() == 0) && ejbLevelI == J2EEVersionConstants.EJB_2_0_ID)
- ejbLevel = J2EEVersionConstants.VERSION_2_0_TEXT;
- else if ((ejbLevel == null || ejbLevel.length() == 0) && ejbLevelI == J2EEVersionConstants.EJB_2_1_ID)
- ejbLevel = J2EEVersionConstants.VERSION_2_1_TEXT;
-
- setEjbClientJarProperties(properties, core, ejbModule);
- IPath metaInfPath = getMetaInfFolder(ejbModule);
- String metaInf = moduleDir + "/META-INF";
- if (metaInfPath != null)
- metaInf = projectDir + "/" + metaInfPath.toString();
-
- properties.put("ejb.spec.version", ejbLevel); //$NON-NLS-1$
- properties.put("ejb.metainf.dir", metaInf); //$NON-NLS-1$
- properties.put("xdoclet.merge.dir", metaInf);
-
- properties.put("java.class.path", ""); //$NON-NLS-1$ //$NON-NLS-2$
- properties.put("project.class.path", ""); //$NON-NLS-1$ //$NON-NLS-2$
- properties.put("project.path", ""); //$NON-NLS-1$ //$NON-NLS-2$
-
- properties.put("ejb.dd.displayname", ejbModule.getName()); //$NON-NLS-1$
- properties.put("ejb.dd.description", ejbModule.getName() + " generated by eclipse wtp xdoclet extension."); //$NON-NLS-1$
-
- } catch (Exception e) {
- Logger.logException(e);
- } finally {
- if (core != null)
- core.dispose();
- if (ejbEdit != null)
- ejbEdit.dispose();
- }
- return properties;
- }
-
- private void setEjbClientJarProperties(Properties properties, StructureEdit core, WorkbenchComponent ejbModule)
- throws UnresolveableURIException {
- clientProject = null;
- Iterator refComps = ejbModule.getReferencedComponents().iterator();
- if (refComps.hasNext()) {
- ReferencedComponent refedComp = (ReferencedComponent) refComps.next();
- WorkbenchComponent clientEjbJarComp = core.findComponentByURI(refedComp.getHandle());
- IProject project = StructureEdit.getContainingProject(clientEjbJarComp);
- if (J2EEProjectUtilities.isUtilityProject(project)) {
- properties.put("ejb.dd.clientjar", clientEjbJarComp.getName() + ".jar"); //$NON-NLS-1$
- setClientJarSourcepath(properties, ejbModule, clientEjbJarComp);
- }
-
- }
- }
-
- private void setClientJarSourcepath(Properties properties, WorkbenchComponent ejbModule, WorkbenchComponent ejbClientJarComp) {
- // TODO: THIS API DOES NOT WORK YET
- // IProject clientProj = StructureEdit.getContainingProject(component);
- // ComponentResource[] sourceContainers =
- // core.getSourceContainers(component);
-
- Iterator clientHarResources = ejbClientJarComp.getResources().iterator();
- clientProject = StructureEdit.getContainingProject(ejbClientJarComp);
- List sourcePaths = JemProjectUtilities.getSourceContainers(clientProject);
- while (clientHarResources.hasNext()) {
- ComponentResource res = (ComponentResource) clientHarResources.next();
- IPath sPath = res.getSourcePath();
- Iterator projSPaths = sourcePaths.iterator();
- while (projSPaths.hasNext()) {
- IFolder pSPath = (IFolder) projSPaths.next();
- if (sPath.makeRelative().equals(pSPath.getProjectRelativePath())) {
- properties.put("ejb.client.module.src", pSPath.getLocation().toString()); //$NON-NLS-1$
- return;
- }
- }
- }
- }
-
- /**
- * XDoclet ejb task requires the names of the files in the fileset to be
- * relative to the source folder (i.e. root of the classpath) Se wee need to
- * find porvide them relative to the package fragment root
- *
- * @param changedBean
- * @return
- */
- protected String constructAnnotatedClassList(IPackageFragmentRoot root, IResource changedBean) {
-
- List ejbs = new ArrayList();
- getAllAnnotatedEjbs(root, ejbs);
- String beans = ""; //$NON-NLS-1$
- try {
- Iterator iterator = ejbs.iterator();
- while (iterator.hasNext()) {
- ICompilationUnit cu = (ICompilationUnit) iterator.next();
- IResource bean;
- bean = cu.getCorrespondingResource();
- IPath path = bean.getProjectRelativePath();
- path = makeRelativeTo(path, root);
- beans += "\t<include name=\"" + path.toString() + "\" />\n"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- } catch (JavaModelException e) {
- Logger.logException(e);
- }
- return beans;
- }
-
- /**
- * @param root
- * @return
- */
- private void getAllAnnotatedEjbs(IParent root, List list) {
- IJavaElement[] elements = null;
- try {
- if (root == null)
- return;
- elements = root.getChildren();
- if (elements == null)
- return;
- for (int i = 0; i < elements.length; i++) {
- IJavaElement element = elements[i];
-
- if (XDoxletAnnotationUtil.isXDocletAnnotatedEjbClass(element)) {
- list.add(element);
- } else if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
- getAllAnnotatedEjbs((IPackageFragment) element, list);
- }
- }
- } catch (JavaModelException e) {
- Logger.logException(e);
- }
- }
-
- protected void refreshProjects(IProject project, IProgressMonitor monitor) throws CoreException {
- project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-
- if (clientProject != null)
- clientProject.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-
- }
-
- protected IPath getMetaInfFolder(WorkbenchComponent ejbModule) {
- ComponentResource[] METAINF = ejbModule.findResourcesByRuntimePath(new Path("/META-INF"));
- for (int i = 0; i < METAINF.length; i++) {
- ComponentResource resource = METAINF[i];
- if (resource.getRuntimePath().toString().equals("/META-INF"))
- return resource.getSourcePath();
- }
- if (METAINF.length > 0)
- return METAINF[0].getSourcePath();
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletExtensionUtil.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletExtensionUtil.java
deleted file mode 100644
index f4de353..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletExtensionUtil.java
+++ /dev/null
@@ -1,192 +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.annotations.internal.xdoclet;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-
-public class XDocletExtensionUtil {
-
- public static XDocletRuntime[] getRuntimes() {
- IExtension[] extensions = Platform
- .getExtensionRegistry()
- .getExtensionPoint(
- "org.eclipse.jst.j2ee.ejb.annotations.xdoclet.xdocletRuntime")
- .getExtensions();
-
- XDocletRuntime[] runtimes = new XDocletRuntime[extensions.length];
- for (int i = 0; i < extensions.length; i++) {
- runtimes[i] = new XDocletRuntime();
-
- IExtension extension = extensions[i];
- IConfigurationElement configurationElement = getRuntimeElement(extension);
- if (configurationElement != null) {
- runtimes[i].setVersion(configurationElement
- .getAttribute("xdoclet"));
- IConfigurationElement[] libs = getRuntimeLibraries(extension);
- String[] libsArray = new String[libs.length];
- for (int j = 0; j < libs.length; j++) {
- IConfigurationElement aLibrary = libs[j];
- libsArray[j] = aLibrary.getAttribute("location");
- }
- runtimes[i].setLibs(libsArray);
- }
- }
- return runtimes;
- }
-
- public static XDocletRuntime getRuntime(String versionID) {
- IExtension[] extensions = Platform
- .getExtensionRegistry()
- .getExtensionPoint(
- "org.eclipse.jst.j2ee.ejb.annotations.xdoclet.xdocletRuntime")
- .getExtensions();
-
- for (int i = 0; i < extensions.length; i++) {
- XDocletRuntime runtime = new XDocletRuntime();
-
- IExtension extension = extensions[i];
- IConfigurationElement configurationElement = getRuntimeElement(extension);
- if (configurationElement != null) {
- if (versionID.equals(configurationElement
- .getAttribute("xdoclet"))) {
- runtime.setVersion(configurationElement
- .getAttribute("xdoclet"));
- IConfigurationElement[] libs = getRuntimeLibraries(extension);
- String[] libsArray = new String[libs.length];
- for (int j = 0; j < libs.length; j++) {
- IConfigurationElement aLibrary = libs[j];
- libsArray[j] = aLibrary.getAttribute("location");
- }
- runtime.setLibs(libsArray);
- return runtime;
- }
- }
- }
- return null;
- }
-
- public static IConfigurationElement getRuntimeElement(IExtension extension) {
- IConfigurationElement[] elements = extension.getConfigurationElements();
- if (elements != null) {
- for (int j = 0; j < elements.length; j++) {
- IConfigurationElement element = elements[j];
- if ("RuntimeVersion".equals(element.getName()))
- return element;
- }
- }
- return null;
- }
-
- public static IConfigurationElement[] getRuntimeLibraries(
- IExtension extension) {
- ArrayList arrayList = new ArrayList();
- IConfigurationElement[] elements = extension.getConfigurationElements();
- if (elements != null) {
- for (int j = 0; j < elements.length; j++) {
- IConfigurationElement element = elements[j];
- if ("RuntimeLib".equals(element.getName()))
- arrayList.add(element);
- }
- }
- return (IConfigurationElement[]) arrayList
- .toArray(new IConfigurationElement[arrayList.size()]);
- }
-
- public static String getRuntimeTypeAnnotations(IEnterpriseBean beanModel) {
-
- IProject project = (IProject) beanModel.getDataModel().getProperty(
- IEnterpriseBeanClassDataModelProperties.PROJECT);
-
- if (!J2EEProjectUtilities.isEJBProject(project))
- return "";
-
- IExtension[] extensions = Platform
- .getExtensionRegistry()
- .getExtensionPoint(
- "org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider")
- .getExtensions();
- StringBuffer annotations = new StringBuffer(512);
- for (int i = 0; extensions != null && i < extensions.length; i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = extension
- .getConfigurationElements();
- if (elements == null)
- continue;
- try {
- XDocletPreferenceStore preferenceStore = new XDocletPreferenceStore(project);
- if (! preferenceStore.getBooleanProperty(elements[0].getAttribute("id") + ".defaultSelection"))
- continue;
- for (int j = 0; j < elements.length; j++) {
- IConfigurationElement element = elements[j];
- if ("AnnotationProvider".equals(element.getName())) {
-
- String pluginDescriptor = element
- .getDeclaringExtension().getContributor()
- .getName();
-
- org.osgi.framework.Bundle bundle = Platform
- .getBundle(pluginDescriptor);
-
-
- if (isRuntimeAnnotationApplicable(beanModel, element)) {
- Class c = bundle.loadClass(element
- .getAttribute("class"));
-
- if (c != null) {
- IXDocletRuntimeAnnotation annotationProvider = (IXDocletRuntimeAnnotation) c
- .newInstance();
- annotationProvider.setPreferenceStore(preferenceStore);
- annotations
- .append(annotationProvider
- .getTypeAnnotations(project,
- beanModel));
- annotations.append("\n");
-
- }
- }
- }
- }
-
- } catch (Exception e) {
- Logger.logException(e);
- }
- }
- return annotations.toString();
- }
-
- private static boolean isRuntimeAnnotationApplicable(IEnterpriseBean beanModel, IConfigurationElement element) {
- boolean include = Boolean.valueOf(
- element.getAttribute("include")).booleanValue();
- if(!include)
- return false;
- String type = element.getAttribute("type");
- boolean generate = false;
- if (IXDocletRuntimeAnnotation.entity.equals(type)
- && beanModel.getEnterpriseBean().isEntity())
- generate = true;
- if (IXDocletRuntimeAnnotation.session.equals(type)
- && beanModel.getEnterpriseBean().isSession())
- generate = true;
- if (IXDocletRuntimeAnnotation.mdb.equals(type)
- && beanModel.getEnterpriseBean()
- .isMessageDriven())
- generate = true;
- return generate;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletPreferenceStore.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletPreferenceStore.java
deleted file mode 100644
index be4871e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletPreferenceStore.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004 Eteration Bilisim A.S.
- * Naci Dai and others.
- *
- * Parts developed under contract ref:FT/R&D/MAPS/AMS/2004-09-09/AL are
- * Copyright France Telecom, 2004.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.osgi.service.prefs.BackingStoreException;
-
-public final class XDocletPreferenceStore {
-
- private static IPreferencesService preferencesService = null;
-
- private IProject project = null;
-
- private ProjectScope projectScope;
-
- private InstanceScope instanceScope;
-
- private boolean useGlobal;
-
- private IScopeContext[] lookupOrder;
-
- private IScopeContext[] projectLookupOrder;
-
- private IScopeContext[] instanceLookupOrder;
-
- private IEclipsePreferences instanceNode;
-
- private IEclipsePreferences projectNode;
-
- public static final String XDOCLETBUILDERACTIVE = "XDOCLETBUILDERACTIVE";
-
- public static final String XDOCLETUSEGLOBAL = "XDOCLETUSEGLOBAL";
-
- public static final String XDOCLETFORCE = "XDOCLETFORCE";
-
- public static final String XDOCLETHOME = "XDOCLETHOME";
-
- public static final String XDOCLETVERSION = "XDOCLETVERSION";
-
- private HashMap temporaryStore;
-
- public XDocletPreferenceStore(IProject project) {
- this.project = project;
- this.temporaryStore = new HashMap();
- init();
-
- }
-
- private void init() {
- if (instanceScope == null)
- instanceScope = new InstanceScope();
- instanceNode = instanceScope.getNode(getPreferencePrefix());
-
- if (project != null) {
- if (projectScope == null)
- projectScope = new ProjectScope(project);
- projectNode = projectScope.getNode(getPreferencePrefix());
- useGlobal = projectNode.getBoolean(XDOCLETUSEGLOBAL, false);
- }
-
- instanceLookupOrder = new IScopeContext[] { instanceScope, new DefaultScope() };
- if (project != null)
- projectLookupOrder = new IScopeContext[] { projectScope, instanceScope, new DefaultScope() };
- if (useGlobal)
- lookupOrder = instanceLookupOrder;
- else
- lookupOrder = projectLookupOrder;
-
- }
-
- protected static String getPreferencePrefix() {
- return XDocletAnnotationPlugin.getDefault().getBundle().getSymbolicName();
- }
-
- private IPreferencesService getPreferencesService() {
-
- if (preferencesService == null) {
- preferencesService = Platform.getPreferencesService();
-
- }
- return preferencesService;
- }
-
- public void setProperty(String item, boolean value) {
-
- temporaryStore.put(item, Boolean.valueOf(value));
- // IEclipsePreferences node = getPreferenceNode();
- // node.putBoolean(item, value);
-
- }
-
- public void setProperty(String item, String value) {
- temporaryStore.put(item, value);
- // IEclipsePreferences node = getPreferenceNode();
- // node.put(item, value);
- }
-
- public String getProperty(String item) {
- init();
- if (temporaryStore != null && temporaryStore.containsKey(item))
- return (String) temporaryStore.get(item);
- return this.getPreferencesService().getString(getPreferencePrefix(), item, "", lookupOrder);
- }
-
- public String getPropertyNoGlobal(String item) {
- init();
- if (project != null)
- lookupOrder = projectLookupOrder;
- if (temporaryStore != null && temporaryStore.containsKey(item))
- return (String) temporaryStore.get(item);
- return this.getPreferencesService().getString(getPreferencePrefix(), item, "", lookupOrder);
- }
-
- public boolean getBooleanProperty(String item) {
- init();
- if (temporaryStore != null && temporaryStore.containsKey(item))
- return ((Boolean) temporaryStore.get(item)).booleanValue();
- return this.getPreferencesService().getBoolean(getPreferencePrefix(), item, false, lookupOrder);
- }
-
- public boolean getBooleanPropertyNoGlobal(String item) {
- init();
- if (project != null)
- lookupOrder = projectLookupOrder;
- if (temporaryStore != null && temporaryStore.containsKey(item))
- return ((Boolean) temporaryStore.get(item)).booleanValue();
- return this.getPreferencesService().getBoolean(getPreferencePrefix(), item, false, lookupOrder);
- }
-
- private IEclipsePreferences getPreferenceNode() {
- init();
- IEclipsePreferences node = projectNode;
- if (node == null)
- node = instanceNode;
- return node;
- }
-
- public void save() {
- try {
- IEclipsePreferences node = getPreferenceNode();
- Iterator tempProps = temporaryStore.keySet().iterator();
- while (tempProps.hasNext()) {
- String key = (String) tempProps.next();
- Object value = temporaryStore.get(key);
- if (value instanceof Boolean) {
- Boolean bValue = (Boolean) value;
- node.putBoolean(key, bValue.booleanValue());
- } else if (value instanceof String) {
- node.put(key, (String) value);
- }
- }
- temporaryStore.clear();
-
- if (projectNode != null)
- projectNode.flush();
- if (instanceNode != null)
- instanceNode.flush();
- } catch (BackingStoreException e) {
- Logger.logException(e);
- }
- }
-
- public void clear() {
- try {
- temporaryStore.clear();
- if (projectNode != null)
- projectNode.clear();
- if (instanceNode != null)
- instanceNode.clear();
- } catch (BackingStoreException e) {
- Logger.logException(e);
- }
- }
-
- protected static void initializeDefaultPreferences(IPreferenceStore store) {
-
- store.setDefault(XDOCLETFORCE, true);
- store.setDefault(XDOCLETVERSION, "1.2.1");
- store.setDefault(XDOCLETHOME, "");
- store.setDefault(XDOCLETUSEGLOBAL, true);
- store.setDefault(XDOCLETBUILDERACTIVE, true);
-
- initDoclet(store, "org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider");
- initDoclet(store, "org.eclipse.jst.j2ee.ejb.annotations.xdoclet.webdocletTaskProvider");
- }
-
- private static void initDoclet(IPreferenceStore store, String extensionID) {
- IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint(extensionID).getExtensions();
- for (int i = 0; extensions != null && i < extensions.length; i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = extension.getConfigurationElements();
- if (elements == null)
- continue;
-
- String id = elements[0].getAttribute("id");
- boolean selected = Boolean.valueOf(elements[0].getAttribute("defaultSelection")).booleanValue();
- store.setDefault(id + ".defaultSelection", selected);
- for (int j = 1; j < elements.length; j++) {
- IConfigurationElement param = elements[j];
- if ("TaskProperty".equals(param.getName())) {
- String paramId = param.getAttribute("id");
- String paramValue = param.getAttribute("default");
- boolean include = Boolean.valueOf(param.getAttribute("include")).booleanValue();
- store.setDefault(paramId, paramValue);
- store.setDefault(paramId + ".include", include);
- }
- }
- }
- }
-
- public static XDocletPreferenceStore forProject(IProject currentProject) {
- return new XDocletPreferenceStore(currentProject);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletRuntime.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletRuntime.java
deleted file mode 100644
index ded4e06..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletRuntime.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004,2005 Eteration Bilisim A.S.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.Messages;
-
-public class XDocletRuntime {
-
-
- public final static String LIBPATH = "lib";
-
- // 1.2.2
- private String version = "1.2.2";
-
- // location of the axis installation
- private String home = "";
-
- private String libs[];
- /**
- * @return Returns the home.
- */
- public String getHome() {
- return home;
- }
-
- /**
- * @param home
- * The home to set.
- */
- public void setHome(String home) {
- this.home = home;
- }
-
- /**
- * @return Returns the version.
- */
- public String getVersion() {
- return version;
- }
-
- /**
- * @param version
- * The version to set.
- */
- public void setVersion(String version) {
- this.version = version;
- }
-
- /**
- * @return Returns the libs.
- */
- public String[] getLibs() {
-
- return libs;
- }
-
- public void setLibs(String[] libs) {
-
- this.libs = libs;
- }
-
-
- /**
- * @param runtime
- * @param id2
- */
- public IClasspathEntry[] resolveClasspathContainer() {
- List list = new ArrayList();
- addLibraryEntries(list, new File(home + File.separator + LIBPATH),
- false);
- return resolveList(list);
- }
-
- protected static void addJarFiles(File dir, List list,
- boolean includeSubdirectories) {
- int depth = 0;
- if (includeSubdirectories)
- depth = 2;
- addJarFiles(dir, list, depth);
- }
-
- private static void addJarFiles(File dir, List list, int depth) {
- File[] files = dir.listFiles();
- if (files != null) {
- int size = files.length;
- for (int i = 0; i < size; i++) {
- if (files[i].isDirectory() && depth > 0) {
- addJarFiles(files[i], list, depth - 1);
- } else if (files[i].getAbsolutePath().endsWith(".jar")
- || files[i].getAbsolutePath().endsWith(".zip")) {
- IPath path = new Path(files[i].getAbsolutePath());
- list.add(JavaCore.newLibraryEntry(path, null, null));
- }
- }
- }
- }
-
- protected static void addLibraryEntries(List list, File dir,
- boolean includeSubdirectories) {
- addJarFiles(dir, list, includeSubdirectories);
- }
-
- protected static IClasspathEntry[] resolveList(List list) {
- IClasspathEntry[] entries = new IClasspathEntry[list.size()];
- list.toArray(entries);
- return entries;
- }
-
- /**
- * @return
- */
- public URL getHomeURL() throws MalformedURLException {
- return (new File(getHome())).toURL();
- }
-
- public IStatus[] validate() {
- ArrayList errors = new ArrayList();
- String[] vLibs = this.getLibs();
- if (vLibs == null)
- errors.add(new Status(IStatus.ERROR,
- XDocletAnnotationPlugin.PLUGINID, 0,
- Messages.error_message_no_lib+ version, null));
- else {
- for (int i = 0; i < vLibs.length; i++) {
- String jar = vLibs[i];
- File libFile = new File(getHome() + File.separator + LIBPATH
- + File.separator + jar);
-
- // This is fo people who change the location of the files
- // from the original distribution. It is unncessary but
- // makes people happy!
- File libFile2 = new File(getHome() + File.separator + jar);
-
- if (!libFile.exists() && !libFile2.exists())
- errors.add(new Status(IStatus.ERROR,
- XDocletAnnotationPlugin.PLUGINID, 0,
- Messages.error_message_no_lib + jar +". "+ Messages.error_xdoclet_home_message+version, null));
- }
- }
- return (IStatus[]) errors.toArray(new IStatus[errors.size()]);
- }
-
- public boolean isValid() {
- return validate().length == 0;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletTaskProvider.java
deleted file mode 100644
index 38833ad..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletTaskProvider.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.annotations.internal.xdoclet;
-
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IStatus;
-
-public interface XDocletTaskProvider {
-
- public abstract String getNamespace();
-
- public abstract String getTask();
-
- public abstract IStatus validate();
-
- public abstract IExtension getExtension();
-
- public abstract void setExtension(IExtension extension);
-
- public abstract Properties getProperties();
-
- public abstract void setProperties(Properties properties);
-
- public abstract void setPreferenceStore(XDocletPreferenceStore preferenceStore);
-
- public abstract XDocletPreferenceStore getPreferenceStore();
-
- public abstract IProject getClientProject();
-
- public abstract void setClientProject(IProject clientProject);
-
- public abstract IProject getProject();
-
- public abstract void setProject(IProject project);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletWebAntProjectBuilder.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletWebAntProjectBuilder.java
deleted file mode 100644
index ad0bebc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletWebAntProjectBuilder.java
+++ /dev/null
@@ -1,211 +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.annotations.internal.xdoclet;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IParent;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-
-public class XDocletWebAntProjectBuilder extends XDocletAntProjectBuilder {
-
- String contextRoot = ""; //$NON-NLS-1$
-
- public XDocletWebAntProjectBuilder() {
- super();
- templateUrl = Platform.getBundle(XDocletAnnotationPlugin.PLUGINID).getEntry("/templates/builder/xdocletweb.xml"); //$NON-NLS-1$
- }
-
- protected String getTaskName() {
- return "webdoclet"; //$NON-NLS-1$
- }
-
- protected HashMap createTemplates(String beanPath) {
- HashMap templates = new HashMap();
- templates.put("@servlets@", beanPath); //$NON-NLS-1$
-
- templates.put("@webDoclet@", createDocletTasks()); //$NON-NLS-1$
- return templates;
- }
-
- private String createDocletTasks() {
- IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint(
- "org.eclipse.jst.j2ee.ejb.annotations.xdoclet.webdocletTaskProvider").getExtensions();
- StringBuffer tasks = new StringBuffer(512);
- for (int i = 0; extensions != null && i < extensions.length; i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = extension.getConfigurationElements();
- if (elements == null)
- continue;
- try {
- String pluginDescriptor = elements[0].getDeclaringExtension().getContributor().getName();
-
- org.osgi.framework.Bundle bundle = Platform.getBundle(pluginDescriptor);
- Class c = bundle.loadClass(elements[0].getAttribute("class"));
- if (c != null) {
- XDocletTaskProvider docletTaskProvider = (XDocletTaskProvider) c.newInstance();
-
- docletTaskProvider.setClientProject(null);
- docletTaskProvider.setPreferenceStore(this.preferenceStore);
- docletTaskProvider.setExtension(extension);
- docletTaskProvider.setProperties(this.getProperties());
- docletTaskProvider.setProject(this.getProject());
- if (preferenceStore.getBooleanProperty(elements[0].getAttribute("id") + ".defaultSelection")) {
- tasks.append("\n");
- tasks.append(docletTaskProvider.getTask());
- tasks.append("\n");
- }
- }
- } catch (Exception e) {
- Logger.logException(e);
- }
- }
- return tasks.toString();
- }
-
- protected Properties createAntBuildProperties(IResource resource, IJavaProject javaProject,
- IPackageFragmentRoot packageFragmentRoot, String beanPath) {
- Properties properties = new Properties();
- StructureEdit moduleCore = null;
- WebArtifactEdit webEdit = null;
- try {
- moduleCore = StructureEdit.getStructureEditForRead(javaProject.getProject());
-
- WorkbenchComponent wbModule = moduleCore.getComponent();
- IProject proj = javaProject.getProject();
- webEdit = WebArtifactEdit.getWebArtifactEditForRead(proj);
-
- if (webEdit != null) {
- if ((contextRoot = webEdit.getServerContextRoot()) == null)
- contextRoot = "";//$NON-NLS-1$
- }
- String projectDir = resource.getProject().getLocation().toString();
- IPath webInf = getWebInfFolder(wbModule);
- properties.put("web.module.webinf", projectDir + "/" + webInf.toString()); //$NON-NLS-1$
- properties.put("web", contextRoot); //$NON-NLS-1$
- properties.put("web.project.dir", projectDir); //$NON-NLS-1$
- properties.put("web.project.classpath", asClassPath(javaProject)); //$NON-NLS-1$
- properties.put("web.module.src", packageFragmentRoot.getResource().getLocation().toString()); //$NON-NLS-1$
- properties.put("web.module.gen", packageFragmentRoot.getResource().getLocation().toString()); //$NON-NLS-1$
- properties.put("web.bin.dir", this.getJavaProjectOutputContainer(javaProject).toString()); //$NON-NLS-1$
- properties.put("xdoclet.home", getPreferenceStore().getProperty(XDocletPreferenceStore.XDOCLETHOME)); //$NON-NLS-1$
- properties.put("xdoclet.merge.dir", projectDir + "/" + webInf.toString());
- // getPreferenceStore().getProperty(projectDir
- // +"/"+XDocletPreferenceStore.XDOCLEMERGEDIR)); //$NON-NLS-1$
- URL url = Platform.getBundle("org.apache.ant").getEntry("/"); //$NON-NLS-1$ //$NON-NLS-2$
- url = FileLocator.toFileURL(url);
- File file = new File(url.getFile());
- properties.put("ant.home", file.getAbsolutePath()); //$NON-NLS-1$
-
- String servletLevel = J2EEProjectUtilities.getJ2EEProjectVersion(proj);
-
- properties.put("servlet.spec.version", servletLevel); //$NON-NLS-1$
- properties.put("java.class.path", ""); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (Exception e) {
- Logger.logException(e);
- } finally {
- if (moduleCore != null)
- moduleCore.dispose();
- if (webEdit != null)
- webEdit.dispose();
- }
- return properties;
- }
-
- protected String constructAnnotatedClassList(IPackageFragmentRoot root, IResource changedBean) {
-
- List webClasses = new ArrayList();
- getAllAnnotatedWebClasses(root, webClasses);
- String beans = ""; //$NON-NLS-1$
- try {
- Iterator iterator = webClasses.iterator();
- while (iterator.hasNext()) {
- ICompilationUnit cu = (ICompilationUnit) iterator.next();
- IResource bean;
- bean = cu.getCorrespondingResource();
- IPath path = bean.getProjectRelativePath();
- path = makeRelativeTo(path, root);
- beans += "\t<include name=\"" + path.toString() + "\" />\n"; //$NON-NLS-1$ //$NON-NLS-2$
-
- }
- } catch (JavaModelException e) {
- Logger.logException(e);
- }
- return beans;
- }
-
- /**
- * @param root
- * @return
- */
- private void getAllAnnotatedWebClasses(IParent root, List list) {
- IJavaElement[] elements = null;
- try {
- elements = root.getChildren();
- if (elements == null)
- return;
- for (int i = 0; i < elements.length; i++) {
- IJavaElement element = elements[i];
-
- if (XDoxletAnnotationUtil.isXDocletAnnotatedWebClass(element)) {
- list.add(element);
- } else if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
- getAllAnnotatedWebClasses((IPackageFragment) element, list);
- }
- }
- } catch (JavaModelException e) {
- Logger.logException(e);
- }
- }
-
- protected void refreshProjects(IProject project, IProgressMonitor monitor) throws CoreException {
- if (project != null)
- project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-
- }
-
- protected IPath getWebInfFolder(WorkbenchComponent webModule) {
- ComponentResource[] webXML = webModule.findResourcesByRuntimePath(new Path("/WEB-INF"));
- for (int i = 0; i < webXML.length; i++) {
- ComponentResource resource = webXML[i];
- if (resource.getRuntimePath().toString().equals("/WEB-INF"))
- return resource.getSourcePath();
- }
- if (webXML.length > 0)
- return webXML[0].getSourcePath();
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDoxletAnnotationUtil.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDoxletAnnotationUtil.java
deleted file mode 100644
index c897101..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDoxletAnnotationUtil.java
+++ /dev/null
@@ -1,95 +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.annotations.internal.xdoclet;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.TagElement;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-
-
-public class XDoxletAnnotationUtil {
- private static final String XDOCLET_EJB_BEAN_TAG = "@ejb.bean"; //$NON-NLS-1$
- private static final String XDOCLET_WEB_TAG = "@web"; //$NON-NLS-1$
- public static class XDocletFinder extends ASTVisitor {
- boolean isXDocletBean = false;
- boolean isXDocletWebBean = false;
-
- public XDocletFinder(boolean visitDocTags) {
- super(visitDocTags);
- }
-
- public boolean visit(TypeDeclaration type) {
- if (type.getJavadoc() == null)
- return true;
- Iterator tags = type.getJavadoc().tags().iterator();
- while (tags.hasNext()) {
- TagElement element = (TagElement) tags.next();
- if (XDOCLET_EJB_BEAN_TAG.equals(element.getTagName())) {
- isXDocletBean=true;
- return false;
- }else if (element.getTagName() != null && element.getTagName().startsWith(XDOCLET_WEB_TAG)) {
- isXDocletWebBean=true;
- return false;
- }
- }
- return true;
- }
- }
-
- public static boolean isXDocletAnnotatedResource(IResource resource) {
- ICompilationUnit compilationUnit = JavaCore.createCompilationUnitFrom((IFile) resource);
- return isXDocletAnnotated(compilationUnit);
- }
-
-
- public static boolean isXDocletAnnotatedEjbClass(IJavaElement compilationUnit) {
- if (compilationUnit != null && compilationUnit.getElementType() == IJavaElement.COMPILATION_UNIT){
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource((ICompilationUnit)compilationUnit);
- CompilationUnit ast = (CompilationUnit) parser.createAST(null);
- XDoxletAnnotationUtil.XDocletFinder docletFinder = new XDoxletAnnotationUtil.XDocletFinder(true);
- ast.accept(docletFinder);
- return docletFinder.isXDocletBean;
- }
- return false;
- }
- public static boolean isXDocletAnnotatedWebClass(IJavaElement compilationUnit) {
- if (compilationUnit != null && compilationUnit.getElementType() == IJavaElement.COMPILATION_UNIT){
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource((ICompilationUnit)compilationUnit);
- CompilationUnit ast = (CompilationUnit) parser.createAST(null);
- XDoxletAnnotationUtil.XDocletFinder docletFinder = new XDoxletAnnotationUtil.XDocletFinder(true);
- ast.accept(docletFinder);
- return docletFinder.isXDocletWebBean;
- }
- return false;
- }
- public static boolean isXDocletAnnotated(IJavaElement compilationUnit) {
- if (compilationUnit != null && compilationUnit.getElementType() == IJavaElement.COMPILATION_UNIT){
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource((ICompilationUnit)compilationUnit);
- CompilationUnit ast = (CompilationUnit) parser.createAST(null);
- XDoxletAnnotationUtil.XDocletFinder docletFinder = new XDoxletAnnotationUtil.XDocletFinder(true);
- ast.accept(docletFinder);
- return docletFinder.isXDocletWebBean || docletFinder.isXDocletBean ;
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XdocletIntrospector.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XdocletIntrospector.java
deleted file mode 100644
index b53cb74..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XdocletIntrospector.java
+++ /dev/null
@@ -1,59 +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.annotations.internal.xdoclet;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.DefaultEjbIntrospector;
-
-
-
-public class XdocletIntrospector extends DefaultEjbIntrospector {
-
-
-
-
- protected ICompilationUnit compilationUnit;
- protected EnterpriseBean docRoot;
-
- public XdocletIntrospector() {
- super();
- this.compilationUnit = null;
- this.docRoot = null;
- }
-
-
-
- public EnterpriseBean getEnterpriseBean() {
- EnterpriseBean bean = null;
- if( isSessionBean(this.getCompilationUnit())){
- bean = EjbFactory.eINSTANCE.createSession();
- }else if( isMDBBean(this.getCompilationUnit()))
- {
- bean = EjbFactory.eINSTANCE.createMessageDriven();
- }else if( isEntityBean(this.getCompilationUnit()))
- {
- bean = EjbFactory.eINSTANCE.createEntity();
- }
-
- return bean;
-
- }
-
-
- public ICompilationUnit getCompilationUnit() {
- return compilationUnit;
- }
- public void setCompilationUnit(ICompilationUnit compilationUnit) {
- this.compilationUnit = compilationUnit;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/AddBuilderAction.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/AddBuilderAction.java
deleted file mode 100644
index e53a865..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/AddBuilderAction.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.ejb.annotations.internal.xdoclet.action;
-
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-
-public class AddBuilderAction extends XDocletActionDelegate {
-
- public void run(IAction action) {
-
- if (project != null
- && (J2EEProjectUtilities.isEJBProject(project.getProject()) || J2EEProjectUtilities.isDynamicWebProject(project
- .getProject()))) {
- try {
- if (!ProjectUtilities.hasBuilder(project.getProject(), BUILDERID)) {
- ProjectUtilities.addToBuildSpecBefore(BUILDERID, JavaCore.BUILDER_ID, project.getProject());
- project.getProject().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- }
- } catch (CoreException e) {
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/RemoveBuilderAction.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/RemoveBuilderAction.java
deleted file mode 100644
index d2f6e0d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/RemoveBuilderAction.java
+++ /dev/null
@@ -1,31 +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.annotations.internal.xdoclet.action;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-
-public class RemoveBuilderAction extends XDocletActionDelegate {
-
- public void run(IAction action) {
-
- if (project != null
- && (J2EEProjectUtilities.isEJBProject(project.getProject()) || J2EEProjectUtilities.isDynamicWebProject(project
- .getProject()))) {
- try {
- ProjectUtilities.removeFromBuildSpec(BUILDERID, project.getProject());
- } catch (CoreException e) {
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/RunXDocletAction.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/RunXDocletAction.java
deleted file mode 100644
index 581d48e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/RunXDocletAction.java
+++ /dev/null
@@ -1,64 +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.annotations.internal.xdoclet.action;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.Logger;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAnnotationPlugin;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAntProjectBuilder;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-
-public class RunXDocletAction extends XDocletActionDelegate {
-
- public void run(IAction action) {
-
- if (project != null && (J2EEProjectUtilities.isEJBProject(project) || J2EEProjectUtilities.isDynamicWebProject(project))) {
-
- Job buildJob = new Job("XDoclet") {
- protected IStatus run(IProgressMonitor monitor) {
- IStatus result = Status.OK_STATUS;
- try {
- XDocletAntProjectBuilder builder = XDocletAntProjectBuilder.Factory.newInstance(project);
- IFile sourceFile = getFirstSourceFile();
-
- builder.buildUsingAnt(sourceFile, new NullProgressMonitor());
- } catch (Exception e) {
- result = new Status(IStatus.ERROR, XDocletAnnotationPlugin.PLUGINID, IStatus.ERROR, "", e); //$NON-NLS-1$
- Logger.logException(e);
- } finally {
-
- }
- return result;
- }
- };
-
- try {
- buildJob.setUser(true);
- buildJob.schedule();
- } catch (Exception e) {
- }
- }
-
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- super.selectionChanged(action, selection);
- IFile sourceFile = getFirstSourceFile();
- action.setEnabled(sourceFile != null);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/XDocletActionDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/XDocletActionDelegate.java
deleted file mode 100644
index 5555a96..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/XDocletActionDelegate.java
+++ /dev/null
@@ -1,84 +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.annotations.internal.xdoclet.action;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.ui.actions.ActionDelegate;
-
-public abstract class XDocletActionDelegate extends ActionDelegate {
-
- public static final String BUILDERID = "org.eclipse.jst.j2ee.ejb.annotations.xdoclet.xdocletbuilder";
- protected IProject project;
- protected IFile aFile = null;
-
- class SourceFinder implements IResourceVisitor {
- IFile sourceFile = null;
-
- public boolean visit(IResource resource) throws org.eclipse.core.runtime.CoreException {
- if (sourceFile != null)
- return false;
- if (resource instanceof IFile) {
- sourceFile = (IFile) resource;
- return false;
- }
- return true;
- }
-
- public IFile getSourceFile() {
- return sourceFile;
- }
-
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- super.selectionChanged(action, selection);
- if (selection == null)
- return;
-
- if (selection instanceof IStructuredSelection) {
- Object firstSelection = ((IStructuredSelection) selection).getFirstElement();
- if (firstSelection instanceof IProject)
- project = (IProject) firstSelection;
- if (firstSelection instanceof IFile) {
- aFile = (IFile) firstSelection;
- project = aFile.getProject();
- }
- }
- }
-
- public IProject getProject() {
- return project;
- }
-
- protected IFile getFirstSourceFile() {
- IFolder resource = (IFolder) J2EEProjectUtilities.getSourceFolderOrFirst(project, null);
- SourceFinder finder = new SourceFinder();
- try {
- if (resource != null)
- resource.accept(finder);
- } catch (CoreException e) {
- }
- return finder.getSourceFile();
- }
-
- public IFile getFile() {
- return aFile;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/IXDocletFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/IXDocletFacetInstallDataModelProperties.java
deleted file mode 100644
index 7221b70..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/IXDocletFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet;
-
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-
-
-
-public interface IXDocletFacetInstallDataModelProperties extends IJ2EEModuleFacetInstallDataModelProperties {
-
-
- public static final String XDOCLETHOME = XDocletPreferenceStore.XDOCLETHOME;
-
- public static final String XDOCLETVERSION = XDocletPreferenceStore.XDOCLETVERSION;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletEjbFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletEjbFacetInstallDataModelProvider.java
deleted file mode 100644
index 59915d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletEjbFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,16 +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.annotations.internal.xdoclet.facet;
-
-public class XDocletEjbFacetInstallDataModelProvider extends XDocletFacetInstallDataModelProvider {
- protected String getFacetID() {
- return "jst.ejb.xdoclet";
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetInstallDataModelProvider.java
deleted file mode 100644
index cc72fcc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.facet;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-
-public abstract class XDocletFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements
- IXDocletFacetInstallDataModelProperties {
-
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(XDOCLETHOME);
- names.add(XDOCLETVERSION);
- return names;
- }
-
- public Object getDefaultProperty(String propertyName) {
- XDocletPreferenceStore store = new XDocletPreferenceStore(null);
- if (propertyName.equals(XDOCLETHOME)) {
- return store.getProperty(XDOCLETHOME);
- } else if (propertyName.equals(XDOCLETVERSION)) {
- return store.getProperty(XDOCLETVERSION);
- } else if (propertyName.equals(FACET_ID)) {
- return getFacetID();
- }
- return super.getDefaultProperty(propertyName);
- }
-
- protected abstract String getFacetID();
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- return super.propertySet(propertyName, propertyValue);
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- return super.isPropertyEnabled(propertyName);
- }
-
- public IStatus validate(String name) {
- return super.validate(name);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetInstallDelegate.java
deleted file mode 100644
index 1b7cdd8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetInstallDelegate.java
+++ /dev/null
@@ -1,52 +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.annotations.internal.xdoclet.facet;
-
-import org.eclipse.core.resources.IProject;import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.action.XDocletActionDelegate;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public final class XDocletFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor)
- throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1);
- }
-
- try {
-
- if (project != null
- && (J2EEProjectUtilities.isEJBProject(project.getProject()) || J2EEProjectUtilities.isDynamicWebProject(project
- .getProject()))) {
- try {
- if (!ProjectUtilities.hasBuilder(project.getProject(), XDocletActionDelegate.BUILDERID)) {
- ProjectUtilities.addToBuildSpec(XDocletActionDelegate.BUILDERID, project.getProject());
- }
- } catch (CoreException e) {
- }
- }
-
- if (monitor != null) {
- monitor.worked(1);
- }
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetRuntimeChangedDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetRuntimeChangedDelegate.java
deleted file mode 100644
index 9a89adb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetRuntimeChangedDelegate.java
+++ /dev/null
@@ -1,48 +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.annotations.internal.xdoclet.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class XDocletFacetRuntimeChangedDelegate
-
-implements IDelegate
-
-{
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor)
-
- throws CoreException
-
- {
- if (monitor != null) {
- monitor.beginTask("", 1);
- }
-
- try {
-
- if (monitor != null) {
- monitor.worked(1);
- }
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetUninstallDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetUninstallDelegate.java
deleted file mode 100644
index 6a46503..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetUninstallDelegate.java
+++ /dev/null
@@ -1,56 +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.annotations.internal.xdoclet.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletBuilderValidator;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.action.XDocletActionDelegate;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public final class XDocletFacetUninstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor)
- throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1);
- }
-
- try {
-
- if (project != null
- && (J2EEProjectUtilities.isEJBProject(project.getProject()) || J2EEProjectUtilities.isDynamicWebProject(project
- .getProject()))) {
- try {
- ProjectUtilities.removeFromBuildSpec(XDocletActionDelegate.BUILDERID, project.getProject());
- XDocletBuilderValidator validator = new XDocletBuilderValidator();
- validator.clearMarkers(project);
- } catch (CoreException e) {
- }
- }
-
- if (monitor != null) {
- monitor.worked(1);
- }
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetUtils.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetUtils.java
deleted file mode 100644
index 4c5d076..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetUtils.java
+++ /dev/null
@@ -1,22 +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.annotations.internal.xdoclet.facet;
-
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class XDocletFacetUtils {
-
- public static final IProjectFacetVersion WEB_22 = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE).getVersion("2.2"); //$NON-NLS-1$
- public static final IProjectFacetVersion WEB_23 = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE).getVersion("2.3"); //$NON-NLS-1$
- public static final IProjectFacetVersion WEB_24 = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE).getVersion("2.4"); //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetVersionChangeDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetVersionChangeDelegate.java
deleted file mode 100644
index 680d162..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletFacetVersionChangeDelegate.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.ejb.annotations.internal.xdoclet.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public final class XDocletFacetVersionChangeDelegate
-
-implements IDelegate
-
-{
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor)
-
- throws CoreException
-
- {
- if (monitor != null) {
- monitor.beginTask("", 1);
- }
-
- try {
- // Find the version that's currently installed.
-
-// final IFacetedProject fproj = ProjectFacetsManager.create(project);
-//
-// // final IProjectFacetVersion oldver =
-// // fproj.getInstalledVersion(fv.getProjectFacet());
-
- if (monitor != null) {
- monitor.worked(1);
- }
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletWebFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletWebFacetInstallDataModelProvider.java
deleted file mode 100644
index ac4ae8e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/facet/XDocletWebFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,16 +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.annotations.internal.xdoclet.facet;
-
-public class XDocletWebFacetInstallDataModelProvider extends XDocletFacetInstallDataModelProvider {
- public String getFacetID() {
- return "jst.web.xdoclet";
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/provider/XDocletAnnotationProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/provider/XDocletAnnotationProvider.java
deleted file mode 100644
index b5f616d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/provider/XDocletAnnotationProvider.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004,2005 Eteration Bilisim A.S.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.provider;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-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.annotation.internal.model.IMessageDrivenBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.ISessionBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.ModelPlugin;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IAnnotationProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IEJBGenerator;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.classgen.EjbBuilder;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.EjbEmitter;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.EmitterUtilities;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.EntityEjbEmitter;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.MessageDrivenEjbEmitter;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.SessionEjbEmitter;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.Logger;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletBuildUtility;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletExtensionUtil;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletRuntime;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class XDocletAnnotationProvider implements IAnnotationProvider, IEJBGenerator {
-
- private static final String END_XDOCLET_DEFINITION = " * <!-- end-xdoclet-definition -->";
-
- public boolean isEjbAnnotationProvider() {
- return true;
- }
-
- public boolean isServletAnnotationProvider() {
- return true;
- }
-
- public boolean isWebServiceAnnotationProvider() {
- return false;
- }
-
- public boolean isValid() {
-
- XDocletPreferenceStore store = XDocletPreferenceStore.forProject(null);
- XDocletRuntime runtime = XDocletExtensionUtil.getRuntime(store.getProperty(XDocletPreferenceStore.XDOCLETVERSION));
- runtime.setHome(store.getProperty(XDocletPreferenceStore.XDOCLETHOME));
- return runtime.isValid();
- }
-
- public String getName() {
- return "XDocletAnnotionProvider"; //$NON-NLS-1$
- }
-
- public void generateSession(ISessionBean delegate, IProgressMonitor monitor) throws CoreException, InterruptedException {
-
- IDataModel dataModel = delegate.getDataModel();
-
- String comment = ""; //$NON-NLS-1$
- String stub = ""; //$NON-NLS-1$
- String method = ""; //$NON-NLS-1$
- String fields = ""; //$NON-NLS-1$
-
- IConfigurationElement preferredAnnotation = EmitterUtilities.findEmitter("XDoclet"); //$NON-NLS-1$
-
- try {
- EjbEmitter ejbEmitter = new SessionEjbEmitter(preferredAnnotation);
- ejbEmitter.setMonitor(monitor);
- comment = ejbEmitter.emitTypeComment(delegate);
- comment = applyRuntimeAnnotations(delegate, comment);
- stub = ejbEmitter.emitTypeStub(delegate);
- method = ejbEmitter.emitInterfaceMethods(delegate);
- fields = ejbEmitter.emitFields(delegate);
- ejbEmitter.deleteProject();
- } catch (CoreException e) {
- throw e;
- } catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR, ModelPlugin.PLUGINID, 0, "Session EJB Emitters Failed", e));
- }
-
- EjbBuilder ejbBuilder = new EjbBuilder();
- ejbBuilder.setConfigurationElement(preferredAnnotation);
- ejbBuilder.setMonitor(monitor);
- ejbBuilder.setPackageFragmentRoot((IPackageFragmentRoot) dataModel
- .getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT));
- ejbBuilder.setTypeName(dataModel.getStringProperty(INewJavaClassDataModelProperties.CLASS_NAME));
- ejbBuilder.setPackageName(dataModel.getStringProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE));
-
- ejbBuilder.setTypeComment(comment);
- ejbBuilder.setTypeStub(stub);
- ejbBuilder.setMethodStub(method);
- ejbBuilder.setFields(fields);
- ejbBuilder.setCreateInheritedMethods(dataModel.getBooleanProperty(INewJavaClassDataModelProperties.ABSTRACT_METHODS));
- ejbBuilder.setCreateInheritedConstructors(dataModel.getBooleanProperty(INewJavaClassDataModelProperties.CONSTRUCTOR));
-
- ejbBuilder.createType();
-
- IType bean = ejbBuilder.getCreatedType();
- IResource javaFile = bean.getCorrespondingResource();
- IProject project = (IProject) dataModel.getProperty(INewJavaClassDataModelProperties.PROJECT);
- initializeBuilder(monitor, preferredAnnotation, javaFile, project);
- XDocletBuildUtility.runNecessaryBuilders(monitor, project);
-
- }
-
- public void generateCMP(IContainerManagedEntityBean delegate, IProgressMonitor monitor) throws CoreException, InterruptedException {
-
- IDataModel dataModel = delegate.getDataModel();
-
- String comment = ""; //$NON-NLS-1$
- String stub = ""; //$NON-NLS-1$
- String method = ""; //$NON-NLS-1$
- String fields = ""; //$NON-NLS-1$
-
- IConfigurationElement preferredAnnotation = EmitterUtilities.findEmitter("XDoclet"); //$NON-NLS-1$
-
- try {
- EjbEmitter ejbEmitter = new EntityEjbEmitter(preferredAnnotation);
- ejbEmitter.setMonitor(monitor);
- comment = ejbEmitter.emitTypeComment(delegate);
- comment = applyRuntimeAnnotations(delegate, comment);
- stub = ejbEmitter.emitTypeStub(delegate);
- method = ejbEmitter.emitInterfaceMethods(delegate);
- fields = ejbEmitter.emitFields(delegate);
- ejbEmitter.deleteProject();
- } catch (CoreException e) {
- throw e;
- } catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR, ModelPlugin.PLUGINID, 0, "CMP EJB Emitters Failed", e));
- }
-
- EjbBuilder ejbBuilder = new EjbBuilder();
- ejbBuilder.setConfigurationElement(preferredAnnotation);
- ejbBuilder.setMonitor(monitor);
- ejbBuilder.setPackageFragmentRoot((IPackageFragmentRoot) dataModel
- .getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT));
- ejbBuilder.setTypeName(dataModel.getStringProperty(INewJavaClassDataModelProperties.CLASS_NAME));
- ejbBuilder.setPackageName(dataModel.getStringProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE));
-
- ejbBuilder.setTypeComment(comment);
- ejbBuilder.setTypeStub(stub);
- ejbBuilder.setMethodStub(method);
- ejbBuilder.setFields(fields);
- ejbBuilder.setCreateInheritedMethods(dataModel.getBooleanProperty(INewJavaClassDataModelProperties.ABSTRACT_METHODS));
- ejbBuilder.setCreateInheritedConstructors(dataModel.getBooleanProperty(INewJavaClassDataModelProperties.CONSTRUCTOR));
-
- ejbBuilder.createType();
-
- IType bean = ejbBuilder.getCreatedType();
- IResource javaFile = bean.getCorrespondingResource();
- IProject project = (IProject) dataModel.getProperty(INewJavaClassDataModelProperties.PROJECT);
- initializeBuilder(monitor, preferredAnnotation, javaFile, project);
- XDocletBuildUtility.runNecessaryBuilders(monitor, project);
-
- }
-
- private String applyRuntimeAnnotations(IEnterpriseBean delegate, String comment) {
- String commentRuntime = XDocletExtensionUtil.getRuntimeTypeAnnotations(delegate);
- int i = comment.indexOf(END_XDOCLET_DEFINITION);
- if (commentRuntime == null || i < 0)
- return comment;
-
- comment = comment.substring(0, i) + commentRuntime + comment.substring(i);
- return comment;
- }
-
- public void generateMessageDriven(IMessageDrivenBean delegate, IProgressMonitor monitor) throws CoreException,
- InterruptedException {
-
- IDataModel dataModel = delegate.getDataModel();
-
- String comment = "";
- String stub = "";
- String method = "";
- String fields = "";
- IConfigurationElement emitterConfiguration = EmitterUtilities.findEmitter("XDoclet");
-
- try {
- EjbEmitter ejbEmitter = new MessageDrivenEjbEmitter(emitterConfiguration);
- ejbEmitter.setMonitor(monitor);
- fields = ejbEmitter.emitFields(delegate);
- comment = ejbEmitter.emitTypeComment(delegate);
- comment = applyRuntimeAnnotations(delegate, comment);
- stub = ejbEmitter.emitTypeStub(delegate);
- method = ejbEmitter.emitInterfaceMethods(delegate);
- ejbEmitter.deleteProject();
- } catch (CoreException e) {
- throw e;
- } catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR, ModelPlugin.PLUGINID, 0, "MessageDriven EJB Emitters Failed", e));
- }
-
- EjbBuilder ejbBuilder = new EjbBuilder();
- ejbBuilder.setConfigurationElement(emitterConfiguration);
- ejbBuilder.setMonitor(monitor);
- ejbBuilder.setPackageFragmentRoot((IPackageFragmentRoot) dataModel
- .getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT));
- ejbBuilder.setTypeName(dataModel.getStringProperty(INewJavaClassDataModelProperties.CLASS_NAME));
- ejbBuilder.setPackageName(dataModel.getStringProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE));
-
- ejbBuilder.setTypeComment(comment);
- ejbBuilder.setTypeStub(stub);
- ejbBuilder.setMethodStub(method);
- ejbBuilder.setFields(fields);
- ejbBuilder.setCreateInheritedMethods(dataModel.getBooleanProperty(INewJavaClassDataModelProperties.ABSTRACT_METHODS));
- ejbBuilder.setCreateInheritedConstructors(dataModel.getBooleanProperty(INewJavaClassDataModelProperties.CONSTRUCTOR));
-
- ejbBuilder.createType();
- IType bean = ejbBuilder.getCreatedType();
- IResource javaFile = bean.getCorrespondingResource();
- IProject project = (IProject) dataModel.getProperty(INewJavaClassDataModelProperties.PROJECT);
- initializeBuilder(monitor, emitterConfiguration, javaFile, project);
- XDocletBuildUtility.runNecessaryBuilders(monitor, project);
-
- }
-
- protected void initializeBuilder(IProgressMonitor monitor, IConfigurationElement emitterConfiguration, IResource javaFile,
- IProject project) throws CoreException {
- addXDocletFacet(project, monitor);
- // To add an xdoclet builder we must use a
- // a facet now.
- // EmitterUtilities.addAnnotationBuilderToProject(emitterConfiguration,
- // project);
- }
-
- private void addXDocletFacet(IProject project, IProgressMonitor monitor) {
- if (J2EEProjectUtilities.isDynamicWebProject(project)) {
- installXDocletFacets(project, monitor, "jst.web.xdoclet");
- } else if (J2EEProjectUtilities.isEJBProject(project)) {
- installXDocletFacets(project, monitor, "jst.ejb.xdoclet");
- }
- }
-
- private void installXDocletFacets(IProject project, IProgressMonitor monitor, String docletType) {
-
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- Set facets = facetedProject.getProjectFacets();
- Set fixedFacets = facetedProject.getFixedProjectFacets();
- boolean shouldInstallFacet = true;
- for (Iterator iter = facets.iterator(); iter.hasNext();) {
- IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
- String facetID = facetVersion.getProjectFacet().getId();
- if (docletType.equals(facetID)) {
- shouldInstallFacet = false;
- }
- }
- if (!shouldInstallFacet)
- return;
-
- IDataModel dm = DataModelFactory.createDataModel(new FacetInstallDataModelProvider());
- dm.setProperty(IFacetDataModelProperties.FACET_ID, docletType);
- dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
- dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, "1.2.3"); //$NON-NLS-1$
- IDataModel fdm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- fdm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, project.getName());
-
- FacetDataModelMap map = (FacetDataModelMap) fdm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.add(dm);
-
- fdm.getDefaultOperation().execute(monitor, null);
- facetedProject.setFixedProjectFacets(fixedFacets);
- } catch (Exception e) {
- Logger.logException(e);
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/AttributeWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/AttributeWizardPage.java
deleted file mode 100644
index a0ae4e2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/AttributeWizardPage.java
+++ /dev/null
@@ -1,58 +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.annotations.internal.xdoclet.ui;
-
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-public class AttributeWizardPage extends WizardPage {
-
- IExtension extension;
- XDocletPreferenceStore preferenceStore;
- AttributesDecorator attributesDecorator;
-
- public AttributeWizardPage(String pageName, String title, ImageDescriptor titleImage) {
- super(pageName, title, titleImage);
- }
-
- public AttributeWizardPage(String pageName, IExtension extension, XDocletPreferenceStore preferenceStore) {
- super(pageName);
- this.preferenceStore = preferenceStore;
- this.extension = extension;
- }
-
- public void createControl(Composite parent) {
-
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- composite.setLayout(layout);
-
- GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
- composite.setLayoutData(data);
-
- initializeDialogUnits(composite);
-
- attributesDecorator = new AttributesDecorator(extension, preferenceStore);
- attributesDecorator.decorate(composite);
- setControl(composite);
-
- }
-
- public void doFinish() {
- attributesDecorator.save();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/AttributesDecorator.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/AttributesDecorator.java
deleted file mode 100644
index aa38306..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/AttributesDecorator.java
+++ /dev/null
@@ -1,210 +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.annotations.internal.xdoclet.ui;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class AttributesDecorator {
-
- private IExtension extension;
-
- private IConfigurationElement tag;
-
- private IConfigurationElement[] params;
-
- HashMap allProperties = new HashMap();
-
- private XDocletPreferenceStore preferenceStore;
-
- public AttributesDecorator(IExtension extension, XDocletPreferenceStore preferenceStore) {
- super();
-
- this.extension = extension;
- params = this.extension.getConfigurationElements();
- tag = params[0];
- this.preferenceStore = preferenceStore;
- }
-
- public void decorate(final Composite composite) {
-
- Group attributes = new Group(composite, SWT.NONE);
- attributes.setText(Messages.label_attributes + " "+ tag.getAttribute("name"));
- attributes.setToolTipText(tag.getAttribute("description"));
-
- GridLayout layout = new GridLayout(6, false);
- attributes.setLayout(layout);
- GridData attributesGrid = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
- attributes.setLayoutData(attributesGrid);
-
- allProperties = new HashMap();
- // The first configuration is the tag provider so skip
- for (int i = 0; i < params.length; i++) {
- final IConfigurationElement attribute = params[i];
-
- if (!"TaskProperty".equals(attribute.getName()))
- continue;
-// Group attributeGroup = new Group(attributes, SWT.NONE);
-// attributeGroup.setText(attribute.getAttribute("label"));
-// attributeGroup.setToolTipText(attribute.getAttribute("description"));
-// layout = new GridLayout(3, false);
-// attributeGroup.setLayout(layout);
-// GridData gridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
-// attributeGroup.setLayoutData(gridData);
- createAttributeControl(attributes, attribute);
- String includeId = attribute.getAttribute("id") + ".include";
- Button bool = createLabeledCheck(Messages.label_include, preferenceStore.getBooleanPropertyNoGlobal(includeId), attributes);
- bool.setData(attribute);
- allProperties.put(includeId, bool);
- bool.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
-
- String id = attribute.getAttribute("id");
- preferenceStore.setProperty(id + ".include", ((Button) e.item).getSelection());
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- });
-
- }
- Dialog.applyDialogFont(composite);
- }
-
- private void createAttributeControl(Composite parent, IConfigurationElement attribute) {
- String type = attribute.getAttribute("type");
- if ("string".equals(type)) {
- Text str = createLabeledText(attribute.getAttribute("label"), preferenceStore.getPropertyNoGlobal(attribute.getAttribute("id")), parent);
- str.setData(attribute);
- allProperties.put(attribute.getAttribute("id"), str);
- } else if ("boolean".equals(type)) {
- Button bool = createLabeledCheck(attribute.getAttribute("label"), preferenceStore.getBooleanPropertyNoGlobal(attribute.getAttribute("id")), parent);
- bool.setData(attribute);
- allProperties.put(attribute.getAttribute("id"), bool);
- } else if ("enum".equals(type)) {
- Combo combo = createLabeledCombo(parent, attribute);
- combo.setData(attribute);
- allProperties.put(attribute.getAttribute("id"), combo);
- }
-
- }
-
- private Combo createLabeledCombo(Composite defPanel, IConfigurationElement attribute) {
-
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(attribute.getAttribute("label"));
-
- Combo combo = new Combo(defPanel, SWT.READ_ONLY);
- gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 2;
- combo.setLayoutData(gridData);
- String value = preferenceStore.getPropertyNoGlobal(attribute.getAttribute("id"));
- StringTokenizer tokenizer = new StringTokenizer(attribute.getAttribute("restriction"), ",");
- int i = 0;
- int sel = 0;
- while (tokenizer.hasMoreTokens()) {
- String item = tokenizer.nextToken().trim();
- if (item.equals(value))
- sel = i;
- combo.add(item);
- ++i;
-
- }
- if (combo.getItemCount() > 0)
- combo.select(sel);
- return combo;
- }
-
- private Button createLabeledCheck(String title, boolean value, Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
-
- Button fButton = new Button(defPanel, SWT.CHECK);
-
- gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 2;
- fButton.setLayoutData(gridData);
- fButton.setSelection(value);
- fButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
-
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
-
- }
- });
-
- return fButton;
- }
-
- private Text createLabeledText(String title, String value, Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
-
- Text text = new Text(defPanel, SWT.SHADOW_IN | SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 2;
- text.setLayoutData(gridData);
- text.setText(value);
-
- return text;
- }
-
- public void save() {
- Iterator iterator = allProperties.keySet().iterator();
- while (iterator.hasNext()) {
- String key = (String) iterator.next();
- Object widget = allProperties.get(key);
- if (widget instanceof Text) {
- Text text = (Text) widget;
- String value = text.getText();
- preferenceStore.setProperty(key, value);
- } else if (widget instanceof Button) {
- Button bool = (Button) widget;
- preferenceStore.setProperty(key, bool.getSelection());
- } else if (widget instanceof Combo) {
- Combo combo = (Combo) widget;
- if (combo.getSelectionIndex() >= 0) {
- String value = combo.getItem(combo.getSelectionIndex());
- preferenceStore.setProperty(key, value);
- }
- }
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/DialogPanel.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/DialogPanel.java
deleted file mode 100644
index 7f9bbb3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/DialogPanel.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004,2005 Eteration Bilisim A.S.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-
-
-public class DialogPanel extends Composite {
-
- public Control preferences[] = null;
-
- public Button fActive[] = null;
-
- public DialogPanel(Composite parent, int style) {
- super(parent, style);
- }
-
- public Text createLabeledText(int i, boolean checked, String title,
- String tip, String value, Composite defPanel) {
- return this.createLabeledText(i, true, checked, title, tip, value,
- defPanel);
- }
-
- public Text createLabeledText(int i, boolean addActiveButton,
- boolean checked, String title, String tip, String value,
- Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
- label.setToolTipText(tip);
-
- if (addActiveButton) {
- Button fButton = new Button(defPanel, SWT.CHECK);
-
- gridData = new GridData(GridData.BEGINNING);
- gridData.horizontalSpan = 1;
- fButton.setLayoutData(gridData);
- fButton.setSelection(checked);
- fActive[i] = fButton;
- }
- Text fText = new Text(defPanel, SWT.SHADOW_IN | SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = (addActiveButton ? 2 : 3);
- fText.setLayoutData(gridData);
- fText.setText(value);
- fText.setToolTipText(tip);
- return fText;
- }
-
- public Button createLabeledCheck(int i, boolean checked, String title,
- String tip, boolean value, Composite defPanel) {
- return createLabeledCheck(i, true, checked, title, tip, value, defPanel);
- }
-
- public Button createLabeledCheck(int i, boolean addActiveButton,
- boolean checked, String title, String tip, boolean value,
- Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
- label.setToolTipText(tip);
-
- Button fButton = new Button(defPanel, SWT.CHECK);
- gridData = new GridData();
- gridData.horizontalSpan = 3;
- fButton.setLayoutData(gridData);
- fButton.setSelection(value);
- fButton.setToolTipText(tip);
- fButton.setSelection(checked);
- fActive[i] = fButton;
- return fButton;
- }
-
- public Combo createLabeledCombo(int itemI, boolean checked, String title,
- String tip, String value, String[] choices, Composite defPanel) {
-
- return createLabeledCombo(itemI, true, checked, title, tip, value,
- choices, defPanel);
- }
-
- public Combo createLabeledCombo(int itemI, boolean addActiveButton,
- boolean checked, String title, String tip, String value,
- String[] choices, Composite defPanel) {
-
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
- label.setToolTipText(tip);
-
- if (addActiveButton) {
- Button fButton = new Button(defPanel, SWT.CHECK);
- gridData = new GridData();
- gridData.horizontalSpan = 1;
- fButton.setLayoutData(gridData);
- fButton.setSelection(checked);
- fActive[itemI] = fButton;
- }
-
- Combo fCombo = new Combo(defPanel, SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = (addActiveButton ? 2 : 3);
- fCombo.setLayoutData(gridData);
- fCombo.setToolTipText(tip);
- int selected = 0;
- for (int i = 0; i < choices.length; i++) {
- String item = choices[i];
- if (value.equals(item))
- selected = i;
- fCombo.add(item);
- }
- fCombo.select(selected);
- return fCombo;
- }
-
- public Text createLabeledPath(int i, boolean checked, String title,
- String tip, String value, Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- // gridData.horizontalSpan = 1;
- label.setLayoutData(gridData);
- label.setText(title);
-
- final Text fText = new Text(defPanel, SWT.SHADOW_IN | SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 2;
- fText.setLayoutData(gridData);
- fText.setText(value);
- //ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.preferences");
- Button fButton = new Button(defPanel, SWT.PUSH);
- fButton.setText(Messages.label_browse);
- fButton.setLayoutData(new GridData());
- fButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- DirectoryDialog dlg = new DirectoryDialog(DialogPanel.this
- .getShell());
- dlg.setFilterPath(fText.getText());
- String res = dlg.open();
- if (res != null) {
- fText.setText(res);
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
-
- });
-
- return fText;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/Messages.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/Messages.java
deleted file mode 100644
index d0f4a2b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/Messages.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.preferences";//$NON-NLS-1$
-
- private Messages() {
- // Do not instantiate
- }
-
- public static String label_set_xdoclet_runtime_preference;
- public static String label_enable_xdoclet_builder;
- public static String desc_enable_xdoclet_builder;
- public static String label_xdoclet_home;
- public static String desc_xdoclet_home;
- public static String label_browse;
- public static String label_xdoclet_version;
- public static String desc_xdoclet_version;
- public static String label_global_pref;
- public static String desc_global_pref;
-
- public static String label_attributes;
- public static String label_include;
- public static String label_tasks;
- public static String label_task;
- public static String label_edit;
- public static String error_message_no_lib;
- public static String error_xdoclet_home_message;
-
- public static String xdoclet_runtime_invalid;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/PropertyPreferencePage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/PropertyPreferencePage.java
deleted file mode 100644
index 93aaf15..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/PropertyPreferencePage.java
+++ /dev/null
@@ -1,46 +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.annotations.internal.xdoclet.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.IWorkbenchPropertyPage;
-
-public abstract class PropertyPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, IWorkbenchPropertyPage {
-
- protected IProject fProject = null;
- protected XDocletPreferenceStore store = null;
-
- public IAdaptable getElement() {
- return fProject;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
- */
- public void setElement(IAdaptable element) {
- fProject = (IProject) element.getAdapter(IResource.class);
-
- }
-
- public XDocletPreferenceStore getStore() {
- if (store == null) {
- store = XDocletPreferenceStore.forProject(fProject);
- }
- return store;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/TagPropertiesWizard.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/TagPropertiesWizard.java
deleted file mode 100644
index e10ff64..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/TagPropertiesWizard.java
+++ /dev/null
@@ -1,52 +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.annotations.internal.xdoclet.ui;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAnnotationPlugin;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-
-public class TagPropertiesWizard extends Wizard {
-
- IExtension extension;
- IConfigurationElement[] params;
- IConfigurationElement tag;
- AttributeWizardPage mainPage;
- private XDocletPreferenceStore preferenceStore;
-
- public TagPropertiesWizard(IExtension extension, XDocletPreferenceStore store)
- {
- this.extension = extension;
- this.preferenceStore = store;
- params = extension.getConfigurationElements();
- tag = params[0];
-
- setDefaultPageImageDescriptor(XDocletAnnotationPlugin.createImageDescriptor(XDocletAnnotationPlugin.getDefault().getBundle().getEntry("/"),"icons/xdoclet.jpg"));
- setWindowTitle(tag.getAttribute("name"));
- }
- public boolean performFinish() {
- mainPage.doFinish();
- return true;
- }
-
-
- public void addPages() {
- try {
- super.addPages();
- mainPage = new AttributeWizardPage(tag.getAttribute("name") + " attributes", extension, preferenceStore);
- mainPage.setWizard(this);
- addPage(mainPage);
- } catch (Throwable ex) {
- ex.printStackTrace();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/TaskProviderDecorator.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/TaskProviderDecorator.java
deleted file mode 100644
index 06e317f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/TaskProviderDecorator.java
+++ /dev/null
@@ -1,243 +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.annotations.internal.xdoclet.ui;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
-public class TaskProviderDecorator {
-
- private IExtension[] extensions;
-
- private XDocletPreferenceStore preferenceStore;
-
- private Table table;
- private Button edit;
- private CheckboxTableViewer tableViewer;
-
- public TaskProviderDecorator(IExtension[] extensions, XDocletPreferenceStore preferenceStore) {
- super();
- this.extensions = extensions;
- this.preferenceStore = preferenceStore;
- }
-
- public void decorate(final Composite composite) {
-
- createTableViewer(createTable(composite));
- Dialog.applyDialogFont(composite);
- }
-
- private Table createTable(final Composite parent) {
- int style = SWT.CHECK | SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.HIDE_SELECTION;
-
- GridLayout layout;
- GridData gridData;
- Group libraryPanel = new Group(parent, SWT.NONE);
- libraryPanel.setText(Messages.label_tasks);
- layout = new GridLayout(3, false);
- libraryPanel.setLayout(layout);
- gridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 3;
- libraryPanel.setLayoutData(gridData);
-
- table = new Table(libraryPanel, style);
- gridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 1;
- table.setLayoutData(gridData);
-
- table.setLinesVisible(true);
- table.setHeaderVisible(true);
-
- TableColumn column = new TableColumn(table, SWT.CENTER, 0);
- column.setText(columnNames[0]);
- column.setWidth(60);
-
- column = new TableColumn(table, SWT.LEFT, 1);
- column.setText(columnNames[1]);
- column.setWidth(200);
-
- edit = new Button(libraryPanel, SWT.PUSH);
- edit.setText(Messages.label_edit);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- edit.setLayoutData(data);
- edit.setEnabled(false);
- edit.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- IExtension extension = (IExtension) table.getSelection()[0].getData();
- if (extension != null) {
- if (showWizard(extension, parent.getShell()) != Window.CANCEL) {
- }
- }
- }
- });
-
- return table;
- }
-
- /**
- * Create the TableViewer
- */
- private TableViewer createTableViewer(Table table) {
-
- tableViewer = new CheckboxTableViewer(table);
- tableViewer.setUseHashlookup(true);
-
- tableViewer.setColumnProperties(columnNames);
- tableViewer.setLabelProvider(new FieldLabelProvider());
- tableViewer.setContentProvider(new FieldContentProvider());
- tableViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- IExtension extension = (IExtension) event.getElement();
-
- IConfigurationElement[] elements = extension.getConfigurationElements();
- if (elements == null)
- return;
-
- String id = elements[0].getAttribute("id");
- String selection = id + ".defaultSelection";
- TaskProviderDecorator.this.preferenceStore.setProperty(selection, event.getChecked());
- }
- });
- tableViewer.setInput(extensions);
- tableViewer.setCheckedElements(getCheckedTasks());
-
- tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- Object obj = getSelection(event.getSelection());
- boolean enabled = false;
- if (obj != null && obj instanceof IExtension)
- enabled = ((IExtension) obj).getConfigurationElements().length > 1;
- edit.setEnabled(enabled);
- }
- });
-
- return tableViewer;
- }
-
- protected Object getSelection(ISelection sele) {
- IStructuredSelection sel = (IStructuredSelection) sele;
- return sel.getFirstElement();
- }
-
- private Object[] getCheckedTasks() {
- ArrayList checked = new ArrayList(extensions.length);
- for (int i = 0; i < extensions.length; i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = extension.getConfigurationElements();
- if (elements != null) {
- String id = elements[0].getAttribute("id");
- String selection = id + ".defaultSelection";
- if (preferenceStore.getBooleanPropertyNoGlobal(selection))
- checked.add(extension);
- }
- }
-
- return checked.toArray();
- }
-
- protected static String[] columnNames = { Messages.label_include, Messages.label_task };
-
- protected int getColumnIndex(String columName) {
- if (columName == null)
- return -1;
- for (int i = 0; i < columnNames.length; i++) {
- String col = columnNames[i];
- if (columName.equals(col))
- return i;
-
- }
- return -1;
- }
-
- public class FieldContentProvider implements IStructuredContentProvider {
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public Object[] getElements(Object parent) {
- return (IExtension[]) parent;
- }
- }
-
- public class FieldLabelProvider extends LabelProvider implements ITableLabelProvider {
-
- public String getColumnText(Viewer v, Object obj, int index) {
- return getColumnText(obj, index);
- }
-
- public Image getColumnImage(Viewer v, Object obj, int index) {
- return getColumnImage(obj, index);
- }
-
- public Image getColumnImage(Object obj, int index) {
- return null; // unchecked
- }
-
- public String getColumnText(Object obj, int index) {
-
- IExtension extension = (IExtension) obj;
- IConfigurationElement[] elements = extension.getConfigurationElements();
- if (elements == null)
- return "";
-
- switch (index) {
- case 0: // Local
- return "";
- case 1: // Local
- return elements[0].getAttribute("name");
- }
- return "";
- }
-
- }
-
- protected int showWizard(final IExtension extension, Shell shell) {
- Wizard wizard = new TagPropertiesWizard(extension, preferenceStore);
- wizard.setForcePreviousAndNextButtons(true);
- WizardDialog dialog = new WizardDialog(shell, wizard);
- return dialog.open();
- }
-
- public void refresh() {
- tableViewer.setCheckedElements(getCheckedTasks());
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletEJBPreferencePage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletEJBPreferencePage.java
deleted file mode 100644
index 390bdd3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletEJBPreferencePage.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004 Eteration Bilisim A.S.
- * Naci Dai and others.
- *
- * Parts developed under contract ref:FT/R&D/MAPS/AMS/2004-09-09/AL are
- * Copyright France Telecom, 2004.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.Logger;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletBuildUtility;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-
-public class XDocletEJBPreferencePage extends PropertyPreferencePage implements SelectionListener {
-
- DialogPanel panel;
-
- private TaskProviderDecorator descriptionProvider;
-
- public XDocletEJBPreferencePage() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
- public void init(IWorkbench workbench) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- protected Composite createContainer(Composite parent) {
- panel = new DialogPanel(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.makeColumnsEqualWidth = false;
- panel.setLayout(layout);
- GridData gridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- panel.setLayoutData(gridData);
- return panel;
- }
-
- /*
- * @see PreferencePage#createContents(Composite)
- */
- protected Control createContents(Composite parent) {
- // noDefaultAndApplyButton();
- Composite composite = createContainer(parent);
- IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint(
- "org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider").getExtensions();
-
- descriptionProvider = new TaskProviderDecorator(extensions, getStore());
- descriptionProvider.decorate(composite);
-
- return composite;
- }
-
- public void performDefaults() {
- super.performDefaults();
- getStore().clear();
- getStore().save();
- descriptionProvider.refresh();
- try {
- XDocletBuildUtility.runNecessaryBuilders(new NullProgressMonitor(), (IProject) getElement());
- } catch (CoreException e) {
- Logger.logException(e);
- }
- }
-
- public boolean performOk() {
-
- getStore().save();
- try {
- XDocletBuildUtility.runNecessaryBuilders(new NullProgressMonitor(), (IProject) getElement());
- } catch (CoreException e) {
- Logger.logException(e);
- }
- return super.performOk();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletPreferencePage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletPreferencePage.java
deleted file mode 100644
index 0462b66..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletPreferencePage.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004,2005 Eteration Bilisim A.S.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.Logger;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletBuildUtility;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletExtensionUtil;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletRuntime;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-
-public class XDocletPreferencePage extends PropertyPreferencePage implements SelectionListener {
-
- DialogPanel panel;
-
- private Map fData; // page data
-
- private XDocletRuntime[] runtimes;
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.preference.PreferencePage#applyData(java.lang.Object)
- */
- public void applyData(Object data) {
- if (data instanceof Map) {
- fData = (Map) data;
- }
-
- }
-
- protected Map getData() {
- return fData;
- }
-
- protected boolean useProjectSettings() {
- return isProjectPreferencePage();
- }
-
- protected boolean isProjectPreferencePage() {
- return fProject != null;
- }
-
- protected IProject getProject() {
- return fProject;
- }
-
- public XDocletPreferencePage() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
- public void init(IWorkbench workbench) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- protected Composite createContainer(Composite parent) {
- panel = new DialogPanel(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.makeColumnsEqualWidth = false;
- panel.setLayout(layout);
- GridData gridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- panel.setLayoutData(gridData);
- return panel;
- }
-
- /*
- * @see PreferencePage#createContents(Composite)
- */
- protected Control createContents(Composite parent) {
- // noDefaultAndApplyButton();
-
- runtimes = XDocletExtensionUtil.getRuntimes();
-
- Composite composite = createContainer(parent);
- GridLayout gridLayout = new GridLayout();
- gridLayout.marginHeight = 0;
- gridLayout.marginWidth = 0;
- composite.setLayout(gridLayout);
-
- Composite defPanel = new Composite(composite, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- defPanel.setLayout(layout);
- GridData gridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- defPanel.setLayoutData(gridData);
-
- // ResourceBundle bundle =
- // ResourceBundle.getBundle("org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.preferences");
-
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- gridData.horizontalSpan = 4;
- label.setLayoutData(gridData);
- label.setText(Messages.label_set_xdoclet_runtime_preference);
-
- int numCont = 3;
- if (isProjectPreferencePage())
- numCont = 4;
-
- panel.preferences = new Control[numCont];
- panel.fActive = new Button[numCont];
-
- if (isProjectPreferencePage())
- panel.preferences[3] = panel.createLabeledCheck(3, getStore().getBooleanPropertyNoGlobal(
- XDocletPreferenceStore.XDOCLETUSEGLOBAL), Messages.label_global_pref, Messages.desc_global_pref, getStore()
- .getBooleanPropertyNoGlobal(XDocletPreferenceStore.XDOCLETUSEGLOBAL), defPanel);
-
- panel.preferences[0] = panel.createLabeledCheck(0, false, getStore().getBooleanPropertyNoGlobal(
- XDocletPreferenceStore.XDOCLETBUILDERACTIVE), Messages.label_enable_xdoclet_builder,
- Messages.desc_enable_xdoclet_builder, getStore().getBooleanPropertyNoGlobal(
- XDocletPreferenceStore.XDOCLETBUILDERACTIVE), defPanel);
- panel.preferences[2] = panel.createLabeledPath(2, true, Messages.label_xdoclet_home, Messages.desc_xdoclet_home,
- getStore().getPropertyNoGlobal(XDocletPreferenceStore.XDOCLETHOME), defPanel);
-
- String[] versions = new String[runtimes.length];
- for (int i = 0; i < versions.length; i++) {
- versions[i] = runtimes[i].getVersion();
- }
- panel.preferences[1] = panel.createLabeledCombo(1, false, true, Messages.label_xdoclet_version,
- Messages.desc_xdoclet_version, getStore().getPropertyNoGlobal(XDocletPreferenceStore.XDOCLETVERSION), versions,
- defPanel);
- final Text xDocletPath = (Text) panel.preferences[2];
- final Combo xDocletVersion = (Combo) panel.preferences[1];
-
- validateCurrentPreferences(xDocletPath, xDocletVersion);
-
- ModifyListener listener = new ModifyListener() {
-
- public void modifyText(ModifyEvent e) {
- validateCurrentPreferences(xDocletPath, xDocletVersion);
-
- }
- };
-
- xDocletPath.addModifyListener(listener);
- xDocletVersion.addModifyListener(listener);
- applyDialogFont(composite);
-
- return composite;
- }
-
- public boolean performOk() {
-
- String itemValue = "";
- itemValue = ((Text) panel.preferences[2]).getText();
- getStore().setProperty(XDocletPreferenceStore.XDOCLETHOME, itemValue);
-
- if (isProjectPreferencePage()) {
- getStore().setProperty(XDocletPreferenceStore.XDOCLETUSEGLOBAL, ((Button) panel.preferences[3]).getSelection());
- }
-
- Combo combo = ((Combo) panel.preferences[1]);
- int itemIndex = combo.getSelectionIndex();
- if (itemIndex != -1) {
- itemValue = combo.getItem(combo.getSelectionIndex());
- getStore().setProperty(XDocletPreferenceStore.XDOCLETVERSION, itemValue);
- } else {
- getStore().save();
- return false;
- }
-
- getStore().setProperty(XDocletPreferenceStore.XDOCLETBUILDERACTIVE, ((Button) panel.preferences[0]).getSelection());
- getStore().save();
- try {
- XDocletBuildUtility.runNecessaryBuilders(new NullProgressMonitor(), (IProject) getElement());
- } catch (CoreException e) {
- Logger.logException(e);
- }
- return super.performOk();
- }
-
- protected void performDefaults() {
-
- getStore().clear();
- ((Button) panel.preferences[0]).setSelection(getStore().getBooleanPropertyNoGlobal(
- XDocletPreferenceStore.XDOCLETBUILDERACTIVE));
- ((Combo) panel.preferences[1]).select(0);
- ((Text) panel.preferences[2]).setText(getStore().getPropertyNoGlobal(XDocletPreferenceStore.XDOCLETHOME));
- if (isProjectPreferencePage())
- ((Button) panel.preferences[3]).setSelection(getStore().getBooleanPropertyNoGlobal(
- XDocletPreferenceStore.XDOCLETUSEGLOBAL));
- getStore().save();
-
- try {
- XDocletBuildUtility.runNecessaryBuilders(new NullProgressMonitor(), (IProject) getElement());
- } catch (CoreException e) {
- Logger.logException(e);
- }
- super.performDefaults();
- }
-
- protected void validateCurrentPreferences(final Text xDocletPath, final Combo xDocletVersion) {
- int selection = xDocletVersion.getSelectionIndex();
- if (selection < 0 || selection >= runtimes.length)
- return;
- runtimes[selection].setHome(xDocletPath.getText());
- IStatus[] result = runtimes[selection].validate();
- // Clear the message
- XDocletPreferencePage.this.setErrorMessage(null);
- if (result.length > 0) {
- XDocletPreferencePage.this.setErrorMessage(result[0].getMessage());
- } else {
- setMessage("All libraries found", IMessageProvider.INFORMATION);
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletWebPreferencePage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletWebPreferencePage.java
deleted file mode 100644
index e24ad28..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletWebPreferencePage.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004 Eteration Bilisim A.S.
- * Naci Dai and others.
- *
- * Parts developed under contract ref:FT/R&D/MAPS/AMS/2004-09-09/AL are
- * Copyright France Telecom, 2004.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.Logger;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletBuildUtility;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-
-public class XDocletWebPreferencePage extends PropertyPreferencePage implements SelectionListener {
-
- DialogPanel panel;
- TaskProviderDecorator taskProviderDecorator;
-
- public XDocletWebPreferencePage() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
- public void init(IWorkbench workbench) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- protected Composite createContainer(Composite parent) {
- panel = new DialogPanel(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.makeColumnsEqualWidth = false;
- panel.setLayout(layout);
- GridData gridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- panel.setLayoutData(gridData);
- return panel;
- }
-
- /*
- * @see PreferencePage#createContents(Composite)
- */
- protected Control createContents(Composite parent) {
- // noDefaultAndApplyButton();
- Composite composite = createContainer(parent);
- IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint(
- "org.eclipse.jst.j2ee.ejb.annotations.xdoclet.webdocletTaskProvider").getExtensions();
-
- taskProviderDecorator = new TaskProviderDecorator(extensions, getStore());
- taskProviderDecorator.decorate(composite);
-
- return composite;
- }
-
- public void performDefaults() {
- super.performDefaults();
- getStore().clear();
- getStore().save();
- taskProviderDecorator.refresh();
- try {
- XDocletBuildUtility.runNecessaryBuilders(new NullProgressMonitor(), (IProject) getElement());
- } catch (CoreException e) {
- Logger.logException(e);
- }
- }
-
- public boolean performOk() {
-
- getStore().save();
- try {
- XDocletBuildUtility.runNecessaryBuilders(new NullProgressMonitor(), (IProject) getElement());
- } catch (CoreException e) {
- Logger.logException(e);
- }
- return super.performOk();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/preferences.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/preferences.properties
deleted file mode 100644
index ef70ab4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/preferences.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-label_set_xdoclet_runtime_preference=Set XDoclet Runtime Preferences
-label_enable_xdoclet_builder=Enable XDoclet Builder:
-desc_enable_xdoclet_builder=Enables xdoclet builder for automatic generation of java classes
-label_xdoclet_home=XDoclet Home:
-desc_xdoclet_home=The path of the xdoclet runtime installation
-label_browse=Browse...
-label_xdoclet_version=Version:
-desc_xdoclet_version=XDoclet version
-
-label_global_pref=Use global xdoclet preferences
-desc_global_pref=Use global xdoclet preferences instead of project scoped preferences
-
-label_attributes=Attributes
-label_include=include
-label_tasks=Tasks
-label_task=task
-label_edit=Edit...
-error_message_no_lib=Missing library:
-error_xdoclet_home_message=Select the home directory for XDoclet.
-
-xdoclet_runtime_invalid=The preferences for the xdoclet runtime does not point to a valid installation.
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/util/AntLauncherUtility.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/util/AntLauncherUtility.java
deleted file mode 100644
index 3e3e239..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/util/AntLauncherUtility.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004 Eteration Bilisim A.S.
- * Naci Dai and others.
- *
- * Parts developed under contract ref:FT/R&D/MAPS/AMS/2004-09-09/AL are
- * Copyright France Telecom, 2004.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.util;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.ant.core.AntRunner;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAnnotationPlugin;
-
-public class AntLauncherUtility {
-
- private static final int MAX_TARGET_APPEND_LENGTH = 30;
- public static final String ID_ANT_LAUNCH_CONFIGURATION_TYPE = "org.eclipse.ant.AntLaunchConfigurationType"; //$NON-NLS-1$
- public static final String ATTR_LOCATION = "org.eclipse.ui.externaltools.ATTR_LOCATION"; //$NON-NLS-1$
- // IExternalToolConstants.ATTR_LOCATION
- public static final String ATTR_ANT_TARGETS = "org.eclipse.ui.externaltools.ATTR_ANT_TARGETS"; //$NON-NLS-1$
- // IExternalToolConstants.ATTR_ANT_TARGETS
- public static final String REMOTE_ANT_PROCESS_FACTORY_ID = "org.eclipse.ant.ui.remoteAntProcessFactory"; //$NON-NLS-1$
-
- private URL url;
-
- private Properties properties;
-
- private Map templates;
-
- private boolean useLauncher = false;
-
- public AntLauncherUtility(URL templateUrl, IPath outputFolder, Properties properties, Map templates) {
- this.url = templateUrl;
- this.properties = properties;
- this.templates = templates;
- }
-
- public String getBuildFile() throws Exception {
- BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
- StringBuffer buildFile = new StringBuffer(512);
- int c;
- do {
- c = reader.read();
- if (c != -1)
- buildFile.append((char) c);
- } while (c != -1);
- String build = buildFile.toString();
- Iterator keys = templates.keySet().iterator();
- while (keys.hasNext()) {
- String key = (String) keys.next();
- build = build.replaceAll(key, (String) templates.get(key));
- }
- return build;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wtp.server.core.model.IPublisher#publish(org.eclipse.wtp.server.core.resources.IModuleResource[],
- * org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus[] launch(String target, IProgressMonitor monitor) throws Exception {
- String build = this.getBuildFile();
-
- if (build == null || build.length() < 1)
- return new IStatus[] { new Status(IStatus.ERROR, XDocletAnnotationPlugin.PLUGINID, 0, "AntBuildFileDoesNotExist", null) };
-
- IPath file = XDocletAnnotationPlugin.getDefault().getStateLocation().append("tempAnt.xml");
- try {
- createNewFile(file.toFile(), build.getBytes());
- } catch (IOException e) {
- }
-
- runAnt(file, new String[] { target }, this.properties, monitor);
-
- // file.toFile().delete();
- return new IStatus[] { new Status(IStatus.OK, XDocletAnnotationPlugin.PLUGINID, 0, "Finished", null) };
- }
-
- private void runAnt(IPath buildFile, String[] targets, Properties properties, final IProgressMonitor monitor) throws Exception {
- IPath propfile = XDocletAnnotationPlugin.getDefault().getStateLocation().append("build.properties");
- File buildProp = propfile.toFile();
- if (buildProp.exists())
- buildProp.delete();
- FileOutputStream fileOutputStream = new FileOutputStream(propfile.toFile());
- properties.store(fileOutputStream, "WTP BUILD FILE PROPERTIES- UPDATED:" + (new Date()));
- fileOutputStream.close();
-
- if (useLauncher)
- runUsingLauncher(buildFile, targets, monitor);
- else {
- AntRunner antRunner = new AntRunner();
-
- antRunner.setBuildFileLocation(buildFile.toString());
- antRunner.setExecutionTargets(targets);
- antRunner.run(monitor);
- }
-
- }
-
- /**
- * @param buildFile
- * @param targets
- * @param monitor
- * @throws CoreException
- */
- private void runUsingLauncher(IPath buildFile, String[] targets, final IProgressMonitor monitor) throws CoreException {
- ILaunchConfiguration configuration = createDefaultLaunchConfiguration(buildFile, null, targets[0]);
-// JavaLaunchDelegate javaLaunchDelegate = new JavaLaunchDelegate();
-// javaLaunchDelegate.launch(configuration, "run", configuration., monitor);
- DebugUITools.buildAndLaunch(configuration, "run", monitor);
- }
-
- public ILaunchConfiguration createDefaultLaunchConfiguration(IPath filePath, IProject project, String targetAttribute)
- throws CoreException {
- ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
- ILaunchConfigurationType type = manager.getLaunchConfigurationType(ID_ANT_LAUNCH_CONFIGURATION_TYPE);
-
- String projectName = project != null ? project.getName() : null;
- String name = getNewLaunchConfigurationName(filePath, projectName, targetAttribute);
- ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, name);
- workingCopy.setAttribute(ATTR_LOCATION, filePath.toString());
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.eclipse.ant.ui.AntClasspathProvider"); //$NON-NLS-1$
- workingCopy.setAttribute(ATTR_ANT_TARGETS, targetAttribute);
-
- // set default for common settings
- CommonTab tab = new CommonTab();
- tab.setDefaults(workingCopy);
- tab.dispose();
- workingCopy.setAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE, true);
- workingCopy.setAttribute(IDebugUIConstants.ATTR_PRIVATE, true);
-
- IVMInstall vmInstall = getDefaultVMInstall(workingCopy);
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER,
- "org.eclipse.ant.ui.AntClasspathProvider");
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, vmInstall.getName());
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, vmInstall.getVMInstallType().getId());
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
- "org.eclipse.ant.internal.ui.antsupport.InternalAntRunner");
- workingCopy.setAttribute(DebugPlugin.ATTR_PROCESS_FACTORY_ID, REMOTE_ANT_PROCESS_FACTORY_ID);
-
- workingCopy.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, false);
- return workingCopy;
- }
-
- private IVMInstall getDefaultVMInstall(ILaunchConfiguration config) {
- IVMInstall defaultVMInstall;
- try {
- defaultVMInstall = JavaRuntime.computeVMInstall(config);
- } catch (CoreException e) {
- // core exception thrown for non-Java project
- defaultVMInstall = JavaRuntime.getDefaultVMInstall();
- }
- return defaultVMInstall;
- }
-
- /**
- * Returns a unique name for a copy of the given launch configuration with
- * the given targets. The name seed is the same as the name for a new launch
- * configuration with " [targetList]" appended to the end.
- *
- * @param config
- * @param targetAttribute
- * @return
- */
- public String getNewLaunchConfigurationName(IPath filePath, String projectName, String targetAttribute) {
- StringBuffer buffer = new StringBuffer();
- if (projectName != null) {
- buffer.append(projectName);
- buffer.append(' ');
- buffer.append(filePath.lastSegment());
- } else {
- buffer.append(filePath.toOSString());
- }
-
- if (targetAttribute != null) {
- buffer.append(" ["); //$NON-NLS-1$
- if (targetAttribute.length() > MAX_TARGET_APPEND_LENGTH + 3) {
- // The target attribute can potentially be a long,
- // comma-separated list
- // of target. Make sure the generated name isn't extremely long.
- buffer.append(targetAttribute.substring(0, MAX_TARGET_APPEND_LENGTH));
- buffer.append("..."); //$NON-NLS-1$
- } else {
- buffer.append(targetAttribute);
- }
- buffer.append(']');
- }
-
- String name = DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(buffer.toString());
- return name;
- }
-
- public boolean createNewFile(File f, byte[] content) throws IOException {
- if (f != null) {
- if (f.exists()) {
- f.delete();
- }
- FileOutputStream fos = null;
- try {
- fos = new FileOutputStream(f);
- fos.write(content);
- } finally {
- if (fos != null) {
- fos.close();
- }
- }
- return true;
- }
- return false;
- }
-
- public void setUseLauncher(boolean useLauncher) {
- this.useLauncher = useLauncher;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdoclet.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdoclet.xml
deleted file mode 100644
index 6578d16..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdoclet.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright (c) 2002, 2003,2004 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 Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Eteration Bilisim A.S. - initial API and implementation
- Naci Dai
- For more information on eteration, please see
- <http://www.eteration.com/>.
- -->
-
-
-
-<project name="xdocletBuild" default="ejbdoclet" basedir=".">
-
- <!-- Init -->
- <target name="init">
- <property file="build.properties"/>
-
- <!-- property name="ejb.dd.dir" value="${ejb.project.dir}/${ejb.module.src}/META-INF"/ -->
- <property name="ejb.dd.dir" value="${ejb.metainf.dir}" />
- <property name="xdoclet.force" value="true"/>
- <property name="container.type" value="ejb-jar"/>
-
- <!-- Set up java.class.path -->
- <path id="project.class.path">
- <pathelement location="${ejb.project.dir}/${ejb.bin.dir}" />
- <pathelement path="${ejb.project.classpath}" />
-
-
- <fileset dir="${ant.home}">
- <include name="*/**/ant.jar"/>
- </fileset>
- <fileset dir="${xdoclet.home}">
- <include name="**/*.jar"/>
- </fileset>
-
- <!-- append the external classpath lastly -->
- <pathelement path="${java.class.path}" />
-
- </path>
-
-
- </target>
-
- <!-- Run EJBDoclet -->
- <target name="ejbdoclet" depends="init">
-
- <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask">
- <classpath refid="project.class.path"/>
- </taskdef>
-
-
- <ejbdoclet
- destdir="${ejb.module.gen}"
- mergedir="${xdoclet.merge.dir}"
- excludedtags="@version,@author,@todo"
- addedtags="@wtp generated"
- ejbspec="${ejb.spec.version}"
- force="${xdoclet.force}"
- verbose="true" >
-
-
-<!-- BEANS START -->
- <fileset dir="${ejb.module.src}" defaultexcludes="yes">
- @beans@
- </fileset>
-<!-- BEANS END -->
-
- @docletTasks@
-
-
- </ejbdoclet>
- <antcall target="client.jar" />
-
- </target>
-
- <target name="client.jar" if="ejb.client.module.src">
- <move todir="${ejb.client.module.src}" >
- <fileset dir="${ejb.module.src}" id="id">
- <include name="**/*.java"/>
- <exclude name="**/*Bean.java"/>
- <exclude name="**/*EJB.java"/>
- <exclude name="**/*Session.java"/>
- <exclude name="**/*Mdb.java"/>
- <exclude name="**/*CMP.java"/>
- </fileset>
- </move>
- </target>
-
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdocletweb.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdocletweb.xml
deleted file mode 100644
index a2b6e82..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdocletweb.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright (c) 2002, 2003,2004 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 Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Eteration Bilisim A.S. - initial API and implementation
- Naci Dai
- For more information on eteration, please see
- <http://www.eteration.com/>.
- -->
-
-
-
-<project name="xdocletBuild" default="webdoclet" basedir=".">
-
- <!-- Init -->
- <target name="init">
- <property file="build.properties"/>
-
- <property name="web.dd.dir" value="${web.module.webinf}"/>
- <property name="xdoclet.force" value="true"/>
- <property name="container.type" value="web-war"/>
-
- <!-- Set up java.class.path -->
- <path id="project.class.path">
- <pathelement location="${web.project.dir}/${web.bin.dir}" />
- <pathelement path="${web.project.classpath}" />
-
-
- <fileset dir="${ant.home}">
- <include name="*/**/ant.jar"/>
- </fileset>
- <fileset dir="${xdoclet.home}">
- <include name="**/*.jar"/>
- </fileset>
-
- <!-- append the external classpath lastly -->
- <pathelement path="${java.class.path}" />
-
- </path>
-
-
- </target>
-
- <!-- Run EJBDoclet -->
- <target name="webdoclet" depends="init">
-
- <taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
- <classpath refid="project.class.path"/>
- </taskdef>
-
- <webdoclet
- destdir="${web.module.webinf}"
- mergedir="${xdoclet.merge.dir}"
- excludedtags="@version,@author,@todo"
- addedtags="@wtp generated"
- force="${xdoclet.force}"
- verbose="true" >
-
- <!-- SERVLETS START -->
- <fileset dir="${web.module.src}" defaultexcludes="yes">
- @servlets@
- </fileset>
- <!-- SERVLETS END -->
-
-
-
- @webDoclet@
-
-
-
- </webdoclet>
-
- </target>
-
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/fields.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/fields.javajet
deleted file mode 100644
index 83aab64..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/fields.javajet
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.entity" class="FieldsGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotation.internal.model.*"%>
-<% IContainerManagedEntityBean cmp = (IContainerManagedEntityBean)argument;
- boolean isCMP = true;
-
- String primaryKeyType = cmp.getPrimaryKeyClass();
- List attributes = cmp.getAttributes();
- List keyAttributes = cmp.getKeyAttributes();
- int pkCount=keyAttributes.size();
- boolean isComposite = keyAttributes.size() > 1;
- boolean createCompositeKey = false;
- String primaryKeyField = ( (CMPAttributeDelegate)keyAttributes.get(0)).getName();
-
-%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/methodStubs.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/methodStubs.javajet
deleted file mode 100644
index edaf19b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/methodStubs.javajet
+++ /dev/null
@@ -1,109 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.entity" class="MethodStubsGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotation.internal.model.* org.eclipse.jst.j2ee.ejb.*"%>
-<% IContainerManagedEntityBean cmp = (IContainerManagedEntityBean)argument;
- boolean isCMP = true;
-
- String primaryKeyType = cmp.getPrimaryKeyClass();
- List attributes = cmp.getAttributes();
- List keyAttributes = cmp.getKeyAttributes();
- int pkCount=keyAttributes.size();
- boolean isComposite = keyAttributes.size() > 1;
- boolean createCompositeKey = false;
- String primaryKeyField = ( (CMPAttributeDelegate)keyAttributes.get(0)).getName();
- ContainerManagedEntity entity = (ContainerManagedEntity) cmp.getEnterpriseBean();
-
-%>
-
-
-
-/**
- *
- * <!-- begin-user-doc -->
- * The ejbCreate method.
- * <!-- end-user-doc -->
- *
- * <!-- begin-xdoclet-definition -->
- * @ejb.create-method
- * <!-- end-xdoclet-definition -->
- * @generated
- */
-public <%= primaryKeyType %> ejbCreate() throws javax.ejb.CreateException {
- // EJB 2.0 spec says return null for CMP ejbCreate methods.
- // TODO: YOU MUST INITIALIZE THE FIELDS FOR THE BEAN HERE.
- // setMyField("Something");
- // begin-user-code
- return null;
- // end-user-code
-}
-
-/**
- * <!-- begin-user-doc -->
- * The container invokes this method immediately after it calls ejbCreate.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public void ejbPostCreate() throws javax.ejb.CreateException {
- // begin-user-code
- // end-user-code
-}
-
-<%
- Iterator attrs = attributes.iterator();
- while(attrs.hasNext()){
- CMPAttributeDelegate mapping = (CMPAttributeDelegate) attrs.next();
-
-%>
-
-/**
-*
-*
-* <!-- begin-user-doc -->
-* CMP Field <%= mapping.getName() %>
-*
-* Returns the <%= mapping.getName() %>
-* @return the <%= mapping.getName() %>
-*
-* <!-- end-user-doc -->
-*
-* <!-- begin-xdoclet-definition -->
-*
-* @ejb.persistent-field
-* @ejb.persistence
-* column-name="<%= mapping.getColumnName() %>"
-* jdbc-type="<%= mapping.getJdbcType() %>"
-* sql-type="<%= mapping.getSqlTypeDecl() %>"
-* read-only="<%= mapping.isReadOnly() %>"
-* <%= (mapping.isKey() ? "@ejb.pk-field" : "" ) %>
-*
-* @ejb.interface-method
-*
-* <!-- end-xdoclet-definition -->
-* @generated
-*/
-<%
- String methodName = mapping.getName();
- methodName = Character.toUpperCase(methodName.charAt(0)) + methodName.substring(1,methodName.length());
-
-%>
-public abstract <%= mapping.getAttributeType() %> get<%= methodName %>();
-
-
-/**
-* <!-- begin-user-doc -->
-* Sets the <%= mapping.getName() %>
-*
-* @param <%=mapping.getAttributeType()%> the new <%= mapping.getName() %> value
-* <!-- end-user-doc -->
-*
-* <!-- begin-xdoclet-definition -->
-* @ejb.interface-method
-* <!-- end-xdoclet-definition -->
-* @generated
-*/
-public abstract void set<%= methodName %>(<%= mapping.getAttributeType() %> <%= mapping.getName() %>);
-
-
-
-<%
-}
-%>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/typeComment.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/typeComment.javajet
deleted file mode 100644
index fcd7a0f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/typeComment.javajet
+++ /dev/null
@@ -1,39 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.entity" class="TypeCommentGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotation.internal.model.* org.eclipse.jst.j2ee.ejb.* org.eclipse.jst.j2ee.ejb.annotations.internal.* org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.*"%>
-<% IContainerManagedEntityBean cmp = (IContainerManagedEntityBean)argument;
- boolean isCMP = true;
-
- String primaryKeyType = cmp.getPrimaryKeyClass();
- List keyAttributes = cmp.getKeyAttributes();
- int pkCount=keyAttributes.size();
- boolean isComposite = keyAttributes.size() > 1;
- boolean createCompositeKey = false;
- String primaryKeyField = ( (CMPAttributeDelegate)keyAttributes.get(0)).getName();
- ContainerManagedEntity entity = (ContainerManagedEntity) cmp.getEnterpriseBean();
-
-%>
-
-
-
-/**
- * <!-- begin-xdoclet-definition -->
- * @ejb.bean name="<%=cmp.getEjbName()%>"
- * jndi-name="<%=cmp.getEjbName()%>"
- * type="CMP"
- * primkey-field="<%= primaryKeyField %>"
- * schema="<%= cmp.getSchema() %>"
- * cmp-version="<%= cmp.getVersion() %>"
- *
- * @ejb.persistence
- * table-name="<%=cmp.getTable()%>"
- *
- * @ejb.finder
- * query="SELECT OBJECT(a) FROM <%= cmp.getSchema() %> as a"
- * signature="java.util.Collection findAll()"
- *
- * @ejb.pk class="<%= primaryKeyType %>"
- *
- *
- * <!-- end-xdoclet-definition -->
- * @generated
- **/
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/typeStub.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/typeStub.javajet
deleted file mode 100644
index ac185c9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/typeStub.javajet
+++ /dev/null
@@ -1,49 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.entity" class="TypeStubGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotation.internal.model.* org.eclipse.jst.j2ee.internal.common.operations.*"%>
-<% IContainerManagedEntityBean cmp = (IContainerManagedEntityBean)argument;
- boolean isCMP = true;
-
- String primaryKeyType = cmp.getPrimaryKeyClass();
- List keyAttributes = cmp.getKeyAttributes();
- int pkCount=keyAttributes.size();
- boolean isComposite = keyAttributes.size() > 1;
-
- String superclass = ""+cmp.getDataModel().getProperty(INewJavaClassDataModelProperties.SUPERCLASS);
- if(superclass == null || superclass.length() == 0 )
- superclass = "java.lang.Object";
- Boolean modifier = ((Boolean)(cmp.getDataModel().getProperty(INewJavaClassDataModelProperties.MODIFIER_PUBLIC)));
- boolean isPublic = ( modifier != null && modifier.booleanValue());
- modifier = ((Boolean)(cmp.getDataModel().getProperty(INewJavaClassDataModelProperties.MODIFIER_ABSTRACT)));
- boolean isAbstract = ( modifier != null && modifier.booleanValue());
- modifier = ((Boolean)(cmp.getDataModel().getProperty(INewJavaClassDataModelProperties.MODIFIER_FINAL)));
- boolean isFinal = ( modifier != null && modifier.booleanValue());
-
- String publicStr = (isPublic ? "public": "");
- String abstractStr = (isAbstract ? "abstract": "");
- String finalStr = (isFinal ? "final": "");
- String extendsStr = (superclass.equals("java.lang.Object") ? "": "extends " + superclass);
-
-%>
-
-<%= publicStr %> <%= finalStr %> <%= abstractStr %> class <%= cmp.getSimpleClassName()%> <%= extendsStr %> implements <%= cmp.getInterfaces() %>
-{
-
-<% if(isComposite ){ %>
- /**
- * Generated Primary Key Class
- * @generated
- */
- public class PrimaryKey {
-<%
- Iterator keys = keyAttributes.iterator();
- while(keys.hasNext()){
- CMPAttributeDelegate key = (CMPAttributeDelegate) keys.next();
-%>
- /**
- * @generated
- */
- public <%= key.getAttributeType() %> <%= key.getName() %> ;
-<% } %>
- }
-<% }%>
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/fields.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/fields.javajet
deleted file mode 100644
index 2ccec2e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/fields.javajet
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ jet package="org.eclipse.gmf.templates.messageDriven" class="FieldGenerator" %>
-
-/**
- * <!-- begin-xdoclet-definition -->
- * <!-- end-xdoclet-definition -->
- * @generated
- */
-private static final long serialVersionUID = 1L;
-
-/**
-* <!-- begin-user-doc -->
-* <!-- end-user-doc -->
-* The context for the message-driven bean, set by the EJB container.
-* @generated
-*/
-private javax.ejb.MessageDrivenContext messageContext = null;
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/methodStubs.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/methodStubs.javajet
deleted file mode 100644
index b4d8911..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/methodStubs.javajet
+++ /dev/null
@@ -1,62 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.messageDriven" class="MethodGenerator" %>
-
-/**
- * Required method for container to set context.
- * @generated
- */
-public void setMessageDrivenContext(javax.ejb.MessageDrivenContext messageContext)
- throws javax.ejb.EJBException {
- this.messageContext = messageContext;
-}
-
-
-/**
- * Required creation method for message-driven beans.
- *
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * <!-- begin-xdoclet-definition -->
- * @ejb.create-method
- * <!-- end-xdoclet-definition -->
- * @generated
- */
-public void ejbCreate() {
- //no specific action required for message-driven beans
-}
-
-
-/**
- * Required removal method for message-driven beans.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public void ejbRemove() {
- messageContext = null;
-}
-
-
-/**
- * This method implements the business logic for the EJB.
- *
- * <p>Make sure that the business logic accounts for asynchronous message processing.
- * For example, it cannot be assumed that the EJB receives messages in the order they were
- * sent by the client. Instance pooling within the container means that messages are not
- * received or processed in a sequential order, although individual onMessage() calls to
- * a given message-driven bean instance are serialized.
- *
- * <p>The <code>onMessage()</code> method is required, and must take a single parameter
- * of type javax.jms.Message. The throws clause (if used) must not include an application
- * exception. Must not be declared as final or static.
- *
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public void onMessage(javax.jms.Message message) {
- // begin-user-code
- System.out.println("Message Driven Bean got message " + message);
- // TODO: do business logic here
- // end-user-code
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/typeComment.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/typeComment.javajet
deleted file mode 100644
index 255c9c7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/typeComment.javajet
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@ jet package="org.eclipse.gmf.templates.messageDriven" class="TypeCommentGenerator" imports="org.eclipse.jst.j2ee.ejb.annotation.internal.model.*"%>
-<% IMessageDrivenBean mdb = (IMessageDrivenBean)argument; %>
-
-
-
-/**
- * <!-- begin-xdoclet-definition -->
- * @ejb.bean name="<%=mdb.getEjbName()%>"
- * acknowledge-mode="Auto-acknowledge"
- * destination-type="javax.jms.<%= mdb.getDestinationType() %>"
- * <%= "Queue".equals(mdb.getDestinationType()) ? "" : "subscription-durability=\"NonDurable\""%>
- * transaction-type="<%= mdb.getTransactionType() %>"
- * destination-jndi-name="<%= mdb.getDestinationJndiName() %>"
- *
- * @ejb.transaction="Supports"
- *
- * <!-- end-xdoclet-definition -->
- * @generated
- **/
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/typeStub.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/typeStub.javajet
deleted file mode 100644
index 30baf7e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/typeStub.javajet
+++ /dev/null
@@ -1,25 +0,0 @@
-<%@ jet package="org.eclipse.gmf.templates.messageDriven" class="TypeStubGenerator" imports="org.eclipse.jst.j2ee.ejb.annotation.internal.model.* org.eclipse.jst.j2ee.internal.common.operations.*"%>
-<% IMessageDrivenBean mdb = (IMessageDrivenBean)argument;
-
- String superclass = ""+mdb.getDataModel().getProperty(INewJavaClassDataModelProperties.SUPERCLASS);
- if(superclass == null || superclass.length() == 0 )
- superclass = "java.lang.Object";
- Boolean modifier = ((Boolean)(mdb.getDataModel().getProperty(INewJavaClassDataModelProperties.MODIFIER_PUBLIC)));
- boolean isPublic = ( modifier != null && modifier.booleanValue());
- modifier = ((Boolean)(mdb.getDataModel().getProperty(INewJavaClassDataModelProperties.MODIFIER_ABSTRACT)));
- boolean isAbstract = ( modifier != null && modifier.booleanValue());
- modifier = ((Boolean)(mdb.getDataModel().getProperty(INewJavaClassDataModelProperties.MODIFIER_FINAL)));
- boolean isFinal = ( modifier != null && modifier.booleanValue());
-
- String publicStr = (isPublic ? "public": "");
- String abstractStr = (isAbstract ? "abstract": "");
- String finalStr = (isFinal ? "final": "");
- String extendsStr = (superclass.equals("java.lang.Object") ? "": "extends " + superclass);
-
-
-%>
-
-
-<%= publicStr %> <%= finalStr %> <%= abstractStr %> class <%= mdb.getSimpleClassName()%> <%= extendsStr %> implements <%= mdb.getInterfaces() %>
-{
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/fields.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/fields.javajet
deleted file mode 100644
index c04a0aa..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/fields.javajet
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.session" class="FieldGenerator" %>
-
-/**
- * <!-- begin-xdoclet-definition -->
- * <!-- end-xdoclet-definition -->
- * @generated
- */
-private static final long serialVersionUID = 1L;
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/methodStubs.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/methodStubs.javajet
deleted file mode 100644
index 3b40bea..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/methodStubs.javajet
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.session" class="MethodGenerator" %>
-
-/**
- *
- * <!-- begin-xdoclet-definition -->
- * @ejb.create-method view-type="remote"
- * <!-- end-xdoclet-definition -->
- * @generated
- *
- * //TODO: Must provide implementation for bean create stub
- */
-public void ejbCreate()
-{
-}
-
-/**
- *
- * <!-- begin-xdoclet-definition -->
- * @ejb.interface-method view-type="remote"
- * <!-- end-xdoclet-definition -->
- * @generated
- *
- * //TODO: Must provide implementation for bean method stub
- */
-public String foo(String param)
-{
- return null;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/typeComment.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/typeComment.javajet
deleted file mode 100644
index 3c4f340..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/typeComment.javajet
+++ /dev/null
@@ -1,19 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.session" class="TypeCommentGenerator" imports="org.eclipse.jst.j2ee.ejb.annotation.internal.model.*"%>
-<% ISessionBean session = (ISessionBean)argument; %>
-/**
- *
- * <!-- begin-user-doc -->
- * A generated session bean
- * <!-- end-user-doc -->
- * *
- * <!-- begin-xdoclet-definition -->
- * @ejb.bean name="<%=session.getEjbName() %>"
- * description="<%=session.getDescription()%>"
- * display-name="<%=session.getDisplayName()%>"
- * jndi-name="<%=session.getJndiName()%>"
- * type="<%=session.getSessionType() %>"
- * transaction-type="<%= session.getTransactionType()%>"
- *
- * <!-- end-xdoclet-definition -->
- * @generated
- */
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/typeStub.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/typeStub.javajet
deleted file mode 100644
index c268d6e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/typeStub.javajet
+++ /dev/null
@@ -1,25 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.session" class="TypeStubGenerator" imports="org.eclipse.jst.j2ee.ejb.annotation.internal.model.* org.eclipse.jst.j2ee.internal.common.operations.*"%>
-<% ISessionBean session = (ISessionBean)argument;
-
- String superclass = ""+session.getDataModel().getProperty(INewJavaClassDataModelProperties.SUPERCLASS);
- if(superclass == null || superclass.length() == 0 )
- superclass = "java.lang.Object";
- Boolean modifier = ((Boolean)(session.getDataModel().getProperty(INewJavaClassDataModelProperties.MODIFIER_PUBLIC)));
- boolean isPublic = ( modifier != null && modifier.booleanValue());
- modifier = ((Boolean)(session.getDataModel().getProperty(INewJavaClassDataModelProperties.MODIFIER_ABSTRACT)));
- boolean isAbstract = ( modifier != null && modifier.booleanValue());
- modifier = ((Boolean)(session.getDataModel().getProperty(INewJavaClassDataModelProperties.MODIFIER_FINAL)));
- boolean isFinal = ( modifier != null && modifier.booleanValue());
-
- String publicStr = (isPublic ? "public": "");
- String abstractStr = (isAbstract ? "abstract": "");
- String finalStr = (isFinal ? "final": "");
- String extendsStr = (superclass.equals("java.lang.Object") ? "": "extends " + superclass);
-
-
-%>
-
-
-<%= publicStr %> <%= finalStr %> <%= abstractStr %> class <%= session.getSimpleClassName()%> <%= extendsStr %> implements <%= session.getInterfaces() %>
-{
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/test.javajet b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/test.javajet
deleted file mode 100644
index 1ee5a7c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/test.javajet
+++ /dev/null
@@ -1,21 +0,0 @@
-<%@ jet package="translated" class="HelloWorld" imports="java.util.* com.objectlearn.lomboz.xml.lomboz.DocumentRoot com.sun.java.xml.ns.j2ee.SessionBeanType"%>
-
-
-<% DocumentRoot root = (DocumentRoot)argument;
-
-Iterator sessionBeans = root.getEjb().getSession().iterator();
-while (sessionBeans.hasNext()) {
- SessionBeanType sb = (SessionBeanType) sessionBeans.next();
-%>
-/**
- * @author Lomboz Auto-generated
- *
-<%= " * @lomboz.sessionbean.name " +sb.getEjbName().getValue() %>
-<%= " * @lomboz.sessionbean.class " +sb.getEjbClass() %>
-<%= " * @lomboz.sessionbean.displayname " +sb.getDisplayName() %>
-
-<%
-}
-%>
-
-*/
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/.classpath b/plugins/org.eclipse.jst.j2ee.ejb/.classpath
deleted file mode 100644
index 4837779..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="ejb/"/>
- <classpathentry kind="src" path="ejbedit/"/>
- <classpathentry kind="src" path="ejbcreation/"/>
- <classpathentry kind="src" path="ejbarchive/"/>
- <classpathentry kind="src" path="ejbvalidator/"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/.cvsignore b/plugins/org.eclipse.jst.j2ee.ejb/.cvsignore
deleted file mode 100644
index 590084f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-runtime
-temp.folder
-build.xml
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/.project b/plugins/org.eclipse.jst.j2ee.ejb/.project
deleted file mode 100644
index 99f6553..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.ejb</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.ejb/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.ejb/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fdc659a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,69 +0,0 @@
-#Mon Feb 18 15:57:09 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF
deleted file mode 100644
index 215d588..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,49 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb; singleton:=true
-Bundle-Version: 1.1.300.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.ejb.archiveoperations,
- org.eclipse.jst.j2ee.ejb.componentcore.util,
- org.eclipse.jst.j2ee.ejb.datamodel.properties,
- org.eclipse.jst.j2ee.ejb.internal.deployables;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.internal.modulecore.util;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.internal.operations,
- org.eclipse.jst.j2ee.ejb.internal.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.project.facet,
- org.eclipse.jst.j2ee.ejb.project.operations,
- org.eclipse.jst.j2ee.internal.ejb.archiveoperations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ejb.project;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ejb.project.operations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ejb.provider;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ejb.refactor;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ejb.workbench.validation;x-internal:=true
-Require-Bundle: org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.validation;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.codegen;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/about.html b/plugins/org.eclipse.jst.j2ee.ejb/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/build.properties b/plugins/org.eclipse.jst.j2ee.ejb/build.properties
deleted file mode 100644
index b1bfefb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- icons/,\
- .,\
- META-INF/,\
- about.html,\
- templates/
-jars.compile.order = .
-source.. = ejb/,\
- ejbedit/,\
- ejbcreation/,\
- ejbarchive/,\
- ejbvalidator/,\
- property_files/
-output.. = bin/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/build/buildcontrol.properties b/plugins/org.eclipse.jst.j2ee.ejb/build/buildcontrol.properties
deleted file mode 100644
index 3270ed0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/build/buildcontrol.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-CONTACT=danberg@us.ibm.com
-ComponentShortName=ejb
-ComponentFullName=EJB
-ComponentCompetency=EMF
-JavaCompile.1=srcjar
-BuildVerification.1=dir
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/build/package.xml b/plugins/org.eclipse.jst.j2ee.ejb/build/package.xml
deleted file mode 100644
index 154d2fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/build/package.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="com.ibm.etools.emf.workbench" default="packagingPlugin" basedir="./..">
- <target name="init">
- <property name="packageDir" value=""/>
- <property name="plugin.directory" value="${basedir}"/>
- <property name="plugin.id" value="com.ibm.etools.ejb"/>
- <property name="plugin.version" value=""/>
- </target>
- <target name="packagingPlugin" depends="init">
- <echo message="${plugin.id}"/>
- <copy todir="${packageDir}/plugins/${plugin.id}_${plugin.version}">
- <fileset dir="${plugin.directory}">
- <include name="plugin.xml"/>
- <include name="runtime/ejb.jar"/>
- </fileset>
- </copy>
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/build/wsBuild.xml b/plugins/org.eclipse.jst.j2ee.ejb/build/wsBuild.xml
deleted file mode 100644
index 77c0b82..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/build/wsBuild.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE project [
- <!ENTITY baseBuild SYSTEM "file:../../wsBuildDef.xml">
-]>
-
-<project name="buildPlugin" default="build" basedir="./..">
-
-<!-- include the common xml build file -->
-&baseBuild;
-
-<target name="build" depends="prepare" if="plugin.id">
- <antcall target="buildjar">
- <param name="jarname" value="${defaultjarname}"/>
- <param name="jarclasspath" value="${plugin.classpath}"/>
- </antcall>
-</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/component.xml b/plugins/org.eclipse.jst.j2ee.ejb/component.xml
deleted file mode 100644
index 217da9d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.j2ee.ejb"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee.ejb" fragment="false"/><plugin id="org.eclipse.jst.j2ee.ejb.annotation.model" fragment="false"/><plugin id="org.eclipse.jst.j2ee.xdoclet.runtime" fragment="false"/><plugin id="org.eclipse.jst.j2ee.ejb.annotations.emitter" fragment="false"/><plugin id="org.eclipse.jst.j2ee.ejb.annotations.ui" fragment="false"/><plugin id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet" fragment="false"/><plugin id="org.eclipse.jst.ejb.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/deployables/EJBDeployableArtifactAdapterUtil.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/deployables/EJBDeployableArtifactAdapterUtil.java
deleted file mode 100644
index b3d47c1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/deployables/EJBDeployableArtifactAdapterUtil.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.deployables;
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.server.core.EJBBean;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.NullModuleArtifact;
-
-/**
- * @version 1.0
- * @author
- */
-public class EJBDeployableArtifactAdapterUtil {
- /**
- * Constructor for EJBDeployableObjectAdapter.
- */
- public EJBDeployableArtifactAdapterUtil() {
- super();
- }
-
- public static IModuleArtifact getModuleObject(Object obj) {
- if (obj == null)
- return null;
- else if (obj instanceof EJBJar)
- return getModuleObject((EJBJar) obj);
- else if (obj instanceof EnterpriseBean)
- return getModuleObject((EnterpriseBean) obj);
- else if (obj instanceof IProject)
- return getModuleObject((IProject) obj);
- else if (obj instanceof IJavaProject)
- return getModuleObject(((IJavaProject) obj).getProject());
- else if (obj instanceof IFile)
- return getModuleObject((IFile) obj);
- else if (obj instanceof ICompilationUnit)
- return getModuleObject((ICompilationUnit) obj);
- return null;
- }
-
- protected static boolean hasInterestedComponents(IProject project) {
- return J2EEProjectUtilities.isEJBProject(project);
- }
-
- protected static IModuleArtifact getModuleObject(ICompilationUnit cu) {
-
- try {
- IFile file = (IFile) cu.getCorrespondingResource();
- IProject project = file.getProject();
- if (hasInterestedComponents(project)) {
- return getModuleJavaObject(file);
- }
-
- } catch (JavaModelException e) {
- Logger.getLogger().log(e);
- }
- return null;
- }
-
- protected static IModuleArtifact getModuleObject(EJBJar ejbJar) {
- IModule dep = getModule(ejbJar);
- return createModuleObject(dep, null, false, false);
- }
-
- protected static IModuleArtifact getModuleObject(EnterpriseBean ejb) {
-
- IModule dep = getModule(ejb);
- return createModuleObject(dep, ejb.getName(), ejb.hasRemoteClient(), ejb.hasLocalClient());
- }
-
- protected static IModuleArtifact getModuleObject(IProject project) {
- if (hasInterestedComponents(project)) {
- IModule dep = getModule(project, null);
- return createModuleObject(dep, null, false, false);
- }
- return null;
- }
-
- protected static IModuleArtifact getModuleObject(IFile file) {
- IVirtualResource[] resources = ComponentCore.createResources(file);
- IVirtualComponent component = null;
- if (resources[0] != null || resources.length <= 0)
- component = resources[0].getComponent();
- if (hasInterestedComponents(file.getProject())) {
- String ext = file.getFileExtension();
- if ("java".equals(ext) || "class".equals(ext)) //$NON-NLS-1$ //$NON-NLS-2$
- return getModuleJavaObject(file);
- if (file.getProjectRelativePath().toString().endsWith(J2EEConstants.EJBJAR_DD_URI))
- return createModuleObject(getModule(file.getProject(), component), null, false, false);
- }
- return null;
- }
-
- protected static IModule getModule(EObject refObject) {
- IProject proj = ProjectUtilities.getProject(refObject);
- Resource refResource = refObject.eResource();
- IVirtualResource[] resources = null;
- IVirtualComponent component = null;
- try {
- IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(refResource);
- resources = ComponentCore.createResources(eclipeServResoruce);
- if (resources[0] != null)
- component = resources[0].getComponent();
- } catch (Exception e) {
- e.printStackTrace();
- }
- return getModule(proj, component);
- }
-
- protected static IModule getModule(IProject project, IVirtualComponent component) {
- IModule deployable = null;
- Iterator iterator = Arrays.asList(ServerUtil.getModules(J2EEProjectUtilities.EJB)).iterator(); //$NON-NLS-1$
- String componentName = null;
- if (component != null)
- componentName = component.getName();
- else
- return getModuleProject(project, iterator);
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getName().equals(componentName)) {
- return deployable;
- }
- }
- }
- return null;
- }
-
- protected static IModule getModuleProject(IProject project, Iterator iterator) {
- IModule deployable = null;
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getProject().equals(project))
- return deployable;
- }
- }
- return null;
- }
-
-
- protected static IModuleArtifact getModuleJavaObject(IFile file) {
-
- IVirtualComponent comp = (IVirtualComponent)file.getAdapter(IVirtualComponent.class);
- if (comp != null) {
- JavaClass javaClass = JemProjectUtilities.getJavaClass(file);
- if (javaClass != null) {
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(comp);
- EJBJar jar = edit.getEJBJar();
- if (jar != null) {
- EnterpriseBean ejb = jar.getEnterpriseBeanWithReference(javaClass);
- return createModuleObject(getModule(comp.getProject(), comp), ejb.getName(), isRemote(ejb, javaClass), isLocal(ejb, javaClass));
- }
- } finally {
- if (edit != null)
- edit.dispose();
- }
- }
- }
- return null;
- }
-
- protected static boolean isRemote(EnterpriseBean ejb, JavaClass javaClass) {
- if (javaClass.equals(ejb.getHomeInterface()) || javaClass.equals(ejb.getRemoteInterface()))
- return true;
- return false;
- }
-
- protected static boolean isLocal(EnterpriseBean ejb, JavaClass javaClass) {
- if (javaClass.equals(ejb.getLocalHomeInterfaceName()) || javaClass.equals(ejb.getLocalInterface()))
- return true;
- return false;
- }
-
- protected static IModuleArtifact createModuleObject(IModule module, String ejbName, boolean remote, boolean local) {
- if (module != null) {
- String jndiName = null;
- if (ejbName != null) {
- module.loadAdapter(ModuleDelegate.class, new NullProgressMonitor());
- J2EEFlexProjDeployable moduleDelegate = (J2EEFlexProjDeployable)module.getAdapter(ModuleDelegate.class);
- jndiName = moduleDelegate.getJNDIName(ejbName);
- return new EJBBean(module, jndiName, remote, local);
- }
- return new NullModuleArtifact(module);
- }
- return null;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/deployables/IEJBModuleArtifact.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/deployables/IEJBModuleArtifact.java
deleted file mode 100644
index 935005a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/deployables/IEJBModuleArtifact.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * to be removed for M4
- */
-package org.eclipse.jst.j2ee.ejb.internal.deployables;
-
-public interface IEJBModuleArtifact {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEnterpriseBeanOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEnterpriseBeanOperation.java
deleted file mode 100644
index 05f52c3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEnterpriseBeanOperation.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import org.eclipse.jst.j2ee.internal.common.operations.AddJavaEEArtifactOperation;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public abstract class AddEnterpriseBeanOperation extends AddJavaEEArtifactOperation {
-
- /**
- * This is the constructor which should be used when creating the operation.
- * It will not accept null parameter. It will not return null.
- *
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- *
- * @param dataModel
- * @return AddBeansOperation
- */
- public AddEnterpriseBeanOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddMessageDrivenBeanOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddMessageDrivenBeanOperation.java
deleted file mode 100644
index 9aa9bec..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddMessageDrivenBeanOperation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaEEArtifactClassOperation;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AddMessageDrivenBeanOperation extends AddEnterpriseBeanOperation {
-
- /**
- * This is the constructor which should be used when creating the operation.
- * It will not accept null parameter. It will not return null.
- *
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- *
- * @param dataModel
- * @return AddBeansOperation
- */
- public AddMessageDrivenBeanOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- @Override
- protected NewJavaEEArtifactClassOperation getNewClassOperation() {
- return new NewMessageDrivenBeanClassOperation(getDataModel());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddSessionBeanOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddSessionBeanOperation.java
deleted file mode 100644
index f7a03e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddSessionBeanOperation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaEEArtifactClassOperation;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AddSessionBeanOperation extends AddEnterpriseBeanOperation {
-
- /**
- * This is the constructor which should be used when creating the operation.
- * It will not accept null parameter. It will not return null.
- *
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- *
- * @param dataModel
- * @return AddBeansOperation
- */
- public AddSessionBeanOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- @Override
- protected NewJavaEEArtifactClassOperation getNewClassOperation() {
- return new NewSessionBeanClassOperation(getDataModel());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/BusinessInterface.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/BusinessInterface.java
deleted file mode 100644
index dba917b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/BusinessInterface.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-
-public class BusinessInterface {
-
- public enum BusinessInterfaceType {
- LOCAL, REMOTE;
- }
-
- private IType javaType;
- private String name;
-
- private BusinessInterfaceType type;
-
- public BusinessInterface(IType javaType, BusinessInterfaceType type) {
- this(javaType.getFullyQualifiedName(), type);
- this.javaType = javaType;
- }
-
- public BusinessInterface(String name, BusinessInterfaceType type) {
- this.name = name;
- this.type = type;
- }
-
- public String getFullyQualifiedName() {
- return name;
- }
-
- public String getSimpleName() {
- return Signature.getSimpleName(name);
- }
-
- public IType getJavaType() {
- return javaType;
- }
-
- public boolean exists() {
- return javaType != null;
- }
-
- public BusinessInterfaceType getType() {
- return type;
- }
-
- public boolean isLocal() {
- return type == BusinessInterfaceType.LOCAL;
- }
-
- public boolean isRemote() {
- return type == BusinessInterfaceType.REMOTE;
- }
-
- public boolean hasUnimplementedMethod() throws JavaModelException {
- if (javaType != null) {
- IMethod[] methods = javaType.getMethods();
- for (IMethod method : methods) {
- boolean resolved = method.isResolved();
- if (!resolved) {
- int flags = method.getFlags();
- if (Flags.isAbstract(flags) || Flags.isInterface(flags)) {
- method.getParameterTypes();
- }
- }
- }
- }
- return false;
- }
-
- public void setFullyQualifiedName(String newName) {
- name = newName;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateEnterpriseBeanTemplateModel.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateEnterpriseBeanTemplateModel.java
deleted file mode 100644
index d36c3c4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateEnterpriseBeanTemplateModel.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewEnterpriseBeanClassDataModelProperties.TRANSACTION_TYPE;
-
-import org.eclipse.jst.j2ee.internal.common.operations.CreateJavaEEArtifactTemplateModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class CreateEnterpriseBeanTemplateModel extends
- CreateJavaEEArtifactTemplateModel {
-
- protected static final String ATT_MAPPED_NAME = "mappedName"; //$NON-NLS-1$
- protected static final String ATT_NAME = "name"; //$NON-NLS-1$
-
- protected static final String QUOTATION_STRING = "\"";
-
- public CreateEnterpriseBeanTemplateModel(IDataModel dataModel) {
- super(dataModel);
- }
-
- public boolean isContainerType() {
- String transactionType = dataModel.getStringProperty(TRANSACTION_TYPE);
- if (transactionType.equals(TransactionType.CONTAINER.toString()))
- return true;
- else if (transactionType.equals(TransactionType.BEAN.toString()))
- return false;
- else
- throw new IllegalStateException("illegal transaction type: " + transactionType);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateMessageDrivenBeanTemplateModel.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateMessageDrivenBeanTemplateModel.java
deleted file mode 100644
index e445cbc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateMessageDrivenBeanTemplateModel.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewEnterpriseBeanClassDataModelProperties.EJB_NAME;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewEnterpriseBeanClassDataModelProperties.MAPPED_NAME;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewMessageDrivenBeanClassDataModelProperties.DESTINATION_TYPE;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewMessageDrivenBeanClassDataModelProperties.JMS;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewMessageDrivenBeanClassDataModelProperties.MESSAGE_LISTENER_INTERFACE;
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.j2ee.internal.common.operations.Method;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class CreateMessageDrivenBeanTemplateModel extends
- CreateEnterpriseBeanTemplateModel {
-
- public static final String QUALIFIED_ACTIVATION_CONFIG_PROPERTY = "javax.ejb.ActivationConfigProperty"; //$NON-NLS-1$
- public static final String QUALIFIED_TRANSACTION_MANAGEMENT = "javax.ejb.TransactionManagement"; //$NON-NLS-1$
- public static final String QUALIFIED_TRANSACTION_MANAGEMENT_TYPE = "javax.ejb.TransactionManagementType"; //$NON-NLS-1$
- public static final String QUALIFIED_JSM_MESSAGE = "javax.jms.Message"; //$NON-NLS-1$
- public static final String QUALIFIED_MESSAGE_DRIVEN = "javax.ejb.MessageDriven"; //$NON-NLS-1$
- public static final String ATT_ACTIVATION_CONFIG = "activationConfig"; //$NON-NLS-1$
- public static final String ATT_MESSAGE_LISTENER_INTERFACE = "messageListenerInterface"; //$NON-NLS-1$
- public static final String ON_MESSAGE = "onMessage"; //$NON-NLS-1$
- public static final String ON_MESSAGE_SIGNATURE = "(Ljavax/jms/Message;)V"; //$NON-NLS-1$
-
- private static final String CLASS_SUFFIX = ".class"; //$NON-NLS-1$
-
- public CreateMessageDrivenBeanTemplateModel(IDataModel dataModel) {
- super(dataModel);
- }
-
- @Override
- public Collection<String> getImports() {
- Collection<String> collection = super.getImports();
-
- collection.add(QUALIFIED_MESSAGE_DRIVEN);
- if (isJMS()){
- collection.add(QUALIFIED_ACTIVATION_CONFIG_PROPERTY);
- collection.add(NewMessageDrivenBeanClassDataModelProvider.QUALIFIED_JMS_MESSAGELISTENER);
- collection.add(QUALIFIED_JSM_MESSAGE);
- }
- if (!isContainerType()) {
- collection.add(QUALIFIED_TRANSACTION_MANAGEMENT);
- collection.add(QUALIFIED_TRANSACTION_MANAGEMENT_TYPE);
- }
-
- collection.add(dataModel.getStringProperty(MESSAGE_LISTENER_INTERFACE));
-
- return collection;
- }
-
- public Map<String, String> getClassAnnotationParams() {
- Map<String, String> result = new Hashtable<String, String>();
- if (isJMS()){
- String destinationType = dataModel.getStringProperty(DESTINATION_TYPE);
- if (destinationType.equals(DestinationType.QUEUE.toString()))
- result.put(ATT_ACTIVATION_CONFIG, "javax.jms.Queue");
- else if (destinationType.equals(DestinationType.TOPIC.toString()))
- result.put(ATT_ACTIVATION_CONFIG, "javax.jms.Topic");
- else
- throw new IllegalStateException("illegal destination type: " + destinationType);
- }
- String dispName = getProperty(EJB_NAME).trim();
- if (!dispName.equals(getClassName()) && (dispName.length() > 0))
- result.put(ATT_NAME, QUOTATION_STRING + dispName + QUOTATION_STRING);
- String mappedName = getProperty(MAPPED_NAME).trim();
- if (mappedName != null && mappedName.length() > 0) {
- result.put(ATT_MAPPED_NAME, QUOTATION_STRING + mappedName + QUOTATION_STRING);
- }
- String messageListenerInterface = getProperty(MESSAGE_LISTENER_INTERFACE);
-
- List<String> interfaces = getQualifiedInterfaces();
- if (interfaces.size() != 1 || !interfaces.contains(messageListenerInterface)) {
- result.put(ATT_MESSAGE_LISTENER_INTERFACE,
- Signature.getSimpleName(messageListenerInterface) + CLASS_SUFFIX);
- }
-
- return result;
- }
-
- public boolean isJMS(){
- return dataModel.getBooleanProperty(JMS);
- }
-
- @Override
- public Collection<Method> getUnimplementedMethods() {
- Collection<Method> unimplementedMethods = super.getUnimplementedMethods();
- Iterator<Method> iterator = unimplementedMethods.iterator();
-
- while (iterator.hasNext()) {
- Method method = iterator.next();
- if (ON_MESSAGE.equals(method.getName()) && ON_MESSAGE_SIGNATURE.equals(method.getSignature())) {
- iterator.remove();
- }
- }
-
- return unimplementedMethods;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateSessionBeanTemplateModel.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateSessionBeanTemplateModel.java
deleted file mode 100644
index fe56b1a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateSessionBeanTemplateModel.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewEnterpriseBeanClassDataModelProperties.EJB_NAME;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewEnterpriseBeanClassDataModelProperties.MAPPED_NAME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_HOME;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE_HOME;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.STATE_TYPE;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class CreateSessionBeanTemplateModel extends
- CreateEnterpriseBeanTemplateModel {
-
- public static final String QUALIFIED_STATELESS = "javax.ejb.Stateless"; //$NON-NLS-1$
- public static final String QUALIFIED_STATEFUL = "javax.ejb.Stateful"; //$NON-NLS-1$
- public static final String QUALIFIED_LOCAL = "javax.ejb.Local"; //$NON-NLS-1$
- public static final String QUALIFIED_REMOTE = "javax.ejb.Remote"; //$NON-NLS-1$
- public static final String QUALIFIED_REMOTE_HOME = "javax.ejb.RemoteHome"; //$NON-NLS-1$
- public static final String QUALIFIED_LOCAL_HOME = "javax.ejb.LocalHome"; //$NON-NLS-1$
- public static final String QUALIFIED_TRANSACTION_MANAGEMENT = "javax.ejb.TransactionManagement"; //$NON-NLS-1$
- public static final String QUALIFIED_TRANSACTION_MANAGEMENT_TYPE = "javax.ejb.TransactionManagementType"; //$NON-NLS-1$
-
- public static final String STATELESS_ANNOTATION = "@Stateless"; //$NON-NLS-1$
- public static final String STATEFUL_ANNOTATION = "@Stateful"; //$NON-NLS-1$
-
- protected BusinessInterface currentBusinessInterface = null;
- protected String localHomeClassName = null;
- protected String localComponentClassName = null;
- protected String remoteHomeClassName = null;
- protected String remoteComponentClassName = null;
-
- public CreateSessionBeanTemplateModel(IDataModel dataModel) {
- super(dataModel);
- }
-
- @Override
- public Collection<String> getImports() {
- Collection<String> collection = super.getImports();
-
- String stateType = dataModel.getStringProperty(STATE_TYPE);
- if (stateType.equals(StateType.STATELESS.toString()))
- collection.add(QUALIFIED_STATELESS);
- else if (stateType.equals(StateType.STATEFUL.toString()))
- collection.add(QUALIFIED_STATEFUL);
- else
- throw new IllegalStateException("illegal state type: " + stateType);
-
- if (!isContainerType()) {
- collection.add(QUALIFIED_TRANSACTION_MANAGEMENT);
- collection.add(QUALIFIED_TRANSACTION_MANAGEMENT_TYPE);
- }
-
- if (isRemoteHomeChecked()) {
- collection.add(QUALIFIED_REMOTE_HOME);
- collection.add(remoteHomeClassName);
- }
-
- if (isLocalHomeChecked()) {
- collection.add(QUALIFIED_LOCAL_HOME);
- collection.add(localHomeClassName);
- }
-
- List<BusinessInterface> interfaces = getBusinessInterfaces();
- for (BusinessInterface iface : interfaces) {
- if (iface.isLocal() && iface.exists()) {
- collection.add(QUALIFIED_LOCAL);
- } else if (iface.isRemote() && iface.exists()) {
- collection.add(QUALIFIED_REMOTE);
- }
- }
-
- return collection;
- }
-
- @Override
- public List<String> getQualifiedInterfaces() {
- List<String> result = new ArrayList<String>();
-
- List<BusinessInterface> interfaces = getBusinessInterfaces();
- for (BusinessInterface iface : interfaces) {
- result.add(iface.getFullyQualifiedName());
- }
-
- return result;
- }
-
- public String getClassAnnotation() {
- String stateType = dataModel.getStringProperty(STATE_TYPE);
-
- String beanType;
- if (stateType.equals(StateType.STATELESS.toString()))
- beanType = STATELESS_ANNOTATION;
- else if (stateType.equals(StateType.STATEFUL.toString()))
- beanType = STATEFUL_ANNOTATION;
- else
- throw new IllegalStateException("illegal state type: " + stateType);
-
- return beanType;
- }
-
- @SuppressWarnings("unchecked")
- public List<BusinessInterface> getBusinessInterfaces() {
- return (List<BusinessInterface>) dataModel.getProperty(INTERFACES);
- }
-
- public List<BusinessInterface> getExistingLocalBusinessInterfaces() {
- List<BusinessInterface> result = new ArrayList<BusinessInterface>();
-
- List<BusinessInterface> interfaces = getBusinessInterfaces();
- for (BusinessInterface iface : interfaces) {
- if (iface.isLocal() && iface.exists())
- result.add(iface);
- }
-
- return result;
- }
-
- public List<BusinessInterface> getExistingRemoteBusinessInterfaces() {
- List<BusinessInterface> result = new ArrayList<BusinessInterface>();
-
- List<BusinessInterface> interfaces = getBusinessInterfaces();
- for (BusinessInterface iface : interfaces) {
- if (iface.isRemote() && iface.exists())
- result.add(iface);
- }
-
- return result;
- }
-
- public boolean isLocalHomeChecked() {
- return dataModel.getBooleanProperty(LOCAL_HOME);
- }
-
- public boolean isRemoteHomeChecked() {
- return dataModel.getBooleanProperty(REMOTE_HOME);
- }
-
- public Map<String, String> getClassAnnotationParams() {
- Map<String, String> result = new Hashtable<String, String>();
- String dispName = getProperty(EJB_NAME).trim();
- if (!dispName.equals(getClassName()) && (dispName.length() > 0))
- result.put(ATT_NAME, dispName);
- String mappedName = getProperty(MAPPED_NAME).trim();
- if (mappedName != null && mappedName.length() > 0) {
- result.put(ATT_MAPPED_NAME, mappedName);
- }
- return result;
- }
-
- public void setCurrentBusinessInterface(BusinessInterface newBI)
- {
- currentBusinessInterface = newBI;
- }
-
- public String getBusinessInterfaceJavaPackageName() {
- String packageName = null;
- if (currentBusinessInterface != null)
- {
- packageName = Signature.getQualifier(currentBusinessInterface.getFullyQualifiedName());
- }
- return packageName;
- }
-
- public String getBusinessInterfaceClassName() {
- String className = null;
- if (currentBusinessInterface != null)
- {
- className = currentBusinessInterface.getSimpleName();
- }
- return className;
- }
-
- public String getLocalHomePackage() {
- return Signature.getQualifier(localHomeClassName);
- }
-
- public String getLocalHomeClassSimpleName()
- {
- return Signature.getSimpleName(localHomeClassName);
- }
-
- public void setLocalHomeClassName(String localHomeClassName) {
- this.localHomeClassName = localHomeClassName;
- }
-
-
-
- public String getLocalComponentPackage() {
- return Signature.getQualifier(localComponentClassName);
- }
-
- public String getLocalComponentClassSimpleName()
- {
- return Signature.getSimpleName(localComponentClassName);
- }
-
- public void setLocalComponentClassName(String localComponentClassName) {
- this.localComponentClassName = localComponentClassName;
- }
-
-
-
-
- public String getRemoteHomePackage() {
- return Signature.getQualifier(remoteHomeClassName);
- }
-
- public String getRemoteHomeClassSimpleName()
- {
- return Signature.getSimpleName(remoteHomeClassName);
- }
-
- public void setRemoteHomeClassName(String remoteHomeClassName) {
- this.remoteHomeClassName = remoteHomeClassName;
- }
-
-
-
-
-
- public String getRemoteComponentPackage() {
- return Signature.getQualifier(remoteComponentClassName);
- }
-
- public String getRemoteComponentClassSimpleName()
- {
- return Signature.getSimpleName(remoteComponentClassName);
- }
-
- public void setRemoteComponentClassName(String remoteComponentClassName) {
- this.remoteComponentClassName = remoteComponentClassName;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/DestinationType.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/DestinationType.java
deleted file mode 100644
index eb396b4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/DestinationType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-/**
- * Enumerates the destination type values of a message-driven bean.
- */
-public enum DestinationType {
-
- /**
- * Represents the <code>javax.jms.Queue</code> destination type.
- */
- QUEUE,
-
- /**
- * Represents the <code>javax.jms.Topic</code> destination type.
- */
- TOPIC;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewEnterpriseBeanClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewEnterpriseBeanClassDataModelProperties.java
deleted file mode 100644
index d79cde8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewEnterpriseBeanClassDataModelProperties.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-
-public interface INewEnterpriseBeanClassDataModelProperties extends INewJavaClassDataModelProperties, IAnnotationsDataModel {
-
-
- /**
- * Required, String property of the EJB name for the enterprise bean.
- */
- public static final String EJB_NAME = "INewEnterpriseBeanClassDataModelProperties.EJB_NAME"; //$NON-NLS-1$
-
- /**
- * Optional, String property of the EJB mapped name for the enterprise bean.
- */
- public static final String MAPPED_NAME = "INewEnterpriseBeanClassDataModelProperties.MAPPED_NAME"; //$NON-NLS-1$
-
- /**
- * Required, Integer property that determines the transaction type of the enterprise
- * bean.
- *
- * @see NewSessionBeanClassDataModelProvider#TRANSACTION_TYPE_CONTAINER_INDEX
- * @see NewSessionBeanClassDataModelProvider#TRANSACTION_TYPE_BEAN_INDEX
- */
- public static final String TRANSACTION_TYPE = "INewEnterpriseBeanClassDataModelProperties.TRANSACTION_TYPE"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewMessageDrivenBeanClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewMessageDrivenBeanClassDataModelProperties.java
deleted file mode 100644
index aa4216c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewMessageDrivenBeanClassDataModelProperties.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-public interface INewMessageDrivenBeanClassDataModelProperties extends
- INewEnterpriseBeanClassDataModelProperties {
-
- /**
- * Optional, boolean property used to specify whether to generate a JMS
- * interface. The default is false.
- */
- public static final String JMS = "INewMessageDrivenBeanClassDataModelProperties.JMS"; //$NON-NLS-1$
-
- /**
- * Required, <code>DestinationType</code> enumeration property that
- * determines the destination type of the message-driven bean. The default
- * is <code>DestinationType.QUEUE</code>.
- *
- * @see DestinationType
- */
- public static final String DESTINATION_TYPE = "INewMessageDrivenBeanClassDataModelProperties.DESTINATION_TYPE"; //$NON-NLS-1$
-
- /**
- * Required, String property used to specify the fully qualified name of the
- * message listener interface of the message-driven bean.
- *
- * <p>
- * There is no default value. If the JMS property is set to
- * <code>true</code>, then this property is automatically set to
- * <code>javax.jms.MessageListener</code>.
- * </p>
- */
- public static final String MESSAGE_LISTENER_INTERFACE = "INewMessageDrivenBeanClassDataModelProperties.MESSAGE_LISTENER_INTERFACE"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewSessionBeanClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewSessionBeanClassDataModelProperties.java
deleted file mode 100644
index 0beab60..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewSessionBeanClassDataModelProperties.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-
-public interface INewSessionBeanClassDataModelProperties extends INewEnterpriseBeanClassDataModelProperties {
-
- /**
- * Optional, List of BusinessInterface objects property containing all the
- * qualified names of business interfaces the new session bean class should
- * implement.
- *
- * @see BusinessInterface
- * @deprecated use {@link INewJavaClassDataModelProperties#INTERFACES}
- * instead. BUSINESS_INTERFACES is a redundancy of the INTERFACE
- * property. To be removed at least after 3.1
- *
- */
- public static final String BUSINESS_INTERFACES = "INewSessionBeanClassDataModelProperties.BUSINESS_INTERFACES"; //$NON-NLS-1$
-
- public static final String REMOTE_BUSINESS_INTERFACE = "INewSessionBeanClassDataModelProperties.REMOTE_BUSINESS_INTERFACE"; //$NON-NLS-1$
-
- public static final String LOCAL_BUSINESS_INTERFACE = "INewSessionBeanClassDataModelProperties.LOCAL_BUSINESS_INTERFACE"; //$NON-NLS-1$
-
- public static final String REMOTE_HOME_INTERFACE = "INewSessionBeanClassDataModelProperties.REMOTE_HOME_INTERFACE"; //$NON-NLS-1$
-
- public static final String LOCAL_HOME_INTERFACE = "INewSessionBeanClassDataModelProperties.LOCAL_HOME_INTERFACE"; //$NON-NLS-1$
-
- public static final String LOCAL_COMPONENT_INTERFACE = "INewSessionBeanClassDataModelProperties.LOCAL_COMPONENT_INTERFACE"; //$NON-NLS-1$
-
- public static final String REMOTE_COMPONENT_INTERFACE = "INewSessionBeanClassDataModelProperties.REMOTE_COMPONENT_INTERFACE"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate a remote
- * business interface. The default is false.
- */
- public static final String REMOTE = "INewSessionBeanClassDataModelProperties.REMOTE"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate a local
- * business interface. The default is true.
- */
- public static final String LOCAL = "INewSessionBeanClassDataModelProperties.LOCAL"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate a EJB 2.x
- * compatible local home and components interfaces. The default is false.
- */
- public static final String LOCAL_HOME = "INewSessionBeanClassDataModelProperties.LOCAL_HOME"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate a EJB 2.x
- * compatible remote home and components interfaces. The default is false.
- */
- public static final String REMOTE_HOME = "INewSessionBeanClassDataModelProperties.REMOTE_HOME"; //$NON-NLS-1$
-
- /**
- * Required, Integer property that determines the state type of the session
- * bean.
- *
- * @see NewSessionBeanClassDataModelProvider#STATE_TYPE_STATELESS_INDEX
- * @see NewSessionBeanClassDataModelProvider#STATE_TYPE_STATEFUL_INDEX
- */
- public static final String STATE_TYPE = "INewSessionBeanClassDataModelProperties.STATE_TYPE"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewEnterpriseBeanClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewEnterpriseBeanClassDataModelProvider.java
deleted file mode 100644
index 4cf5f4a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewEnterpriseBeanClassDataModelProvider.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewEnterpriseBeanClassDataModelProperties.EJB_NAME;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewEnterpriseBeanClassDataModelProperties.MAPPED_NAME;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewEnterpriseBeanClassDataModelProperties.TRANSACTION_TYPE;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.JAVA_PACKAGE;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.SUPERCLASS;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class NewEnterpriseBeanClassDataModelProvider extends NewJavaClassDataModelProvider {
-
- /**
- * Subclasses may extend this method to add their own data model's properties as valid base
- * properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set<String> getPropertyNames() {
- // Add Bean specific properties defined in this data model
- Set<String> propertyNames = (Set<String>) super.getPropertyNames();
-
- propertyNames.add(EJB_NAME);
- propertyNames.add(MAPPED_NAME);
- propertyNames.add(TRANSACTION_TYPE);
-
- return propertyNames;
- }
-
- /**
- * Subclasses may extend this method to provide their own default values for any of the
- * properties in the data model hierarchy. This method does not accept a null parameter. It may
- * return null.
- *
- * @see NewJavaClassDataModelProvider#getDefaultProperty(String)
- * @see IDataModelProvider#getDefaultProperty(String)
- *
- * @param propertyName
- * @return Object default value of property
- */
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(EJB_NAME)) {
- String className = getStringProperty(CLASS_NAME);
- int index = className.lastIndexOf("."); //$NON-NLS-1$
- className = className.substring(index+1);
- return className;
- } else if (propertyName.equals(SUPERCLASS)){
- return "";
- } else if (propertyName.equals(TRANSACTION_TYPE)) {
- return TransactionType.CONTAINER.toString();
- }
-
- // Otherwise check super for default value for property
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- public IStatus validate(String propertyName) {
-
- if (propertyName.equals(SUPERCLASS)) {
- String value = getStringProperty(propertyName);
- if (value == null || value.trim().length() == 0)
- return WTPCommonPlugin.OK_STATUS;
- } else if (propertyName.equals(JAVA_PACKAGE)) {
- String value = getStringProperty(propertyName);
- if (value == null || value.trim().length() == 0) {
- String msg = EJBCreationResourceHandler.Bean_Class_Cannot_Be_In_UI_;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- } else if (EJB_NAME.equals(propertyName)) {
- String value = getStringProperty(propertyName).trim();
- if (value == null || value.trim().length() == 0){
- return WTPCommonPlugin.createWarningStatus(EJBCreationResourceHandler.WRN_BEAN_NAME_IS_EMPTY);
- }
- return validateEjbName();
- }
- return super.validate(propertyName);
- }
-
- /**
- * Subclasses may extend this method to add their own specific behavior when a certain property
- * in the data model hierarchy is set. This method does not accept null for the property name,
- * but it will for propertyValue. It will not return null. It will return false if the set
- * fails. This implementation verifies the display name is set to the classname, that the
- * annotations is disabled/enabled properly, and that the target project name is determined from
- * the source folder setting.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#propertySet(String,
- * Object)
- *
- * @param propertyName
- * @param propertyValue
- * @return boolean was property set?
- */
- public boolean propertySet(String propertyName, Object propertyValue) {
-
- // Call super to set the property on the data model
- boolean result = super.propertySet(propertyName, propertyValue);
- // If class name is changed, update the display name to be the same
- if (propertyName.equals(CLASS_NAME) && !getDataModel().isPropertySet(EJB_NAME)) {
- getDataModel().notifyPropertyChange(EJB_NAME, IDataModel.DEFAULT_CHG);
- }
- return result;
- }
-
- @Override
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- if (propertyName.equals(TRANSACTION_TYPE)) {
- return DataModelPropertyDescriptor.createDescriptors(
- new String[] {
- TransactionType.CONTAINER.toString(),
- TransactionType.BEAN.toString()
- },
- new String[] {
- EJBCreationResourceHandler.TRANSACTION_TYPE_CONTAINER,
- EJBCreationResourceHandler.TRANSACTION_TYPE_BEAN
- });
- }
-
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- protected IStatus validateEjbName() {
- // check if an EJB with the same name already exists
- String projectName = getStringProperty(PROJECT_NAME);
- if (projectName != null && projectName.length() > 0) {
- IModelProvider provider = ModelProviderManager.getModelProvider(ResourcesPlugin.getWorkspace().getRoot().getProject(projectName));
- EJBJar modelObject = (EJBJar) provider.getModelObject();
- EnterpriseBeans enterpriseBeans = modelObject.getEnterpriseBeans();
- if (enterpriseBeans != null)
- {
- List sessionBeans = enterpriseBeans.getSessionBeans();
- for (Object object : sessionBeans) {
- SessionBean session = (SessionBean) object;
- if (session.getEjbName().equals(getDataModel().getStringProperty(EJB_NAME).trim())){
- return new Status(IStatus.ERROR, EjbPlugin.PLUGIN_ID, EJBCreationResourceHandler.ERR_BEAN_ALREADY_EXISTS);
- }
- }
- }
- }
- return Status.OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewEnterpriseBeanClassOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewEnterpriseBeanClassOperation.java
deleted file mode 100644
index 55b4fb2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewEnterpriseBeanClassOperation.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaEEArtifactClassOperation;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * The NewMessageDrivenBeanClassOperation is an IDataModelOperation following the
- * IDataModel wizard and operation framework.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * It extends ArtifactEditProviderOperation to provide enterprise bean specific java
- * class generation.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * This operation is used by the AddMessageDrivenBeanOperation to generate an
- * non annotated java class for an added enterprise bean. It shares the
- * NewMessageDrivenBeanClassDataModelProvider with the AddMessageDrivenBeanOperation to store the
- * appropriate properties required to generate the new message-driven bean.
- * @see org.eclipse.jst.j2ee.ejb.internal.operations.AddMessageDrivenBeanOperation
- * @see org.eclipse.jst.j2ee.ejb.internal.operations.NewMessageDrivenBeanClassDataModelProvider
- *
- * A WTPJetEmitter bean template is used to create the class with the bean template.
- * @see org.eclipse.jst.j2ee.internal.project.WTPJETEmitter
- * @see org.eclipse.jst.j2ee.ejb.internal.operations.CreateMessageDrivenBeanTemplateModel
- *
- * Subclasses may extend this operation to provide their own specific bean
- * java class generation. The execute method may be extended to do so. Also,
- * generateUsingTemplates is exposed.
- *
- */
-public abstract class NewEnterpriseBeanClassOperation extends NewJavaEEArtifactClassOperation {
-
- /**
- * Constructor taking an IDataModel
- *
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- * @see NewEnterpriseBeanClassOperation
- *
- * @param dataModel
- * @return NewEnterpriseBeanClassOperation
- */
- public NewEnterpriseBeanClassOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- protected IFile createJavaFile(IProgressMonitor monitor, IPackageFragment fragment, String source, String localBeanName) throws JavaModelException {
- if (fragment != null) {
- ICompilationUnit cu = fragment.getCompilationUnit(localBeanName);
- // Add the compilation unit to the java file
- if (cu == null || !cu.exists())
- cu = fragment.createCompilationUnit(localBeanName, source,
- true, monitor);
- return (IFile) cu.getResource();
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewMessageDrivenBeanClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewMessageDrivenBeanClassDataModelProvider.java
deleted file mode 100644
index 6450a4b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewMessageDrivenBeanClassDataModelProvider.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewMessageDrivenBeanClassDataModelProperties.DESTINATION_TYPE;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewMessageDrivenBeanClassDataModelProperties.JMS;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewMessageDrivenBeanClassDataModelProperties.MESSAGE_LISTENER_INTERFACE;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.SUPERCLASS;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class NewMessageDrivenBeanClassDataModelProvider extends NewEnterpriseBeanClassDataModelProvider {
-
- public static final String QUALIFIED_JMS_MESSAGELISTENER = "javax.jms.MessageListener"; //$NON-NLS-1$
-
- public IDataModelOperation getDefaultOperation() {
- return new AddMessageDrivenBeanOperation(getDataModel());
- }
-
- /**
- * Subclasses may extend this method to add their own data model's properties as valid base
- * properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set<String> getPropertyNames() {
- // Add Bean specific properties defined in this data model
- Set<String> propertyNames = (Set<String>) super.getPropertyNames();
-
- propertyNames.add(DESTINATION_TYPE);
- propertyNames.add(JMS);
- propertyNames.add(MESSAGE_LISTENER_INTERFACE);
-
- return propertyNames;
- }
-
- /**
- * Subclasses may extend this method to provide their own default values for any of the
- * properties in the data model hierarchy. This method does not accept a null parameter. It may
- * return null.
- *
- * @see NewJavaClassDataModelProvider#getDefaultProperty(String)
- * @see IDataModelProvider#getDefaultProperty(String)
- *
- * @param propertyName
- * @return Object default value of property
- */
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(INTERFACES)){
- List<String> list = new ArrayList<String>();
- list.add(QUALIFIED_JMS_MESSAGELISTENER);
- return list;
- } else if (propertyName.equals(SUPERCLASS)) {
- return "";
- } else if (propertyName.equals(JMS)) {
- return Boolean.TRUE;
- } else if (propertyName.equals(DESTINATION_TYPE)) {
- return DestinationType.QUEUE.toString();
- } else if (propertyName.equals(MESSAGE_LISTENER_INTERFACE)) {
- return QUALIFIED_JMS_MESSAGELISTENER;
- }
- // Otherwise check super for default value for property
- return super.getDefaultProperty(propertyName);
- }
-
- /**
- * Subclasses may extend this method to add their own specific behavior when a certain property
- * in the data model hierarchy is set. This method does not accept null for the property name,
- * but it will for propertyValue. It will not return null. It will return false if the set
- * fails. This implementation verifies the display name is set to the classname, that the
- * annotations is disabled/enabled properly, and that the target project name is determined from
- * the source folder setting.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#propertySet(String,
- * Object)
- *
- * @param propertyName
- * @param propertyValue
- * @return boolean was property set?
- */
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean result = false;
-
- if (propertyName.equals(JMS)) {
- updateInterfaces();
- updateMessageListenerInterfaces();
- result = true;
- }
-
- if (propertyName.equals(INTERFACES)) {
- updateMessageListenerInterfaces();
- }
-
- if (propertyName.equals(MESSAGE_LISTENER_INTERFACE)) {
- boolean needSetJMS = QUALIFIED_JMS_MESSAGELISTENER.equals(propertyValue);
- if (getDataModel().getBooleanProperty(JMS) != needSetJMS)
- getDataModel().setProperty(JMS, needSetJMS);
- result = true;
- }
-
- return result || super.propertySet(propertyName, propertyValue);
- }
-
- @Override
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- if (propertyName.equals(DESTINATION_TYPE)) {
- return DataModelPropertyDescriptor.createDescriptors(
- new String[] {
- DestinationType.QUEUE.toString(),
- DestinationType.TOPIC.toString()
- },
- new String[] {
- EJBCreationResourceHandler.DESTINATION_TYPE_QUEUE,
- EJBCreationResourceHandler.DESTINATION_TYPE_TOPIC
- });
- }
-
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- @Override
- public IStatus validate(String propertyName) {
- if (propertyName.equals(MESSAGE_LISTENER_INTERFACE)) {
- String value = (String) getProperty(MESSAGE_LISTENER_INTERFACE);
- if (value == null || value.trim().length() == 0){
- List<String> interfaces = (List<String>) getProperty(INTERFACES);
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.ERR_NO_MESSAGE_LISTENER_INTERFACE);
- }
- }
- return super.validate(propertyName);
- }
-
- private void updateInterfaces() {
- List<String> interfacesList = (List<String>) getDataModel().getProperty(INTERFACES);
- boolean isJMS = getDataModel().getBooleanProperty(JMS);
- if (isJMS) {
- if (!interfacesList.contains(QUALIFIED_JMS_MESSAGELISTENER))
- interfacesList.add(QUALIFIED_JMS_MESSAGELISTENER);
- } else {
- interfacesList.remove(QUALIFIED_JMS_MESSAGELISTENER);
- }
- getDataModel().setProperty(INTERFACES, interfacesList);
- getDataModel().notifyPropertyChange(INTERFACES, DataModelEvent.VALUE_CHG);
- }
-
- private void updateMessageListenerInterfaces() {
- boolean isJMS = getDataModel().getBooleanProperty(JMS);
- if (isJMS){
- getDataModel().setProperty(MESSAGE_LISTENER_INTERFACE, QUALIFIED_JMS_MESSAGELISTENER);
- } else {
- String value = getStringProperty(MESSAGE_LISTENER_INTERFACE);
- if (value == null || value.length() == 0 || QUALIFIED_JMS_MESSAGELISTENER.equals(value)) {
- List<String> interfaces = (List<String>) getProperty(INTERFACES);
- String messageListenerInterface = "";
- if (interfaces.size() > 0) {
- messageListenerInterface = interfaces.get(0);
- }
- getDataModel().setProperty(MESSAGE_LISTENER_INTERFACE, messageListenerInterface);
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewMessageDrivenBeanClassOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewMessageDrivenBeanClassOperation.java
deleted file mode 100644
index 931595b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewMessageDrivenBeanClassOperation.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-
-/**
- * The NewMessageDrivenBeanClassOperation is an IDataModelOperation following the
- * IDataModel wizard and operation framework.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * It extends ArtifactEditProviderOperation to provide enterprise bean specific java
- * class generation.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * This operation is used by the AddMessageDrivenBeanOperation to generate an
- * non annotated java class for an added enterprise bean. It shares the
- * NewMessageDrivenBeanClassDataModelProvider with the AddMessageDrivenBeanOperation to store the
- * appropriate properties required to generate the new message-driven bean.
- * @see org.eclipse.jst.j2ee.ejb.internal.operations.AddMessageDrivenBeanOperation
- * @see org.eclipse.jst.j2ee.ejb.internal.operations.NewMessageDrivenBeanClassDataModelProvider
- *
- * A WTPJetEmitter bean template is used to create the class with the bean template.
- * @see org.eclipse.jst.j2ee.internal.project.WTPJETEmitter
- * @see org.eclipse.jst.j2ee.ejb.internal.operations.CreateMessageDrivenBeanTemplateModel
- *
- * Subclasses may extend this operation to provide their own specific bean
- * java class generation. The execute method may be extended to do so. Also,
- * generateUsingTemplates is exposed.
- *
- */
-public class NewMessageDrivenBeanClassOperation extends NewEnterpriseBeanClassOperation {
-
- /**
- * folder location of the enterprise bean creation templates directory
- */
- protected static final String TEMPLATE_FILE = "/templates/messageDrivenBean.javajet"; //$NON-NLS-1$
-
-
- /**
- * This is the constructor which should be used when creating a
- * NewMessageDrivenBeanClassOperation. An instance of the NewMessageDrivenBeanClassDataModelProvider
- * should be passed in. This does not accept null parameter. It will not
- * return null.
- *
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- * @see NewMessageDrivenClassDataModel
- *
- * @param dataModel
- * @return NewMessageDrivenClassOperation
- */
- public NewMessageDrivenBeanClassOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- /**
- * Subclasses may extend this method to provide their own template based
- * creation of an annotated bean java class file. This implementation uses
- * the creation of a CreateMessageDrivenBeanTemplateModel and the WTPJetEmitter to
- * create the java class with the annotated tags. This method accepts null
- * for monitor, it does not accept null for fragment. If annotations are not
- * being used the tags will be omitted from the class.
- *
- * @see CreateMessageDrivenBeanTemplateModel
- * @see NewMessageDrivenBeanClassOperation#generateTemplateSource(CreateMessageDrivenBeanTemplateModel,
- * IProgressMonitor)
- *
- * @param monitor
- * @param fragment
- * @throws CoreException
- * @throws WFTWrappedException
- */
- protected void generateUsingTemplates(IProgressMonitor monitor, IPackageFragment fragment) throws WFTWrappedException, CoreException {
- // Create the enterprise bean template model
- CreateMessageDrivenBeanTemplateModel tempModel = createTemplateModel();
- // Using the WTPJetEmitter, generate the java source based on the bean template model
- try {
- if (fragment != null) {
- // Create the session bean java file
- String source = generateTemplateSource(EjbPlugin.getPlugin(), tempModel, TEMPLATE_FILE, monitor);
- String javaFileName = tempModel.getClassName() + DOT_JAVA;
- IFile aFile = createJavaFile(monitor, fragment, source, javaFileName);
- }
- } catch (Exception e) {
- throw new WFTWrappedException(e);
- }
- }
-
- /**
- * This method is intended for internal use only. This method will create an
- * instance of the CreateMessageDrivenBeanTemplate model to be used in conjunction
- * with the WTPJETEmitter. This method will not return null.
- *
- * @see CreateMessageDrivenBeanTemplateModel
- * @see NewMessageDrivenBeanClassOperation#generateUsingTemplates(IProgressMonitor,
- * IPackageFragment)
- *
- * @return CreateBeanTemplateModel
- */
- private CreateMessageDrivenBeanTemplateModel createTemplateModel() {
- return new CreateMessageDrivenBeanTemplateModel(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java
deleted file mode 100644
index 87a2525..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.BUSINESS_INTERFACES;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_BUSINESS_INTERFACE;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_COMPONENT_INTERFACE;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_HOME;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_HOME_INTERFACE;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE_BUSINESS_INTERFACE;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE_COMPONENT_INTERFACE;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE_HOME;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE_HOME_INTERFACE;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.STATE_TYPE;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.JAVA_PACKAGE;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.QUALIFIED_CLASS_NAME;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.j2ee.ejb.internal.operations.BusinessInterface.BusinessInterfaceType;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
-import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class NewSessionBeanClassDataModelProvider extends NewEnterpriseBeanClassDataModelProvider {
-
-
- public static final int STATE_TYPE_STATELESS_INDEX = 0;
- public static final int STATE_TYPE_STATEFUL_INDEX = 1;
-
- private static final String LOCAL_SUFFIX = "Local"; //$NON-NLS-1$
- private static final String REMOTE_SUFFIX = "Remote"; //$NON-NLS-1$
- private static final String LOCAL_HOME_SUFFIX = "LocalHome"; //$NON-NLS-1$
- private static final String REMOTE_HOME_SUFFIX = "RemoteHome"; //$NON-NLS-1$
- private static final String LOCAL_COMPONENT_SUFFIX = "LocalComponent"; //$NON-NLS-1$
- private static final String REMOTE_COMPONENT_SUFFIX = "RemoteComponent"; //$NON-NLS-1$
-
-
- public IDataModelOperation getDefaultOperation() {
- return new AddSessionBeanOperation(getDataModel());
- }
-
- /**
- * Subclasses may extend this method to add their own data model's properties as valid base
- * properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set<String> getPropertyNames() {
- // Add Bean specific properties defined in this data model
- Set<String> propertyNames = (Set<String>) super.getPropertyNames();
-
- propertyNames.add(BUSINESS_INTERFACES);
- propertyNames.add(REMOTE_BUSINESS_INTERFACE);
- propertyNames.add(LOCAL_BUSINESS_INTERFACE);
- propertyNames.add(REMOTE);
- propertyNames.add(LOCAL);
- propertyNames.add(STATE_TYPE);
- propertyNames.add(REMOTE_HOME);
- propertyNames.add(LOCAL_HOME);
- propertyNames.add(REMOTE_HOME_INTERFACE);
- propertyNames.add(LOCAL_HOME_INTERFACE);
- propertyNames.add(LOCAL_COMPONENT_INTERFACE);
- propertyNames.add(REMOTE_COMPONENT_INTERFACE);
-
- return propertyNames;
- }
-
- /**
- * Subclasses may extend this method to provide their own default values for any of the
- * properties in the data model hierarchy. This method does not accept a null parameter. It may
- * return null.
- *
- * @see NewJavaClassDataModelProvider#getDefaultProperty(String)
- * @see IDataModelProvider#getDefaultProperty(String)
- *
- * @param propertyName
- * @return Object default value of property
- */
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(REMOTE_HOME))
- return Boolean.FALSE;
- else if (propertyName.equals(LOCAL_HOME))
- return Boolean.FALSE;
- else if (propertyName.equals(REMOTE))
- return Boolean.FALSE;
- else if (propertyName.equals(LOCAL))
- return Boolean.TRUE;
- else if (propertyName.equals(STATE_TYPE))
- return StateType.STATELESS.toString();
- else if (propertyName.equals(INTERFACES)) {
- List<BusinessInterface> listResult = new ArrayList<BusinessInterface>();
- String className = getStringProperty(QUALIFIED_CLASS_NAME);
- if ((Boolean) getProperty(REMOTE) && className.length() > 0) {
- BusinessInterface remoteInterface = new BusinessInterface(getStringProperty(REMOTE_BUSINESS_INTERFACE), BusinessInterfaceType.REMOTE);
- listResult.add(remoteInterface);
- }
- if ((Boolean) getProperty(LOCAL) && className.length() > 0) {
- BusinessInterface localInterface = new BusinessInterface(getStringProperty(LOCAL_BUSINESS_INTERFACE), BusinessInterfaceType.LOCAL);
- listResult.add(localInterface);
- }
- return listResult;
- }
- else if (REMOTE_BUSINESS_INTERFACE.equals(propertyName)) {
- String className = getStringProperty(QUALIFIED_CLASS_NAME);
- return className + ((className != null && className.length() > 0) ? REMOTE_SUFFIX : "");
- }
- else if (LOCAL_BUSINESS_INTERFACE.equals(propertyName)) {
- String className = getStringProperty(QUALIFIED_CLASS_NAME);
- return className + ((className != null && className.length() > 0) ? LOCAL_SUFFIX : "");
-// return className + ;
- }
- else if (REMOTE_HOME_INTERFACE.equals(propertyName))
- {
- String className = getStringProperty(QUALIFIED_CLASS_NAME);
- return className + REMOTE_HOME_SUFFIX;
- }
- else if (LOCAL_HOME_INTERFACE.equals(propertyName))
- {
- String className = getStringProperty(QUALIFIED_CLASS_NAME);
- return className + LOCAL_HOME_SUFFIX;
- }
- else if (LOCAL_COMPONENT_INTERFACE.equals(propertyName))
- {
- String className = getStringProperty(QUALIFIED_CLASS_NAME);
- return className + LOCAL_COMPONENT_SUFFIX;
- }
- else if (REMOTE_COMPONENT_INTERFACE.equals(propertyName))
- {
- String className = getStringProperty(QUALIFIED_CLASS_NAME);
- return className + REMOTE_COMPONENT_SUFFIX;
- }
- // Otherwise check super for default value for property
- return super.getDefaultProperty(propertyName);
- }
-
- /**
- * Subclasses may extend this method to add their own specific behavior when a certain property
- * in the data model hierarchy is set. This method does not accept null for the property name,
- * but it will for propertyValue. It will not return null. It will return false if the set
- * fails. This implementation verifies the display name is set to the classname, that the
- * annotations is disabled/enabled properly, and that the target project name is determined from
- * the source folder setting.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#propertySet(String,
- * Object)
- *
- * @param propertyName
- * @param propertyValue
- * @return boolean was property set?
- */
- public boolean propertySet(String propertyName, Object propertyValue) {
- // Call super to set the property on the data model
- boolean result = super.propertySet(propertyName, propertyValue);
-
- if (propertyName.equals(REMOTE)) {
- if (!getDataModel().isPropertySet(INTERFACES)) {
- getDataModel().notifyPropertyChange(INTERFACES, IDataModel.DEFAULT_CHG);
- getDataModel().notifyPropertyChange(REMOTE_BUSINESS_INTERFACE, IDataModel.VALUE_CHG);
- }else{
- updateBusinessInterfaces(REMOTE);
- }
-
- }
- if (propertyName.equals(LOCAL) && !getDataModel().isPropertySet(INTERFACES)) {
- getDataModel().notifyPropertyChange(INTERFACES, IDataModel.DEFAULT_CHG);
- getDataModel().notifyPropertyChange(LOCAL_BUSINESS_INTERFACE, IDataModel.VALUE_CHG);
- // TODO - ccc- shouldn't there be an updateBusinessInterfaces(LOCAL) here?
- }
- if (REMOTE_BUSINESS_INTERFACE.equals(propertyName))
- {
- if(getRemoteProperty() != null){
- getRemoteProperty().setFullyQualifiedName(propertyValue.toString());
- }
- }
- else if (LOCAL_BUSINESS_INTERFACE.equals(propertyName))
- {
- if(getLocalProperty() != null){
- getLocalProperty().setFullyQualifiedName(propertyName);
- }
-
- }
- else if (CLASS_NAME.equals(propertyName) || JAVA_PACKAGE.equals(propertyName))
- {
- IDataModel dataModel = getDataModel();
- String className = getStringProperty(QUALIFIED_CLASS_NAME);
- BusinessInterface remoteInterface = getRemoteProperty();
- if (remoteInterface != null)
- {
- remoteInterface.setFullyQualifiedName(className + REMOTE_SUFFIX);
- dataModel.notifyPropertyChange(REMOTE_BUSINESS_INTERFACE, IDataModel.DEFAULT_CHG);
- }
- BusinessInterface localInterface = getLocalProperty();
- if (localInterface != null)
- {
- localInterface.setFullyQualifiedName(className + LOCAL_SUFFIX);
- dataModel.notifyPropertyChange(LOCAL_BUSINESS_INTERFACE, IDataModel.DEFAULT_CHG);
- }
- dataModel.notifyPropertyChange(REMOTE_HOME_INTERFACE, IDataModel.DEFAULT_CHG);
- dataModel.notifyPropertyChange(LOCAL_HOME_INTERFACE, IDataModel.DEFAULT_CHG);
- dataModel.notifyPropertyChange(REMOTE_COMPONENT_INTERFACE, IDataModel.DEFAULT_CHG);
- dataModel.notifyPropertyChange(LOCAL_COMPONENT_INTERFACE, IDataModel.DEFAULT_CHG);
- }
-
- return result;
- }
-
- @Override
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- if (propertyName.equals(STATE_TYPE)) {
- return DataModelPropertyDescriptor.createDescriptors(
- new String[] {
- StateType.STATELESS.toString(),
- StateType.STATEFUL.toString()
- },
- new String[] {
- EJBCreationResourceHandler.STATE_TYPE_STATELESS,
- EJBCreationResourceHandler.STATE_TYPE_STATEFUL
- });
- }
-
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- private void updateBusinessInterfaces(String propertyName) {
- List<BusinessInterface> list = (List<BusinessInterface>) getProperty(INTERFACES);
- if (propertyName.equals(REMOTE)) {
- if (getBooleanProperty(propertyName)) {
- // should be add remote property
- list.add(new BusinessInterface(getStringProperty(REMOTE_BUSINESS_INTERFACE), BusinessInterfaceType.REMOTE));
- } else {
- BusinessInterface remoteInterface = getRemoteProperty();
- int indexOf = list.indexOf(remoteInterface);
- list.remove(indexOf);
- }
- } else if (propertyName.equals(LOCAL)) {
- if (getBooleanProperty(propertyName)) {
- // should be add remote property
- String className = Signature.getSimpleName(getStringProperty(CLASS_NAME));
- list.add(new BusinessInterface(getStringProperty(LOCAL_BUSINESS_INTERFACE), BusinessInterfaceType.LOCAL));
- } else {
- BusinessInterface localInterface = getLocalProperty();
- int indexOf = list.indexOf(localInterface);
- list.remove(indexOf);
- }
- }
- }
-
- private BusinessInterface getRemoteProperty() {
- List<BusinessInterface> businessInterfaces = (List<BusinessInterface>) getProperty(INTERFACES);
- for (BusinessInterface iface : businessInterfaces) {
- if ((iface.getJavaType() == null) && (iface.isRemote())) {
- return iface;
- }
- }
- return null;
- }
- private BusinessInterface getLocalProperty() {
- List<BusinessInterface> businessInterfaces = (List<BusinessInterface>) getProperty(INTERFACES);
- for (BusinessInterface iface : businessInterfaces) {
- if ((iface.getJavaType() == null) && (iface.isLocal())) {
- return iface;
- }
- }
- return null;
- }
-
- @Override
- public IStatus validate(String propertyName) {
- IStatus status = null;
-
- if (LOCAL_BUSINESS_INTERFACE.equals(propertyName)) {
- if (model.getBooleanProperty(LOCAL)) {
- return validateEjbInterface(getStringProperty(propertyName));
- }
- } else if (REMOTE_BUSINESS_INTERFACE.equals(propertyName)) {
- if (model.getBooleanProperty(REMOTE)) {
- return validateEjbInterface(getStringProperty(propertyName));
- }
- } else if (LOCAL_COMPONENT_INTERFACE.equals(propertyName) ||
- REMOTE_COMPONENT_INTERFACE.equals(propertyName) ||
- LOCAL_HOME_INTERFACE.equals(propertyName) ||
- REMOTE_HOME_INTERFACE.equals(propertyName)) {
- return validateComponentHomeInterfaces();
- }
-
- return super.validate(propertyName);
- }
-
- protected IStatus validateEjbInterface(String fullyQualifiedName) {
- IStatus status = validateJavaTypeName(fullyQualifiedName);
- if (status.getSeverity() != IStatus.ERROR) {
- IStatus existsStatus = canCreateTypeInClasspath(
- Signature.getQualifier(fullyQualifiedName),
- Signature.getSimpleName(fullyQualifiedName));
- if (existsStatus.matches(IStatus.ERROR | IStatus.WARNING))
- status = existsStatus;
- }
- return status;
- }
-
- protected IStatus validateComponentHomeInterfaces() {
- IStatus result = Status.OK_STATUS;
- String projectName = getStringProperty(PROJECT_NAME);
- if (projectName != null && projectName.length() > 0) {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- IJavaProject javaProject = JavaCore.create(project);
- try {
- if (getBooleanProperty(REMOTE_HOME)) {
- String remoteHomeInterface = getStringProperty(REMOTE_HOME_INTERFACE);
- String remoteComponentInterface = getStringProperty(REMOTE_COMPONENT_INTERFACE);
- result = validate2xInterfaces(javaProject, remoteHomeInterface, remoteComponentInterface, false);
- if (!result.isOK()){
- return result;
- }
- if (result.isOK()) {
- IType findType = javaProject.findType(remoteHomeInterface);
- if (findType == null || !findType.exists()) {
- result = validateEjbInterface(remoteHomeInterface);
- }
- findType = javaProject.findType(remoteComponentInterface);
- if ((findType == null || !findType.exists()) && result.isOK()) {
- result = validateEjbInterface(remoteComponentInterface);
- }
- }
- }
-
- if (getBooleanProperty(LOCAL_HOME)) {
- String localHomeInterface = getStringProperty(LOCAL_HOME_INTERFACE);
- String localComponentInterface = getStringProperty(LOCAL_COMPONENT_INTERFACE);
- result = validate2xInterfaces(javaProject, localHomeInterface, localComponentInterface, true);
- if (result.isOK()) {
- IType findType = javaProject.findType(localHomeInterface);
- if (findType == null || !findType.exists()) {
- result = validateEjbInterface(localHomeInterface);
- }
- findType = javaProject.findType(localComponentInterface);
- if ((findType == null || !findType.exists()) && result.isOK()) {
- result = validateEjbInterface(localComponentInterface);
- }
- }
- }
- } catch (JavaModelException e) {
- return WTPCommonPlugin.createErrorStatus(NLS.bind(
- EJBCreationResourceHandler.ERR_COULD_NOT_RESOLVE_INTERFACE,
- new Object[] { e.getMessage() }));
- }
- }
- return result;
- }
-
- private IStatus validate2xInterfaces(IJavaProject javaProject, String rhI, String rI, boolean isLocal) throws JavaModelException {
-
- IType home = javaProject.findType(rhI);
- IType component = javaProject.findType(rI);
-
- if (home != null &&
- (!home.isInterface() ||
- !hasRequiredElementInSignature(home.getSuperInterfaceTypeSignatures(), new String[] { isLocal ? "EJBLocalHome" : "EJBHome" }))) {
- String msg = (isLocal) ? EJBCreationResourceHandler.ERR_LOCAL_HOME_NOT_INTERFACE : EJBCreationResourceHandler.ERR_REMOTE_HOME_NOT_INTERFACE;
- return new Status(IStatus.ERROR, EjbPlugin.PLUGIN_ID, msg);
- }
-
- if (component != null &&
- (!component.isInterface()
- || !hasRequiredElementInSignature(component.getSuperInterfaceTypeSignatures(), new String[] { isLocal ? "EJBLocalObject" : "EJBObject" }))) {
- String msg = (isLocal) ? EJBCreationResourceHandler.ERR_LOCAL_COMPONENT_NOT_INTERFACE : EJBCreationResourceHandler.ERR_REMOTE_COMPONENT_NOT_INTERFACE;
- return new Status(IStatus.ERROR, EjbPlugin.PLUGIN_ID, msg);
- }
-
- if (home == null){
- return Status.OK_STATUS;
- }
-
-
- IMethod createMehod = home.getMethod("create", null);
- if (createMehod == null || !createMehod.exists() || !hasRequiredElementInSignature(createMehod.getExceptionTypes(), new String[]{"CreateException", "RemoteException"})){
- String msg = (isLocal) ? EJBCreationResourceHandler.ERR_LOCAL_HOME_MISSING_CREATE_METHOD: EJBCreationResourceHandler.ERR_REMOTE_HOME_MISSING_CREATE_METHOD;
- return new Status(IStatus.ERROR, EjbPlugin.PLUGIN_ID, msg);
- }
-
- if (component == null && !rI.endsWith("."+Signature.getSignatureSimpleName(createMehod.getReturnType()))){
- String msg = (isLocal) ? EJBCreationResourceHandler.ERR_LOCAL_HOME_CREATE_METHOD_RETURN_TYPE_INVALID: EJBCreationResourceHandler.ERR_REMOTE_HOME_CREATE_METHOD_RETURN_TYPE_INVALID;
- return new Status(IStatus.ERROR, EjbPlugin.PLUGIN_ID, msg);
- }
- if (!component.getElementName().equals(Signature.getSignatureSimpleName(createMehod.getReturnType()))){
- String msg = (isLocal) ? EJBCreationResourceHandler.ERR_LOCAL_HOME_CREATE_METHOD_RETURN_TYPE_INVALID: EJBCreationResourceHandler.ERR_REMOTE_HOME_CREATE_METHOD_RETURN_TYPE_INVALID;
- return new Status(IStatus.ERROR, EjbPlugin.PLUGIN_ID, msg);
- }
- return Status.OK_STATUS;
- }
-
- private boolean hasRequiredElementInSignature(String[] allElementNames, String[] wanted) {
- if (allElementNames == null || allElementNames.length == 0){
- return false;
- }
- int found = 0;
- for (int j = 0; j < wanted.length; j++) {
- if(wanted[j] == null){
- continue;
- }
- for (int i = 0; i < allElementNames.length; i++) {
- if(allElementNames[i] == null){
- continue;
- }
- if(wanted[j].equals(Signature.toString(allElementNames[i]))){
- found++;
- if (found == wanted.length){
- return true;
- }
- break;
- }
-
- }
-
- }
- return false;
- }
-
- protected IStatus validateJavaTypeName(String className) {
- // Check Java class name by standard java conventions
- IStatus javaStatus = JavaConventions.validateJavaTypeName(className);
- if (javaStatus.getSeverity() == IStatus.ERROR) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_INVALID + javaStatus.getMessage();
- return WTPCommonPlugin.createErrorStatus(msg);
- } else if (javaStatus.getSeverity() == IStatus.WARNING) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_WARNING + javaStatus.getMessage();
- return WTPCommonPlugin.createWarningStatus(msg);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassOperation.java
deleted file mode 100644
index 9ccf2aa..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassOperation.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_HOME;
-import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE_HOME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.JAVA_PACKAGE;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.codegen.jet.JETException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.project.EJBUtilities;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-
-/**
- * The NewSessionBeanClassOperation is an IDataModelOperation following the
- * IDataModel wizard and operation framework.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * It extends ArtifactEditProviderOperation to provide enterprise bean specific java
- * class generation.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * This operation is used by the AddSessionBeanOperation to generate an
- * non annotated java class for an added enterprise bean. It shares the
- * NewSessionBeanClassDataModelProvider with the AddSessionBeanOperation to store the
- * appropriate properties required to generate the new enterprise bean.
- * @see org.eclipse.jst.j2ee.ejb.internal.operations.AddSessionBeanOperation
- * @see org.eclipse.jst.j2ee.ejb.internal.operations.NewSessionBeanClassDataModelProvider
- *
- * A WTPJetEmitter bean template is used to create the class with the bean template.
- * @see org.eclipse.jst.j2ee.internal.project.WTPJETEmitter
- * @see org.eclipse.jst.j2ee.ejb.internal.operations.CreateSessionBeanTemplateModel
- *
- * Subclasses may extend this operation to provide their own specific bean
- * java class generation. The execute method may be extended to do so. Also,
- * generateUsingTemplates is exposed.
- *
- */
-public class NewSessionBeanClassOperation extends NewEnterpriseBeanClassOperation {
-
- /**
- * folder location of the enterprise bean creation templates directory
- */
- protected static final String TEMPLATE_FILE = "/templates/sessionBean.javajet"; //$NON-NLS-1$
-
- protected static final String TEMPLATE_LOCAL_FILE = "/templates/localBusinessInterface.javajet"; //$NON-NLS-1$
- protected static final String TEMPLATE_REMOTE_FILE = "/templates/remoteBusinessInterface.javajet"; //$NON-NLS-1$
-
- protected static final String TEMPLATE_LOCALHOME_FILE = "/templates/localHomeInterface.javajet"; //$NON-NLS-1$
- protected static final String TEMPLATE_REMOTEHOME_FILE = "/templates/remoteHomeInterface.javajet"; //$NON-NLS-1$
-
- protected static final String TEMPLATE_LOCALCOMPONENT_FILE = "/templates/localComponentInterface.javajet"; //$NON-NLS-1$
- protected static final String TEMPLATE_REMOTECOMPONENT_FILE = "/templates/remoteComponentInterface.javajet"; //$NON-NLS-1$
-
- protected IPackageFragment clientPack;
- protected IPackageFragment pack;
-
- /**
- * This is the constructor which should be used when creating a
- * NewSessionBeanClassOperation. An instance of the NewSessionBeanClassDataModelProvider
- * should be passed in. This does not accept null parameter. It will not
- * return null.
- *
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- * @see NewBeansClassDataModel
- *
- * @param dataModel
- * @return NewBeanClassOperation
- */
- public NewSessionBeanClassOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- /**
- * Subclasses may extend this method to add their own actions during
- * execution. The implementation of the execute method drives the running of
- * the operation. This implementation will create the java source folder,
- * create the java package, and then the enterprise bean java class file will be created
- * using templates. Optionally, subclasses may extend the
- * generateUsingTemplates or createJavaFile method rather than extend the
- * execute method. This method will accept a null parameter.
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- * @see NewSessionBeanClassOperation#generateUsingTemplates(IProgressMonitor,
- * IPackageFragment)
- *
- * @param monitor
- * @throws CoreException
- * @throws InterruptedException
- * @throws InvocationTargetException
- */
- public IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // Retrieve the package name from the java class data model
- String packageName = model.getStringProperty(JAVA_PACKAGE);
- // Create java package if it does not exist
- pack = createJavaPackage(packageName);
- if (hasInterfacesToGenerate() && EJBUtilities.hasEJBClientJARProject(getTargetProject())) {
- createJavaSourceFolderInClientJar();
- clientPack = createJavaPackageInClientJar(packageName);
- }
-
- return super.doExecute(monitor, info);
- }
-
- @Override
- protected void generateUsingTemplates(IProgressMonitor monitor, IPackageFragment fragment)
- throws WFTWrappedException, CoreException {
- this.generateUsingTemplates(monitor, pack, clientPack);
- }
-
- /**
- * Subclasses may extend this method to provide their own template based
- * creation of an annotated bean java class file. This implementation uses
- * the creation of a CreateSessionBeanTemplateModel and the WTPJetEmitter to
- * create the java class with the annotated tags. This method accepts null
- * for monitor, it does not accept null for fragment. If annotations are not
- * being used the tags will be omitted from the class.
- *
- * @see CreateSessionBeanTemplateModel
- * @see NewSessionBeanClassOperation#generateTemplateSource(CreateSessionBeanTemplateModel,
- * IProgressMonitor)
- *
- * @param monitor
- * @param fragment
- * @throws CoreException
- * @throws WFTWrappedException
- */
- protected void generateUsingTemplates(IProgressMonitor monitor, IPackageFragment fragment, IPackageFragment clientFragment) throws WFTWrappedException, CoreException {
- // Create the enterprise bean template model
- CreateSessionBeanTemplateModel tempModel = createTemplateModel();
- IProject project = getTargetProject();
- // Using the WTPJetEmitter, generate the java source based on the bean template model
- try {
- if (fragment != null) {
- if (hasInterfacesToGenerate() && EJBUtilities.hasEJBClientJARProject(getTargetProject())) {
- generateInterfacesUsingTemplates(monitor, clientFragment, tempModel);
- } else {
- generateInterfacesUsingTemplates(monitor, fragment, tempModel);
- }
-
- // Create the session bean java file
- String source = generateTemplateSource(EjbPlugin.getPlugin(), tempModel, TEMPLATE_FILE, monitor);
- String javaFileName = tempModel.getClassName() + DOT_JAVA;
- IFile aFile = createJavaFile(monitor, fragment, source, javaFileName);
- }
- } catch (Exception e) {
- throw new WFTWrappedException(e);
- }
- }
-
- protected void generateInterfacesUsingTemplates(IProgressMonitor monitor, IPackageFragment fragment, CreateSessionBeanTemplateModel tempModel) throws JETException, JavaModelException {
- boolean useClientJar = EJBUtilities.hasEJBClientJARProject(getTargetProject());
- List<BusinessInterface> interfaces = tempModel.getBusinessInterfaces();
- for (BusinessInterface iface : interfaces) {
- if (!iface.exists()) {
- tempModel.setCurrentBusinessInterface(iface);
- if (iface.isLocal()) {
- // Create the java files for the non-exising Local Business interfaces
- String src = generateTemplateSource(EjbPlugin.getPlugin(), tempModel, TEMPLATE_LOCAL_FILE, monitor);
- String fileName = iface.getSimpleName() + DOT_JAVA;
- createJavaFile(monitor, getPackageFragment(useClientJar, iface.getFullyQualifiedName()), src, fileName);
- } else if (iface.isRemote()) {
- // Create the java files for the non-exising Remote Business interfaces
- String src = generateTemplateSource(EjbPlugin.getPlugin(), tempModel, TEMPLATE_REMOTE_FILE, monitor);
- String fileName = iface.getSimpleName() + DOT_JAVA;
- createJavaFile(monitor, getPackageFragment(useClientJar, iface.getFullyQualifiedName()), src, fileName);
- }
- }
- }
-
- // Create the EJB 2.x compatible Remote Home and Component interface java files
- if (model.getBooleanProperty(REMOTE_HOME)) {
- String remoteFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.REMOTE_HOME_INTERFACE);
- String remoteComponentFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.REMOTE_COMPONENT_INTERFACE);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(model.getStringProperty(INewSessionBeanClassDataModelProperties.PROJECT_NAME));
- IJavaProject javaProject = JavaCore.create(project);
- IType type = javaProject.findType(remoteFullName);
-
- IPackageFragment remoteFragment = null;
- String fileName = Signature.getSimpleName(remoteFullName)+ DOT_JAVA;
-
- tempModel.setRemoteHomeClassName(remoteFullName);
- tempModel.setRemoteComponentClassName(remoteComponentFullName);
- String src = "";
- if(type == null){
- remoteFragment = getPackageFragment(useClientJar, remoteFullName);
- src = generateTemplateSource(EjbPlugin.getPlugin(), tempModel, TEMPLATE_REMOTEHOME_FILE, monitor);
- createJavaFile(monitor, remoteFragment, src, fileName);
- }
-
- String fileComponentName = Signature.getSimpleName(remoteComponentFullName)+ DOT_JAVA;
-
- type = javaProject.findType(remoteComponentFullName);
- if(type == null){
- IPackageFragment remoteComponentFragment = getPackageFragment(useClientJar, remoteComponentFullName);
- src = generateTemplateSource(EjbPlugin.getPlugin(), tempModel, TEMPLATE_REMOTECOMPONENT_FILE, monitor);
- createJavaFile(monitor, remoteComponentFragment, src, fileComponentName);
- }
- }
-
- // Create the EJB 2.x compatible Local Home and Component interface java files
- if (model.getBooleanProperty(LOCAL_HOME)) {
- String localFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.LOCAL_HOME_INTERFACE);
- String localComponentFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.LOCAL_COMPONENT_INTERFACE);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(model.getStringProperty(INewSessionBeanClassDataModelProperties.PROJECT_NAME));
- IJavaProject javaProject = JavaCore.create(project);
- IType type = javaProject.findType(localFullName);
-
- IPackageFragment localFragment = null;
- String fileName = Signature.getSimpleName(localFullName)+ DOT_JAVA;
- tempModel.setLocalHomeClassName(localFullName);
- tempModel.setLocalComponentClassName(localComponentFullName);
-
- String src = "";
- if(type == null){
- localFragment = getPackageFragment(useClientJar, localFullName);
- src = generateTemplateSource(EjbPlugin.getPlugin(), tempModel, TEMPLATE_LOCALHOME_FILE, monitor);
- createJavaFile(monitor, localFragment, src, fileName);
- }
-
- String fileComponentName = Signature.getSimpleName(localComponentFullName)+ DOT_JAVA;
-
- type = javaProject.findType(localComponentFullName);
- if(type == null){
- IPackageFragment localComponentFragment = getPackageFragment(useClientJar, localComponentFullName);
- src = generateTemplateSource(EjbPlugin.getPlugin(), tempModel, TEMPLATE_LOCALCOMPONENT_FILE, monitor);
- createJavaFile(monitor, localComponentFragment, src, fileComponentName);
- }
- }
- }
-
- protected IPackageFragment getPackageFragment(boolean useClientJar, String fullName) {
- IPackageFragment fragment;
- String packageName = Signature.getQualifier(fullName);
- if (useClientJar) {
- fragment = createJavaPackageInClientJar(packageName);
- }
- else
- {
- fragment = createJavaPackage(packageName);
- }
- return fragment;
- }
-
- protected IFolder createJavaSourceFolderInClientJar() {
- // Get the source folder name from the data model
- IFolder folder = getClientSourceFolder();
- // If folder does not exist, create the folder with the specified path
- if (!folder.exists()) {
- try {
- folder.create(true, true, null);
- } catch (CoreException e) {
- EjbPlugin.getDefault().getLogger().logError(e);
- }
- }
- // Return the source folder
- return folder;
- }
-
- protected IPackageFragment createJavaPackageInClientJar(String packageName) {
- IPackageFragmentRoot packRoot = getClientPackageFragmentRoot();
-
- IPackageFragment pack = packRoot.getPackageFragment(packageName);
- // Handle default package
- if (pack == null) {
- pack = packRoot.getPackageFragment(""); //$NON-NLS-1$
- }
-
- // Create the package fragment if it does not exist
- if (!pack.exists()) {
- String packName = pack.getElementName();
- try {
- pack = packRoot.createPackageFragment(packName, true, null);
- } catch (JavaModelException e) {
- EjbPlugin.getDefault().getLogger().logError(e);
- }
- }
- // Return the package
- return pack;
- }
-
- /**
- * This method is intended for internal use only. This method will create an
- * instance of the CreateSessionBeanTemplate model to be used in conjunction
- * with the WTPJETEmitter. This method will not return null.
- *
- * @see CreateSessionBeanTemplateModel
- * @see NewSessionBeanClassOperation#generateUsingTemplates(IProgressMonitor,
- * IPackageFragment)
- *
- * @return CreateBeanTemplateModel
- */
- private CreateSessionBeanTemplateModel createTemplateModel() {
- // Create the CreateBeanTemplateModel instance with the new bean
- // class data model
- CreateSessionBeanTemplateModel templateModel = new CreateSessionBeanTemplateModel(model);
- return templateModel;
- }
-
- private boolean hasInterfacesToGenerate() {
- List<BusinessInterface> businessInterfaces = (List<BusinessInterface>) model.getProperty(INTERFACES);
- boolean remoteHome = model.getBooleanProperty(REMOTE_HOME);
- boolean localHome = model.getBooleanProperty(LOCAL_HOME);
- return businessInterfaces.size() > 0 || remoteHome || localHome;
- }
-
- private IFolder getClientSourceFolder() {
- IFolder folder = getSourceFolder();
- IPath folderRelativePath = folder.getProjectRelativePath();
- IPath clientProjectPath = EJBUtilities.getEJBClientJar(getTargetProject()).getProject().getFullPath();
- return ResourcesPlugin.getWorkspace().getRoot().getFolder(clientProjectPath.append(folderRelativePath));
- }
-
- private IPackageFragmentRoot getClientPackageFragmentRoot() {
- IFolder folder = getClientSourceFolder();
-
- IProject clientProject = EJBUtilities.getEJBClientJar(getTargetProject()).getProject();
- IJavaProject clientJavaProject = JavaCore.create(clientProject);
- return clientJavaProject.getPackageFragmentRoot(folder);
- }
-
- /**
- * This method will return the java package as specified by the new java
- * class data model. If the package does not exist, it will create the
- * package. This method should not return null.
- *
- * @see INewJavaClassDataModelProperties#JAVA_PACKAGE
- * @see IPackageFragmentRoot#createPackageFragment(java.lang.String,
- * boolean, org.eclipse.core.runtime.IProgressMonitor)
- *
- * @return IPackageFragment the java package
- */
- protected IPackageFragment createJavaPackage(String packageName) {
- IPackageFragmentRoot packRoot = (IPackageFragmentRoot) model.getProperty(JAVA_PACKAGE_FRAGMENT_ROOT);
- IPackageFragment pack = packRoot.getPackageFragment(packageName);
- // Handle default package
- if (pack == null) {
- pack = packRoot.getPackageFragment(""); //$NON-NLS-1$
- }
-
- // Create the package fragment if it does not exist
- if (!pack.exists()) {
- String packName = pack.getElementName();
- try {
- pack = packRoot.createPackageFragment(packName, true, null);
- } catch (JavaModelException e) {
- J2EEPlugin.logError(e);
- }
- }
- // Return the package
- return pack;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/StateType.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/StateType.java
deleted file mode 100644
index 8b7b6d2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/StateType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-/**
- * Enumerates the session state type values of a session bean.
- */
-public enum StateType {
-
- /**
- * Represents the <code>Stateless</code> session state type.
- */
- STATELESS,
-
- /**
- * Represents the <code>Stateful</code> session state type.
- */
- STATEFUL;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/TransactionType.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/TransactionType.java
deleted file mode 100644
index 3181fb6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/TransactionType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.operations;
-
-/**
- * Enumerates the transaction type values of an enterprise bean.
- */
-public enum TransactionType {
-
- /**
- * Represents the <code>Container</code> transaction type.
- */
- CONTAINER,
-
- /**
- * Represents the <code>Bean</code> transaction type.
- */
- BEAN;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/Assert.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/Assert.java
deleted file mode 100644
index 1b612d1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/Assert.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.plugin;
-
-/**
- * <code>Assert</code> is useful for for embedding runtime sanity checks
- * in code.
- * The predicate methods all test a condition and throw some
- * type of unchecked exception if the condition does not hold.
- * <p>
- * Assertion failure exceptions, like most runtime exceptions, are
- * thrown when something is misbehaving. Assertion failures are invariably
- * unspecified behavior; consequently, clients should never rely on
- * these being thrown (and certainly should not being catching them
- * specifically).
- * </p>
- */
-public final class Assert {
- /* This class is not intended to be instantiated. */
- private Assert() {
- // not allowed
- }
-
- /** Asserts that an argument is legal. If the given boolean is
- * not <code>true</code>, an <code>IllegalArgumentException</code>
- * is thrown.
- *
- * @param expression the outcode of the check
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- * @exception IllegalArgumentException if the legality test failed
- */
- public static boolean isLegal(boolean expression) {
- return isLegal(expression, ""); //$NON-NLS-1$
- }
-
- /** Asserts that an argument is legal. If the given boolean is
- * not <code>true</code>, an <code>IllegalArgumentException</code>
- * is thrown.
- * The given message is included in that exception, to aid debugging.
- *
- * @param expression the outcode of the check
- * @param message the message to include in the exception
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- * @exception IllegalArgumentException if the legality test failed
- */
- public static boolean isLegal(boolean expression, String message) {
- if (!expression)
- throw new IllegalArgumentException(message);
- return expression;
- }
-
- /** Asserts that the given object is not <code>null</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- *
- * @param object the value to test
- * @exception IllegalArgumentException if the object is <code>null</code>
- */
- public static void isNotNull(Object object) {
- isNotNull(object, ""); //$NON-NLS-1$
- }
-
- /** Asserts that the given object is not <code>null</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- * The given message is included in that exception, to aid debugging.
- *
- * @param object the value to test
- * @param message the message to include in the exception
- * @exception IllegalArgumentException if the object is <code>null</code>
- */
- public static void isNotNull(Object object, String message) {
- if (object == null)
- throw new AssertionFailedException("null argument:" + message); //$NON-NLS-1$
- }
-
- /** Asserts that the given boolean is <code>true</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- *
- * @param expression the outcode of the check
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- */
- public static boolean isTrue(boolean expression) {
- return isTrue(expression, ""); //$NON-NLS-1$
- }
-
- /** Asserts that the given boolean is <code>true</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- * The given message is included in that exception, to aid debugging.
- *
- * @param expression the outcode of the check
- * @param message the message to include in the exception
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- */
- public static boolean isTrue(boolean expression, String message) {
- if (!expression)
- throw new AssertionFailedException("assertion failed: " + message); //$NON-NLS-1$
- return expression;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/AssertionFailedException.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/AssertionFailedException.java
deleted file mode 100644
index d1325e6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/AssertionFailedException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.plugin;
-
-/**
- * <code>AssertionFailedException</code> is a runtime exception thrown
- * by some of the methods in <code>Assert</code>.
- * <p>
- * This class is not declared public to prevent some misuses; programs that catch
- * or otherwise depend on assertion failures are susceptible to unexpected
- * breakage when assertions in the code are added or removed.
- * </p>
- */
-/* package */
-class AssertionFailedException extends RuntimeException {
- /**
- * All serializable objects should have a stable serialVersionUID
- */
- private static final long serialVersionUID = 1L;
-
- /** Constructs a new exception with the given message.
- */
- public AssertionFailedException(String detail) {
- super(detail);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/EjbModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/EjbModuleExtensionImpl.java
deleted file mode 100644
index 608feea..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/EjbModuleExtensionImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 29, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.ejb.internal.plugin;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.internal.modulecore.util.EJBArtifactEditUtilities;
-import org.eclipse.jst.j2ee.internal.archive.operations.ImportOption;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbClientJarCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbClientProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbClientProjectCreationOperation;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.IEjbClientProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleExtensionImpl;
-import org.eclipse.jst.j2ee.internal.moduleextension.EjbModuleExtension;
-import org.eclipse.jst.j2ee.internal.project.IJ2EEProjectTypes;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public class EjbModuleExtensionImpl extends EarModuleExtensionImpl implements EjbModuleExtension {
-
- public EjbModuleExtensionImpl() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EjbModuleExtension#initializeEjbReferencesToModule(org.eclipse.jst.j2ee.internal.internal.j2eeproject.J2EENature)
- */
-// public void initializeEjbReferencesToModule(J2EENature nature, UpdateModuleReferencesInEARProjectCommand cmd) {
-//
-// IVirtualComponent[] comps = ComponentUtilities.getComponentsForProject(nature.getProject());
-// if (comps.length == 0)
-// return;
-// EJBArtifactEdit edit = EJBArtifactEdit.getEJBArtifactEditForRead(comps[0]);
-// boolean foundRef = false;
-// try {
-// EJBJar jar = edit.getEJBJar();
-// if (jar != null) {
-// List ejbs = jar.getEnterpriseBeans();
-// int size = ejbs.size();
-// EnterpriseBean ejb;
-// for (int i = 0; i < size; i++) {
-// ejb = (EnterpriseBean) ejbs.get(i);
-// foundRef = foundRef || cmd.initializeEjbReferencesToModule(ejb.getEjbRefs());
-// foundRef = foundRef || cmd.initializeEjbReferencesToModule(ejb.getEjbLocalRefs());
-// }
-// }
-// if (foundRef)
-// cmd.addNestedEditModel((J2EEEditModel)edit.getAdapter(ArtifactEditModel.class));
-// } finally {
-// if (edit != null)
-// edit.dispose();
-// }
-// }
-
- public EJBJar getEJBJar(IProject aProject) {
-
- IVirtualComponent comp = ComponentCore.createComponent(aProject);
- return EJBArtifactEditUtilities.getEJBJar(comp);
- }
-
- public IProject getDefinedEJBClientJARProject(IProject anEJBProject) {
- IVirtualComponent comp = ComponentCore.createComponent(anEJBProject);
- EJBArtifactEdit edit = null;
- IVirtualComponent clientComp = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(comp);
- clientComp = edit.getEJBClientJarModule();
- } finally {
- if (edit != null)
- edit.dispose();
- }
- if (clientComp == null)
- return null;
- return clientComp.getProject();
- }
-
- public IDataModelOperation createEJBClientJARProject(
- final String clientProjectName,
- final String srcFolderName,
- final String ejbProjectName,
- final String earProjectName,
- final org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime){
-
- IDataModel dm = DataModelFactory.createDataModel(new EjbClientProjectCreationDataModelProvider());
- dm.setProperty(IEjbClientProjectCreationDataModelProperties.PROJECT_NAME,
- clientProjectName );
-
- dm.setProperty(IEjbClientProjectCreationDataModelProperties.EJB_PROJECT_NAME,
- ejbProjectName );
-
- dm.setProperty(IEjbClientProjectCreationDataModelProperties.SOURCE_FOLDER,
- srcFolderName );
-
- dm.setProperty(IEjbClientProjectCreationDataModelProperties.EAR_PROJECT_NAME,
- earProjectName );
-
- dm.setProperty(IEjbClientProjectCreationDataModelProperties.RUNTIME,
- runtime );
-
- EjbClientProjectCreationOperation op = new EjbClientProjectCreationOperation(dm);
- return op;
- }
-
- public IDataModelOperation createEJBClientJARProject(IProject ejbProject){
- IDataModel dm = DataModelFactory.createDataModel( new EjbClientJarCreationDataModelProvider());
- dm.setStringProperty(EjbClientJarCreationDataModelProvider.EJB_PROJECT_NAME, ejbProject.getName());
- return dm.getDefaultOperation();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createProjectDataModel()
- */
- public IDataModel createProjectDataModel() {
- //IDataModel model = DataModelFactory.createDataModel(new EjbComponentCreationDataModelProvider());
-
- // Added this property so Application Creation Wizard, will not create a
- // EJB client jar, when a EJB module is created.
- //model.setProperty(IEjbComponentCreationDataModelProperties.CREATE_CLIENT, Boolean.FALSE);
-
- // Override the default to not create a default session bean.
- // This is necessary when creating a default EJB project from an EAR project wizard.
- //model.setProperty(IEjbComponentCreationDataModelProperties.CREATE_DEFAULT_SESSION_BEAN, Boolean.FALSE);
-
-
- IDataModel model = DataModelFactory.createDataModel(new EjbFacetProjectCreationDataModelProvider());
- return model;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createImportDataModel()
- */
- public IDataModel createImportDataModel() {
- return DataModelFactory.createDataModel(new EJBComponentImportDataModelProvider());
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createProjectCreationOperation(com.ibm.etools.archive.ear.operations.ImportOption)
- */
- public IDataModelOperation createProjectCreationOperation(ImportOption option) {
- if (option.getArchiveType() == IJ2EEProjectTypes.EJB_CLIENT) {
- IDataModel model = option.getModel();
- model.setProperty(IEjbFacetInstallDataModelProperties.CREATE_CLIENT, Boolean.TRUE);
- return createProjectCreationOperation(model);
- }
- return super.createProjectCreationOperation(option);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/EjbPlugin.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/EjbPlugin.java
deleted file mode 100644
index 7ee1e30..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/EjbPlugin.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.plugin;
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.internal.boot.PlatformURLConnection;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * This is a top-level class of the j2ee plugin.
- *
- * @see AbstractUIPlugin for additional information on UI plugins
- */
-public class EjbPlugin extends WTPPlugin implements ResourceLocator {
- // Default instance of the receiver
- private static EjbPlugin inst;
- protected final IPath iconsFolder = new Path(Platform.getBundle(PLUGIN_ID).getEntry("icons").getPath());//$NON-NLS-1$
- // Links View part of the plugin
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.ejb";//$NON-NLS-1$
- private static IPath location;
-
- /**
- * Create the J2EE plugin and cache its default instance
- */
- public EjbPlugin() {
- super();
- if (inst == null)
- inst = this;
- }
-
- /**
- * Get the plugin singleton.
- */
- static public EjbPlugin getDefault() {
- return inst;
- }
-
- /*
- * Javadoc copied from interface.
- */
- public URL getBaseURL() {
- return getBundle().getEntry("/");
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public Object getImage(String key) {
- return J2EEPlugin.getImageURL(key, getBundle());
- }
-
- public static IPath getInstallLocation() {
- if (location == null) {
- URL url = getInstallURL();
- try {
- String installLocation = ((PlatformURLConnection) url.openConnection()).getURLAsLocal().getFile();
- location = new Path(installLocation);
- } catch (IOException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(J2EEPluginResourceHandler.getString("Install_Location_Error_", new Object[]{url}) + e); //$NON-NLS-1$
- }
- }
- return location;
- }
-
- public static URL getInstallURL() {
- return getDefault().getBundle().getEntry("/");
- }
-
- public static EjbPlugin getPlugin() {
- return inst;
- }
-
- /**
- * Return the plugin directory location- the directory that all the plugins are located in (i.e.
- * d:\installdir\plugin)
- */
- public static IPath getPluginLocation(String pluginId) {
-// IExtensionRegistry registry = Platform.getExtensionRegistry();
- Bundle bundle = Platform.getBundle(pluginId);
- if (bundle != null) {
- try {
- IPath installPath = new Path(bundle.getEntry("/").toExternalForm()).removeTrailingSeparator();
- String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
- return new Path(installStr);
- } catch (IOException e) {
- };
- }
- return null;
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation,
- * or to throw a core exception in a context other than executing an operation
- *
- * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
- */
- public static IStatus createErrorStatus(String aMessage, Throwable exception) {
- return createErrorStatus(0, aMessage, exception);
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation.
- *
- * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
- */
- public static IStatus newOperationFailedStatus(String aMessage, Throwable exception) {
- return createStatus(IStatus.ERROR, IResourceStatus.OPERATION_FAILED, aMessage, exception);
- }
-
- /**
- * Create a new IStatus with a severity using the J2EEPlugin ID. aCode is just an internal code.
- */
- public static IStatus createStatus(int severity, int aCode, String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode, aMessage, exception);
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key) {
- return Platform.getResourceString(getBundle(), key);
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key, Object[] substitutions) {
- return MessageFormat.format(getString(key), substitutions);
- }
-
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation,
- * or to throw a core exception in a context other than executing an operation
- *
- * Create a new IStatus of type ERROR using the J2EEPlugin ID. aCode is just an internal code.
- */
- public static IStatus createErrorStatus(int aCode, String aMessage, Throwable exception) {
- return createStatus(IStatus.ERROR, aCode, aMessage, exception);
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/archiveoperations/IEjbClientProjectCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/archiveoperations/IEjbClientProjectCreationDataModelProperties.java
deleted file mode 100644
index af0d889..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/archiveoperations/IEjbClientProjectCreationDataModelProperties.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.archiveoperations;
-
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbClientProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJavaUtilityProjectCreationDataModelProperties;
-
-public interface IEjbClientProjectCreationDataModelProperties extends IJavaUtilityProjectCreationDataModelProperties{
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = EjbClientProjectCreationDataModelProvider.class;
-
- public static final String EJB_PROJECT_NAME = "IEjbClientProjectCreationDataModelProperties.EJB_PROJECT_NAME"; //$NON-NLS-1$
- public static final String CLIENT_URI = "IEjbClientProjectCreationDataModelProperties.CLIENT_URI ";//$NON-NLS-1$
- public static final String ADD_TO_EAR = IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/IEJBComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/IEJBComponentExportDataModelProperties.java
deleted file mode 100644
index 2614ba3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/IEJBComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.datamodel.properties;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-/**
- * <p>
- * IEJBComponentExportDataModelProperties provides properties to the IDataModel associated with the
- * EJBComponentExportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IEJBComponentExportDataModelProperties extends IJ2EEComponentExportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/IEJBComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/IEJBComponentImportDataModelProperties.java
deleted file mode 100644
index 4785d50..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/IEJBComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.datamodel.properties;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-/**
- * <p>
- * IEJBComponentImportDataModelProperties provides properties to the IDataModel associated with the
- * EJBComponentImportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IEJBComponentImportDataModelProperties extends IJ2EEModuleImportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/package.xml b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/package.xml
deleted file mode 100644
index 24dd5f3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>ejb module data model api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes the api to create, import and export ejb modules. The interfaces in this package
- define the properties that can be set on the ejb modules data models that are use to run the data model operations and drive the wizard data, validation.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/BatchDeploySaveFilter.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/BatchDeploySaveFilter.java
deleted file mode 100644
index 9862232..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/BatchDeploySaveFilter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter;
-
-
-/**
- * Insert the type's description here. Creation date: (05/04/01 9:19:09 PM)
- *
- * @author: Administrator
- */
-public class BatchDeploySaveFilter implements SaveFilter {
- protected SaveFilter target;
-
- /**
- * Insert the method's description here. Creation date: (05/04/01 9:23:36 PM)
- *
- * @param targetFilter
- * com.ibm.etools.archive.SaveFilter
- */
- public BatchDeploySaveFilter(SaveFilter targetFilter) {
- super();
- target = targetFilter;
- }
-
- /**
- * Answer whether an element in the archive having the uri should be saved; the uri may be for a
- * file, a nested archive, or a loaded mof resource. For deployed jars, if the file came was
- * copied from the orignal jar file, always save
- */
- public boolean shouldSave(java.lang.String uri, Archive anArchive) {
- File aFile = null;
- try {
- aFile = anArchive.getFile(uri);
- } catch (java.io.FileNotFoundException mustBeAResource) {
- //Ignore
- }
- if (aFile == null)
- return targetShouldSave(uri, anArchive);
- return aFile.getLoadingContainer() != anArchive || targetShouldSave(uri, anArchive);
- }
-
- protected boolean targetShouldSave(String uri, Archive anArchive) {
- return target == null || target.shouldSave(uri, anArchive);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBArchiveOpsResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBArchiveOpsResourceHandler.java
deleted file mode 100644
index 6b4f8c9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBArchiveOpsResourceHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EJBArchiveOpsResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "ejbarchiveops";//$NON-NLS-1$
-
- private EJBArchiveOpsResourceHandler() {
- // Do not instantiate
- }
-
- public static String ARCHIVE_OPERATION_SaveMofResources;
- public static String ARCHIVE_OPERATION_SaveFile;
- public static String ARCHIVE_OPERATION_ProjectNature;
- public static String ARCHIVE_OPERATION_SaveManifest;
- public static String ARCHIVE_OPERATION_FileNotFound;
- public static String ARCHIVE_OPERATION_FileContents;
- public static String ARCHIVE_OPERATION_ErroOccured;
- public static String ARCHIVE_OPERATION_FilesFromProject;
- public static String ARCHIVE_OPERATION_OpeningArchive;
- public static String ARCHIVE_OPERATION_InvalidEJBJar;
- public static String ARCHIVE_OPERATION_InvalidImportEJBJar;
- public static String ARCHIVE_OPERATION_ImportOperation;
- public static String EJB_IMPORT_OPERATION_STRING;
- public static String EJB_IMPORT_FILE_STRING;
- public static String IMPORT_MOFRESOURCE_STRING;
- public static String IMPORT_OPERATION_STRING;
- public static String ERROR_COPYING_FILES_FROM_ORIGINAL_JAR;
- public static String ERROR_IMPORTING_MODULE_FILE;
- public static String Yes_UI;
- public static String No_UI;
- public static String Yes_To_All_UI;
- public static String Cancel_UI_;
- public static String Error_exporting__UI_;
- public static String EJB_Jar_File_UI_;
- public static String Copy_Dep_JARS_UI;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EJBArchiveOpsResourceHandler.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJARRemovalOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJARRemovalOperation.java
deleted file mode 100644
index d034ac1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJARRemovalOperation.java
+++ /dev/null
@@ -1,587 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.ClientJARCreationConstants;
-import org.eclipse.jst.j2ee.internal.plugin.LibCopyBuilder;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.IOperationHandler;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class EJBClientJARRemovalOperation extends AbstractDataModelOperation
- implements IEjbClientProjectRemovalDataModelProperties{
-
- protected IProject ejbProject;
-
- protected IProject clientProject;
-
- protected IPath clientProjectPath, ejbProjectPath;
-
- protected List sourceContainers, libraryContainers;
-
- protected IContainer ejbSourceContainer;
-
- protected IPath ejbSourcePath;
-
- protected IPath outputPath;
-
- protected boolean shouldDelete;
-
- protected boolean yesToAll = false;
-
- protected IWorkspace workspace;
-
- protected IProgressMonitor monitor;
-
- protected IProgressMonitor moveResourceMonitor;
-
- protected IOperationHandler operationHandler;
-
- public EJBClientJARRemovalOperation(IDataModel dataModel) {
- super(dataModel);
- shouldDelete = true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.clientjarcreation.AbstractEJBClientJAROperation#initialize()
- */
- protected void initialize() {
-// super.initialize();
- ejbProject = (IProject) model.getProperty( IEjbClientProjectRemovalDataModelProperties.EJB_PROJECT );
- clientProject = (IProject) model.getProperty( IEjbClientProjectRemovalDataModelProperties.EJB_CLIENT_VIEW_PROJECT );
- operationHandler = (IOperationHandler)model.getProperty( IEjbClientProjectRemovalDataModelProperties.OP_HANDLER );
-
- workspace = ejbProject.getWorkspace();
- clientProjectPath = clientProject.getFullPath();
- ejbProjectPath = ejbProject.getFullPath();
- sourceContainers = JemProjectUtilities.getSourceContainers(clientProject);
- libraryContainers = JemProjectUtilities.getLibraryContainers(clientProject);
- IJavaProject proj = JavaCore.create(clientProject);
- try {
- outputPath = proj.getOutputLocation().removeFirstSegments(1);
- } catch (JavaModelException e) {
- //Ignore
- }
-
- IContainer container = J2EEProjectUtilities.getSourceFolderOrFirst( ejbProject, null );
- if( container.getType() == IResource.FOLDER ){
- ejbSourceContainer = container;
- }
-
- ejbSourcePath = ejbSourceContainer.getFullPath();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.clientjarcreation.AbstractEJBClientJAROperation#addAdditionalFilesForValidateEdit(java.util.List)
- */
- protected void addAdditionalFilesForValidateEdit(final List roFiles) throws CoreException {
- IResourceVisitor visitor = new IResourceVisitor() {
- public boolean visit(IResource resource) throws CoreException {
- if (resource.isDerived())
- return false;
- switch (resource.getType()) {
- case IResource.PROJECT :
- return true;
- case IResource.FOLDER :
- return true;
- case IResource.FILE :
- if (resource.isReadOnly())
- roFiles.add(resource);
- break;
- default :
- break;
- }
- return false;
- }
- };
-
- clientProject.accept(visitor);
- }
-
-
-
- public IStatus execute(IProgressMonitor aMonitor, IAdaptable info) throws ExecutionException {
- monitor = aMonitor;
- initialize();
- try{
- if (!verifyFilesInSync()) {
- monitor.done();
- throw new OperationCanceledException();
- }
- monitor.beginTask(ClientJARCreationConstants.REMOVING_CLIENT_JAR, 10);
- //It would be nice to only make one pass through the EARs. However, we can't.
- //The reason is that both JARs must be in the EAR when moving JAR dependencies.
- //Then when we are done we can remove the client JARs from the EARs.
- ensureEJBJARInAllEARs();
- updateEJBModuleJARDependencies();
- EJBClientJarCreationHelper.copyOutgoingClasspathEntries(clientProject, ejbProject, false);
- moveIncomingJARDependencies();
- updateDD();
- removeClientProjectFromEARs();
- moveFiles();
- // add all the source containers to the class path
- // add the root to the class path
- addSourceContainersToClassPath();
- //
- if (moveResourceMonitor.isCanceled())
- throw new InterruptedException();
- deleteClientProject();
- }catch(CoreException e){
- Logger.getLogger().logError( e );
- }catch(InvocationTargetException e){
- Logger.getLogger().logError( e );
- }catch(InterruptedException e){
- Logger.getLogger().logError( e );
- }
-
- return OK_STATUS;
- }
-
-
- /**
- * @throws JavaModelException
- *
- */
- private void addSourceContainersToClassPath() throws JavaModelException {
- for (int x = 0; x < sourceContainers.size(); ++x) {
- if (sourceContainers.get(x) instanceof IResource) {
- IResource resource = (IResource) sourceContainers.get(x);
- if (clientProject == resource)
- return;
- IPath srcPath = ejbProjectPath.append(resource.getProjectRelativePath());
- IFolder existing = workspace.getRoot().getFolder(srcPath);
- if (existing != null && existing.exists())
- JemProjectUtilities.appendJavaClassPath(ejbProject, JavaCore.newSourceEntry(srcPath));
- }
- }
- }
-
- /*
- * Remove the client JAR entry from the deployment descriptor
- */
- private void updateDD() {
- IModelProvider ejbModel = ModelProviderManager.getModelProvider(ejbProject);
- ejbModel.modify(new Runnable() {
- public void run() {
- IModelProvider writableEjbModel = ModelProviderManager.getModelProvider(ejbProject);
- Object modelObject = writableEjbModel.getModelObject();
-
- if (modelObject instanceof org.eclipse.jst.javaee.ejb.EJBJar) {
- org.eclipse.jst.javaee.ejb.EJBJar ejbres = (org.eclipse.jst.javaee.ejb.EJBJar) writableEjbModel.getModelObject();
- if (ejbres != null)
- ejbres.setEjbClientJar(null);
- }
- else {
- org.eclipse.jst.j2ee.ejb.EJBJar ejbres = (org.eclipse.jst.j2ee.ejb.EJBJar) writableEjbModel.getModelObject();
- ejbres.setEjbClientJar(null);
- }
- }
- },null);
- }
-
- /*
- * In cross EAR references, it is possible the EJB module is not included in the referencing
- * EAR. If so, then we must add the EJB module as a utility JAR to the referencing EAR.
- */
- private void ensureEJBJARInAllEARs() {
- //TODO switch to use component API
-// for (int i = 0; i < earNatures.length; i++) {
-// ensureEJBJARInEAR(earNatures[i]);
-// }
- }
-
- //TODO fix up ensure method to use component API
-// private void ensureEJBJARInEAR(EARNatureRuntime runtime) {
-// String ejbURI = runtime.getJARUri(ejbProject);
-// if (ejbURI != null)
-// return;
-// ejbURI = J2EEProjectUtilities.getUtilityJARUriInFirstEAR(ejbProject);
-// EAREditModel model = null;
-// try {
-// model = runtime.getEarEditModelForWrite(this);
-// AddUtilityJARMapCommand cmd = new AddUtilityJARMapCommand(model, ejbURI, ejbProject);
-// model.getCommandStack().execute(cmd);
-// IProgressMonitor subMonitor = createSubProgressMonitor(1);
-// model.saveIfNecessary(subMonitor, this);
-// } finally {
-// if (model != null)
-// model.releaseAccess(this);
-// }
-// }
-
- /*
- * copy all JAR dependencies not already contained by the ejb module,
- * from the client JAR to the ejb module,
- * and remove the module dependency from the EJB module
- */
- private void updateEJBModuleJARDependencies() throws InvocationTargetException, InterruptedException {
-
-
- ArrayList list = new ArrayList();
- list.add(clientProject.getName() + ".jar"); //$NON-NLS-1$
-
- IProject[] earProjects = J2EEProjectUtilities.getReferencingEARProjects( ejbProject );
-
- //remove project dependency of client project from the EJB project.
- IDataModel dataModel = DataModelFactory.createDataModel( new JARDependencyDataModelProvider() );
- dataModel.setProperty( JARDependencyDataModelProperties.PROJECT_NAME, ejbProject.getName());
- dataModel.setProperty( JARDependencyDataModelProperties.JAR_LIST, list );
- dataModel.setProperty(JARDependencyDataModelProperties.EAR_PROJECT_NAME,
- earProjects[0].getName());
- dataModel.setIntProperty( JARDependencyDataModelProperties.JAR_MANIPULATION_TYPE,
- JARDependencyDataModelProperties.JAR_MANIPULATION_REMOVE );
- dataModel.setProperty( JARDependencyDataModelProperties.REFERENCED_PROJECT_NAME,
- clientProject.getName() );
-
- try {
- dataModel.getDefaultOperation().execute( createSubProgressMonitor(1), null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError( e );
- }
-
-
-
- ArchiveManifest clientMf = J2EEProjectUtilities.readManifest(clientProject);
- if (clientMf == null)
- return;
- String[] mfEntries = clientMf.getClassPathTokenized();
- if (mfEntries.length == 0)
- return;
-
- createSubProgressMonitor( earProjects.length );
-
- //copy all JAR dependencies not already contained by the ejb module,
- //from the client JAR to the ejb module
-
- for (int i = 0; i < earProjects.length; i++) {
- List result = EJBClientJarCreationHelper.normalize(mfEntries, earProjects[i], ejbProject, false);
-
- IDataModel dataModel2 = DataModelFactory.createDataModel( new JARDependencyDataModelProvider() );
- dataModel2.setProperty(JARDependencyDataModelProperties.PROJECT_NAME, ejbProject.getName());
- dataModel2.setProperty(JARDependencyDataModelProperties.JAR_LIST, result);
- dataModel2.setProperty(JARDependencyDataModelProperties.EAR_PROJECT_NAME, earProjects[i].getName());
- dataModel2.setIntProperty(JARDependencyDataModelProperties.JAR_MANIPULATION_TYPE,
- JARDependencyDataModelProperties.JAR_MANIPULATION_ADD);
-
- try{
- dataModel2.getDefaultOperation().execute( createSubProgressMonitor(1), null );
- }catch (ExecutionException e) {
- Logger.getLogger().logError( e );
- }
- }
- }
-
- /*
- * For each module or JAR in each EAR that references the client JAR, replace the dependency
- * from the client JAR to the EJB module
- */
- private void moveIncomingJARDependencies() throws InvocationTargetException, InterruptedException {
-
- InvertClientJARDependencyCompoundOperation op =
- new InvertClientJARDependencyCompoundOperation( J2EEProjectUtilities.getReferencingEARProjects( ejbProject ),
- clientProject,
- ejbProject );
- try {
- op.execute(createSubProgressMonitor(1), null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError( e );
- }
- }
-
- /*
- * move all the non-derived files from the client JAR project into the EJB project. Use an
- * overwrite handler to deal with collisions.
- */
- private void moveFiles() throws CoreException {
- moveResourceMonitor = createSubProgressMonitor(1);
- IResourceVisitor visitor = getRootResourceVisitor();
- clientProject.accept(visitor);
- }
-
- private IResourceVisitor getRootResourceVisitor() {
-
- return new IResourceVisitor() {
- private boolean projectIsSource = sourceContainers.contains(clientProject);
-
- public boolean visit(IResource resource) throws CoreException {
- if (moveResourceMonitor.isCanceled())
- return false;
- switch (resource.getType()) {
- case IResource.FILE :
- if (!resource.isDerived())
- visitFile((IFile) resource);
- return false;
- case IResource.FOLDER :
- return visitFolder((IFolder) resource);
- case IResource.PROJECT :
- return true;
- default :
- return false;
- }
- }
-
- private void visitFile(IFile file) throws CoreException {
- if (isMetaFile(file))
- return;
- else if (projectIsSource)
- moveFile(file, clientProjectPath, ejbSourcePath);
- else
- moveFile(file, clientProjectPath, ejbProjectPath);
-
- }
-
- private boolean isMetaFile(IFile file) {
- String segment = file.getProjectRelativePath().toString();
- return ProjectUtilities.DOT_CLASSPATH.equals(segment) ||
- ProjectUtilities.DOT_PROJECT.equals(segment) ||
- ".runtime".equals(segment) ||
- segment.endsWith(IModuleConstants.COMPONENT_FILE_NAME) ||
- segment.startsWith(".settings"); //$NON-NLS-1$
- }
-
- private boolean visitFolder(IFolder folder) throws CoreException {
- if (isSourceFolder(folder)) {
- visitSourceFolder(folder);
- return false;
- } else if (isOutputFolder(folder)) {
- return false;
- } else if (isClassesFolder(folder)) {
- visitClassesFolder(folder);
- return false;
- } else
- return true;
- }
-
- private boolean isOutputFolder(IFolder folder) {
- IPath path = folder.getProjectRelativePath();
- while (path.segmentCount() > 0 && null != outputPath) {
- if (path.equals(outputPath)) {
- return true;
- }
- path = path.removeLastSegments(1);
- }
- return false;
- }
-
- private boolean isSourceFolder(IFolder folder) {
- return sourceContainers.contains(folder);
- }
-
- private void visitSourceFolder(IFolder folder) throws CoreException {
- folder.accept(getFolderResourceVisitor(folder.getFullPath(), computeEJBSourceFolder(folder)));
- }
-
- private IPath computeEJBSourceFolder(IFolder clientProjectFolder) {
- IPath clientFolderRelativePath = clientProjectFolder.getProjectRelativePath();
- return ejbProjectPath.append(clientFolderRelativePath);
- }
-
- private boolean isClassesFolder(IFolder folder) {
- return libraryContainers.contains(folder);
- }
-
- protected void visitClassesFolder(IFolder folder) throws CoreException {
- IPath classesPath = getEJBClassesPath();
- folder.accept(getFolderResourceVisitor(folder.getFullPath(), classesPath));
- }
-
- private IPath getEJBClassesPath() throws CoreException {
- IFolder folder = ejbProject.getFolder(LibCopyBuilder.IMPORTED_CLASSES_PATH);
- if (!folder.exists())
- folder.create(true, true, null);
- JemProjectUtilities.appendJavaClassPath(ejbProject, JavaCore.newLibraryEntry(folder.getFullPath(), null, null, true));
- return folder.getFullPath();
- }
- };
- }
-
- private IResourceVisitor getFolderResourceVisitor(final IPath sourceRoot, final IPath destinationRoot) {
- return new IResourceVisitor() {
- public boolean visit(IResource resource) throws CoreException {
- if (moveResourceMonitor.isCanceled())
- return false;
- switch (resource.getType()) {
- case IResource.FILE :
- if (!resource.isDerived() && !isManifest(sourceRoot, resource.getFullPath()))
- moveFile((IFile) resource, sourceRoot, destinationRoot);
- return false;
- case IResource.FOLDER :
- return true;
- default :
- return false;
- }
- }
-
- private boolean isManifest(IPath new_sourceRoot, IPath path) {
- String relativeURI = path.removeFirstSegments(new_sourceRoot.segmentCount()).toString();
- return J2EEConstants.MANIFEST_URI.equals(relativeURI);
- }
- };
- }
-
- private void moveFile(IFile file, IPath sourceRoot, IPath destinationRoot) throws CoreException {
- IPath filePath = file.getFullPath();
- IPath relativeFilePath = filePath.removeFirstSegments(sourceRoot.segmentCount());
- IPath newPath = destinationRoot.append(relativeFilePath);
- mkdirs(newPath, workspace.getRoot());
- IFile existing = workspace.getRoot().getFile(newPath);
- if (!yesToAll && existing.exists()) {
- String message = MessageFormat.format(ClientJARCreationConstants.SHOULD_OVERWRITE, new String[]{filePath.toString(), newPath.toString()});
- int answer = IOperationHandler.YES_TO_ALL;
- if (operationHandler != null)
- answer = operationHandler.canContinueWithAllCheckAllowCancel(message);
- switch (answer) {
- case IOperationHandler.YES :
- break;
- case IOperationHandler.YES_TO_ALL :
- yesToAll = true;
- break;
- case IOperationHandler.NO :
- return;
- case IOperationHandler.CANCEL :
- moveResourceMonitor.setCanceled(true);
- return;
- default :
- break;
- }
- }
- if (!existing.exists())
- file.move(newPath, true, moveResourceMonitor);
- else
- existing.setContents(file.getContents(), true, true, moveResourceMonitor);
- }
-
-
- private void removeClientProjectFromEARs() {
-
- IProject[] earProjects = J2EEProjectUtilities.getReferencingEARProjects( clientProject );
- for (int i = 0; i < earProjects.length; i++) {
- removeClientProjectFromEAR( earProjects[i] );
- }
- }
-
-
- private void removeClientProjectFromEAR( IProject earProject ) {
-
- IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- IVirtualComponent component = ComponentCore.createComponent(clientProject);
-
- if (earComp.exists() && component.exists()) {
- IDataModel dm = DataModelFactory.createDataModel(new RemoveReferenceComponentsDataModelProvider());
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
-
- List modList = (List) dm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(component);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- try {
- dm.getDefaultOperation().execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
- }
-
- }
-
- /*
- * remove the client project from the workspace
- */
- private void deleteClientProject() throws CoreException {
- if (shouldDelete)
- clientProject.delete(true, true, createSubProgressMonitor(1));
- }
-
- protected IProgressMonitor createSubProgressMonitor(int ticks) {
- return new SubProgressMonitor(monitor, ticks);
- }
-
- protected boolean verifyFilesInSync() throws CoreException {
- if (verifyFilesInSync(ejbProject))
- return verifyFilesInSync(clientProject);
- else
- return false;
- }
-
- protected boolean verifyFilesInSync(IProject project) throws CoreException {
- if (!project.exists())
- return true;
- if (!project.isSynchronized(IResource.DEPTH_INFINITE)) {
- String message = MessageFormat.format(ClientJARCreationConstants.FILES_OUT_OF_SYNC, new String[]{project.getName()});
- if (operationHandler == null || operationHandler.canContinue(message))
- ejbProject.refreshLocal(IResource.DEPTH_INFINITE, createSubProgressMonitor(1));
- else
- return false;
- }
- return true;
- }
-
- protected void mkdirs(IPath newPath, IWorkspaceRoot root) throws CoreException {
- if (newPath.segmentCount() <= 2)
- return;
- IPath parentPath = newPath.removeLastSegments(1);
- IFolder folder = root.getFolder(parentPath);
- if (!folder.exists()) {
- mkdirs(parentPath, root);
- folder.create(true, true, null);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJarCreationHelper.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJarCreationHelper.java
deleted file mode 100644
index dea672a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJarCreationHelper.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchMatch;
-import org.eclipse.jdt.core.search.SearchRequestor;
-import org.eclipse.jem.internal.adapters.jdom.JDOMSearchHelper;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.ClientJARCreationConstants;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-
-public class EJBClientJarCreationHelper {
-
- protected static final String SERVICE_LOCATOR_JAR_NAME = "serviceLocatorMgr.jar"; //$NON-NLS-1$
- private IProject ejbProject = null;
- protected Map javaFilesToMove = new HashMap();
- protected Set visitedJavaTypes = new HashSet();
- protected int moveResourceCount = 0;
- protected SearchEngine searchEngine = new SearchEngine();
- private MySearchHelper searchHelper = null;
-
- public EJBClientJarCreationHelper(IProject aEjbProject){
- ejbProject = aEjbProject;
- }
-
- public Map getFilesToMove() {
-
-
- searchHelper = new MySearchHelper(searchEngine, computeBeanTypeNames());
-
-
- if( ejbProject.exists() && ejbProject.isAccessible()){
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- EJBJar ejbJar = edit.getEJBJar();
- if (ejbJar != null) {
- List enterpriseBeans = ejbJar.getEnterpriseBeans();
- for (int i = 0; i < enterpriseBeans.size(); i++) {
- EnterpriseBean ejb = (EnterpriseBean) enterpriseBeans.get(i);
- computeJavaTypes(ejb);
- }
- }
- computeRMICJavaTypes();
-
- } finally {
- if(edit != null)
- edit.dispose();
-
- }
- }
- return javaFilesToMove;
- }
-
- public static void copyOutgoingClasspathEntries(IProject source, IProject target, boolean filterServiceLocator) throws JavaModelException {
- IJavaProject sourceJProject = JemProjectUtilities.getJavaProject(source);
- IJavaProject targetJProject = JemProjectUtilities.getJavaProject(target);
- IClasspathEntry[] sourceCp = sourceJProject.getRawClasspath();
- List targetCp = new ArrayList(Arrays.asList(targetJProject.getRawClasspath()));
- for (int i = 0; i < sourceCp.length; i++) {
- IClasspathEntry entry = sourceCp[i];
- if (!isContainedInProject(entry, source) && !contains(targetCp, entry) && (!isServiceLocator(entry) || !filterServiceLocator))
- targetCp.add(entry);
- }
- IClasspathEntry[] newCp = (IClasspathEntry[]) targetCp.toArray(new IClasspathEntry[targetCp.size()]);
- targetJProject.setRawClasspath(newCp, null);
- }
-
- private static boolean isContainedInProject(IClasspathEntry entry, IProject project) {
- return !entry.getPath().isEmpty() && project.getName().equals(entry.getPath().segment(0));
- }
-
- private static boolean contains(List cp, IClasspathEntry entry) {
- for (int i = 0; i < cp.size(); i++) {
- IClasspathEntry elmt = (IClasspathEntry) cp.get(i);
- if (elmt.getEntryKind() == entry.getEntryKind() && elmt.getPath().equals(entry.getPath()))
- return true;
- }
- return false;
- }
-
- private static boolean isServiceLocator(IClasspathEntry entry) {
- IPath path = entry.getPath();
- return path != null && SERVICE_LOCATOR_JAR_NAME.equals(path.lastSegment());
- }
-
- public static List normalize(String[] mfEntries, IProject earProject, IProject ejbProject,
- boolean filterServiceLocator) {
-
- String jarURI = null;
- EARArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead( earProject );
- if (edit != null){
- jarURI = edit.getModuleURI( ComponentCore.createComponent( ejbProject ));
- if (jarURI == null)
- return Collections.EMPTY_LIST;
- }
- } finally {
- if(edit != null)
- edit.dispose();
-
- }
-
- List result = new ArrayList(mfEntries.length);
- for (int i = 0; i < mfEntries.length; i++) {
- String norm = ArchiveUtil.deriveEARRelativeURI(mfEntries[i], jarURI);
- if (norm == null)
- norm = mfEntries[i];
- //We know this is an implementation dependency so we don't want to move it
- if (!SERVICE_LOCATOR_JAR_NAME.equals(norm) || !filterServiceLocator)
- result.add(norm);
- }
- return result;
- }
-
-
- private void computeJavaTypes(EnterpriseBean ejb) {
- computeJavaTypes(ejb.getHomeInterface());
- computeJavaTypes(ejb.getRemoteInterface());
- computeJavaTypes(ejb.getLocalInterface());
- computeJavaTypes(ejb.getLocalHomeInterface());
- if (ejb.isEntity())
- computeJavaTypes(((Entity)ejb).getPrimaryKey());
- }
-
- private void computeJavaTypes(JavaClass javaClass) {
- if (javaClass == null)
- return;
- //javaClass.isInterface();//force reflection prior to the move.
- IJavaProject jProj = JemProjectUtilities.getJavaProject(ejbProject);
- IType type = JDOMSearchHelper.findType(javaClass.getJavaPackage().getName(), javaClass.getSimpleName(), jProj);
- computeJavaTypes(type);
- }
-
- private void computeJavaTypes(IType type) {
- if (type == null || visitedJavaTypes.contains(type))
- return;
- visitedJavaTypes.add(type);
- //String qualifiedName = type.getFullyQualifiedName();
- try {
- IFile file = (IFile)type.getUnderlyingResource();
- if (file != null && ejbProject.equals(file.getProject())) {
- if (!file.isDerived())
- cacheType(type, file);
- computeRequiredReferencedJavaTypes(type);
- }
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- return;
- }
- }
-
- private void cacheType(IType type, IFile file) {
- this.moveResourceCount++;
- IPackageFragmentRoot root = (IPackageFragmentRoot) type.getPackageFragment().getParent();
- cacheFile(root, file);
- }
-
- private void cacheFile(IPackageFragmentRoot root, IFile file) {
- Set files = (Set) javaFilesToMove.get(root);
- if (files == null) {
- files = new HashSet();
- javaFilesToMove.put(root, files);
- }
- files.add(file);
- }
-
- private void computeRequiredReferencedJavaTypes(IType type) throws JavaModelException {
- Collection result = new HashSet();
- searchHelper.searchForReferences(type, result);
- if (!result.isEmpty()) {
- Iterator iter = result.iterator();
- while (iter.hasNext())
- computeJavaTypes(((IType)iter.next()));
- }
- }
-
- private Collection computeBeanTypeNames() {
- Collection names = null;
-
- if( ejbProject.exists() && ejbProject.isAccessible()){
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- EJBJar ejbJar = edit.getEJBJar();
- if (ejbJar != null) {
- List beans = ejbJar.getEnterpriseBeans();
- if (!beans.isEmpty()) {
- names = new HashSet(beans.size());
- for (int i = 0; i < beans.size(); i++) {
- EnterpriseBean bean = (EnterpriseBean) beans.get(i);
- names.add(bean.getEjbClassName());
- }
- }
- }
-
-
- } finally {
- if(edit != null)
- edit.dispose();
-
- }
- }
- if (names == null)
- names = Collections.EMPTY_LIST;
- return names;
- }
-
- private void computeRMICJavaTypes() {
-
- try{
- List roots = getResourcePackageFragmentRoots();
- for (int i = 0; i < roots.size(); i++) {
- IPackageFragmentRoot root = (IPackageFragmentRoot) roots.get(i);
- computeRMICJavaTypes(root);
- }
- }catch(CoreException e){
- Logger.getLogger().logError(e);
- }
- }
-
- private List getResourcePackageFragmentRoots() throws JavaModelException {
- IJavaProject javaProj = JemProjectUtilities.getJavaProject(ejbProject);
- List result = new ArrayList();
- IPackageFragmentRoot[] roots = javaProj.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- IPackageFragmentRoot root = roots[i];
- if (root.getKind() == IPackageFragmentRoot.K_SOURCE || isClassesFolder(root))
- result.add(root);
- }
- return result;
- }
-
- private boolean isClassesFolder(IPackageFragmentRoot root) throws JavaModelException {
- return root.getKind() == IPackageFragmentRoot.K_BINARY &&
- !root.isArchive() && !root.isExternal();
- }
-
- private void computeRMICJavaTypes(IPackageFragmentRoot root) throws JavaModelException {
- IJavaElement[] pkgFragments = root.getChildren();
- IFile aFile = null;
- for (int i = 0; i < pkgFragments.length; i++) {
- IJavaElement[] elements = ((IPackageFragment)pkgFragments[i]).getChildren();
- for (int j = 0; j < elements.length; j++) {
- IJavaElement unit = elements[j];
- aFile = (IFile)unit.getUnderlyingResource();
- if (isRMICStub(aFile) && isFileForClientJar(aFile))
- cacheFile(root, aFile);
- }
- }
- }
-
- private boolean isRMICStub(IFile aFile) {
- String name = aFile.getName();
- String ext = aFile.getFileExtension();
-
- if (name != null && ext != null)
- name = name.substring(0, name.length()-ext.length()-1);
- return name != null &&
- name.startsWith(ClientJARCreationConstants.UNDERSCORE) &&
- name.endsWith(ClientJARCreationConstants._STUB);
- }
-
- private boolean isFileForClientJar(IFile aFile){
- String name = aFile.getName();
-// special case the was stubs that is needed in the server side
- if(name.startsWith("_EJS") || (name.startsWith("_") && name.indexOf("InternalHome_") > 0 )) //$NON-NLS-1$ //$NON-NLS-2$
- return false;
- return true;
- }
-
-
- private static class MySearchHelper extends SearchRequestor {
- SearchEngine engine;
- Collection results;
- Collection beanTypeNames;
- MySearchHelper(SearchEngine engine, Collection beanTypeNames) {
- this.engine = engine;
- this.beanTypeNames = beanTypeNames;
- }
- void searchForReferences(IType type, Collection results) throws JavaModelException {
- this.results = results;
- //Hack because of a bug in the search engine in eclipse 2.1.1
- try {
- engine.searchDeclarationsOfReferencedTypes(type, this, null);
- } catch (ClassCastException ex) {
- Logger.getLogger().logError(ex);
- }
- }
- public void acceptSearchMatch(SearchMatch match) throws CoreException {
- if(match.getAccuracy() == SearchMatch.A_ACCURATE && !(match.isInsideDocComment() || isBeanType((IType) match.getElement())))
- results.add(match.getElement());
- }
- /**
- * @param type
- * @return
- */
- private boolean isBeanType(IType type) {
- return beanTypeNames.contains(type.getFullyQualifiedName());
- }
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJarFileMoveDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJarFileMoveDataModelProvider.java
deleted file mode 100644
index 44818fc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJarFileMoveDataModelProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public class EJBClientJarFileMoveDataModelProvider
- extends AbstractDataModelProvider
- implements IEJBClientJarFileMoveDataModelProperties{
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(EJB_CLIENTVIEW_PROJECT_NAME);
- propertyNames.add(EJB_PROJECT_NAME);
- propertyNames.add(FILES_TO_MOVE_MAP);
- return propertyNames;
- }
-
-
- public IDataModelOperation getDefaultOperation() {
- return new EJBClientJarFileMoveOperation( model );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJarFileMoveOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJarFileMoveOperation.java
deleted file mode 100644
index 8b61196..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientJarFileMoveOperation.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.internal.plugin.LibCopyBuilder;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-
-/**
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class EJBClientJarFileMoveOperation extends AbstractDataModelOperation
- implements IEJBClientJarFileMoveDataModelProperties{
- protected IProject clientProject;
- protected IProject ejbProject;
- protected IWorkspace workspace;
- protected IProgressMonitor monitor;
- protected IProgressMonitor moveResourceMonitor;
- protected Map javaFilesToMove = new HashMap();
-
-
-
-
- public EJBClientJarFileMoveOperation(IDataModel model){
- super(model);
- initialize();
- }
-
- public IStatus execute(IProgressMonitor aMonitor, IAdaptable info) throws ExecutionException {
- monitor = aMonitor;
- return moveRequiredFiles();
- }
-
-
- protected void initialize() {
- ejbProject = getEJBProject(model.getStringProperty(EJB_PROJECT_NAME));
- if(ejbProject == null) return;
- workspace = ejbProject.getWorkspace();
- clientProject = workspace.getRoot().getProject( model.getStringProperty( EJB_CLIENTVIEW_PROJECT_NAME));
- javaFilesToMove = (Map)model.getProperty( FILES_TO_MOVE_MAP );
- }
-
- private IStatus moveRequiredFiles() {
-
- IStatus status = OK_STATUS;
- try{
- moveResourceMonitor = createSubProgressMonitor(1);
- Iterator iter = javaFilesToMove.entrySet().iterator();
- IPackageFragmentRoot packageFragmentRoot;
- Set types;
- while (iter.hasNext()) {
- Map.Entry entry = (Entry) iter.next();
- packageFragmentRoot = (IPackageFragmentRoot) entry.getKey();
- types = (Set) entry.getValue();
- try {
- if (packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE)
- moveFiles(packageFragmentRoot, types);
- else
- moveClassFiles(packageFragmentRoot, types);
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(clientProject);
- //Refresh problems
- javaProject.close();
- javaProject.open(null);
- }catch(CoreException e){
- Logger.getLogger().logError( e );
- }
- return status;
- }
-
-
- private void moveFiles(IPackageFragmentRoot packageFragmentRoot, Set types) throws CoreException {
- IFile file = null;
- int leadSegmentsToTruncate = -1;
- IFolder sourceSourceFolder = getSourceFolder(packageFragmentRoot);
- if(sourceSourceFolder == null) return;
- IFolder targetSourceFolder = getOrCreateTargetSourceFolder(sourceSourceFolder);
- if(targetSourceFolder == null) return;
- IPath sourceFolderPath = targetSourceFolder.getFullPath();
- try {
- leadSegmentsToTruncate = packageFragmentRoot.getUnderlyingResource().getFullPath().segmentCount();
- } catch (JavaModelException ex) {
- Logger.getLogger().logError(ex);
- return;
- }
- for (Iterator iter = types.iterator(); iter.hasNext(); ) {
- file = (IFile) iter.next();
- IPath relPath = file.getFullPath().removeFirstSegments(leadSegmentsToTruncate);
- IPath newPath = sourceFolderPath.append(relPath);
- mkdirs(newPath, workspace.getRoot());
- IFile existing = workspace.getRoot().getFile(newPath);
- if (!existing.exists())
- file.move(newPath, true, moveResourceMonitor);
- }
- }
-
- /**
- * @param sourceSourceFolder
- * @return
- */
- private IFolder getOrCreateTargetSourceFolder(IFolder sourceSourceFolder) throws CoreException {
- IFolder targetFolder = clientProject.getFolder(sourceSourceFolder.getProjectRelativePath());
- if(targetFolder == null || !targetFolder.exists()) {
- mkFolders(targetFolder.getFullPath(), workspace.getRoot());
- JemProjectUtilities.appendJavaClassPath(clientProject, JavaCore.newSourceEntry(targetFolder.getFullPath()));
- }
- return targetFolder;
- }
-
- protected void mkFolders(IPath newPath, IWorkspaceRoot root) throws CoreException {
- if (newPath.segmentCount() <= 1)
- return;
- IFolder folder = root.getFolder(newPath);
- IPath parentPath = newPath.removeLastSegments(1);
- if (!folder.exists()) {
- mkFolders(parentPath, root);
- folder.create(true, true, null);
- }
- }
- /**
- * @param packageFragmentRoot
- * @return
- */
- private IFolder getSourceFolder(IPackageFragmentRoot packageFragmentRoot) {
- IResource res = null;
- try {
- res = packageFragmentRoot.getUnderlyingResource();
- } catch (JavaModelException e) {
- e.printStackTrace();
- }
- if(res != null && res instanceof IFolder)
- return (IFolder)res;
- return null;
- }
-
-
- private void moveClassFiles(IPackageFragmentRoot packageFragmentRoot, Set types) throws CoreException {
- IFolder folder = clientProject.getFolder(LibCopyBuilder.IMPORTED_CLASSES_PATH);
- if (!folder.exists())
- folder.create(true, true, null);
- try {
- JemProjectUtilities.appendJavaClassPath(clientProject, JavaCore.newLibraryEntry(folder.getFullPath(), null, null, true));
- } catch (CoreException ex) {
- Logger.getLogger().logError(ex);
- }
- moveFiles(packageFragmentRoot, types);
- }
-
- protected void mkdirs(IPath newPath, IWorkspaceRoot root) throws CoreException {
- if (newPath.segmentCount() <= 2)
- return;
- IPath parentPath = newPath.removeLastSegments(1);
- IFolder folder = root.getFolder(parentPath);
- if (!folder.exists()) {
- mkdirs(parentPath, root);
- folder.create(true, true, null);
- }
- }
-
- protected IProject getEJBProject(String aProjectName) {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- }
- protected IProgressMonitor createSubProgressMonitor(int ticks) {
- return new SubProgressMonitor(monitor, ticks);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentExportOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentExportOperation.java
deleted file mode 100644
index 0ba8ac2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentExportOperation.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.archive.JavaEEArchiveUtilities;
-import org.eclipse.jst.j2ee.internal.archive.operations.ComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactExportOperation;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EJBComponentExportOperation extends J2EEArtifactExportOperation {
-
- public EJBComponentExportOperation() {
- super();
- }
-
- public EJBComponentExportOperation(IDataModel model) {
- super(model);
- }
-
- protected void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException {
- IProgressMonitor subMonitor = new SubProgressMonitor(progressMonitor, EXPORT_WORK);
- IArchive archiveFromComponent = null;
- try {
- archiveFromComponent = JavaEEArchiveUtilities.INSTANCE.openArchive(getComponent());
- JavaEEQuickPeek quickPeek = JavaEEArchiveUtilities.INSTANCE.getJavaEEQuickPeek(archiveFromComponent);
- if (quickPeek.getJavaEEVersion() == J2EEConstants.JEE_5_0_ID) {
- saveArchive(archiveFromComponent, getDestinationPath().toOSString(), subMonitor);
- } else {
- createModuleFile();
- ((ComponentLoadStrategyImpl) (getModuleFile().getLoadStrategy())).setProgressMonitor(subMonitor);
- getModuleFile().saveAsNoReopen(getDestinationPath().toOSString());
- }
-
- } catch (SaveFailureException ex) {
- throw ex;
- } catch (Exception e) {
- throw new SaveFailureException(EJBArchiveOpsResourceHandler.ARCHIVE_OPERATION_OpeningArchive, e);
- } finally {
- if (archiveFromComponent != null)
- JavaEEArchiveUtilities.INSTANCE.closeArchive(archiveFromComponent);
- subMonitor.done();
- }
- }
-
- protected String archiveString() {
- return EJBArchiveOpsResourceHandler.EJB_Jar_File_UI_;
- }
-
- public void createModuleFile() throws SaveFailureException {
- try {
- CommonarchiveFactory caf = ((CommonarchivePackage) EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI)).getCommonarchiveFactory();
- EJBComponentLoadStrategyImpl ls = new EJBComponentLoadStrategyImpl(getComponent());
- ls.setExportSource(isExportSource());
- setModuleFile(caf.openEJBJarFile(ls, getDestinationPath().toOSString()));
- } catch (Exception e) {
- throw new SaveFailureException(EJBArchiveOpsResourceHandler.ARCHIVE_OPERATION_OpeningArchive, e);
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentImportOperation.java
deleted file mode 100644
index bb9642f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentImportOperation.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 5, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEJBComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.ComponentArchiveSaveAdapter;
-import org.eclipse.jst.j2ee.internal.archive.EJBComponentArchiveSaveAdapter;
-import org.eclipse.jst.j2ee.internal.archive.operations.EJBComponentSaveStrategyImpl;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactImportOperation;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EJBComponentImportOperation extends J2EEArtifactImportOperation {
-
- public EJBComponentImportOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- protected void importModuleFile(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- if (null == model.getProperty(IEJBComponentImportDataModelProperties.EXTENDED_IMPORT_FACTORY)) {
- super.importModuleFile(monitor);
- // EJBModuleImportDataModel dm = (EJBModuleImportDataModel) getOperationDataModel();
- // IProject project = dm.getProject();
- // dm.getJ2EEModuleCreationDataModel().getJ2EEVersion();
- // if (!J2EEPlugin.hasDevelopmentRole() && project != null &&
- // dm.getJ2EEModuleCreationDataModel().getJ2EEVersion() >=
- // J2EEVersionConstants.J2EE_1_3_ID) {
- // EJBUnknownPrimKeyHelper helper = new EJBUnknownPrimKeyHelper(dm);
- // helper.setUpUnknowPrimaryKey();
- // }
- }
- // else {
- // ExtendedImportFactory factory = (ExtendedImportFactory)
- // operationDataModel.getProperty(J2EEModuleImportDataModel.EXTENDED_IMPORT_FACTORY);
- // factory.importModuleFile((J2EEModuleImportDataModel) operationDataModel, monitor);
- // }
- }
-
- protected SaveStrategy createSaveStrategy(IVirtualComponent virtualComponent) {
- EJBComponentSaveStrategyImpl saveStrat = new EJBComponentSaveStrategyImpl(virtualComponent);
- return saveStrat;
- }
-
- protected ComponentArchiveSaveAdapter getArchiveSaveAdapter(IVirtualComponent virtualComponent) {
- return new EJBComponentArchiveSaveAdapter(virtualComponent);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentLoadStrategyImpl.java
deleted file mode 100644
index b7af417..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEComponentLoadStrategyImpl;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBComponentLoadStrategyImpl extends J2EEComponentLoadStrategyImpl {
-
- public EJBComponentLoadStrategyImpl(IVirtualComponent vComponent) {
- this(vComponent, true);
- }
-
- public EJBComponentLoadStrategyImpl(IVirtualComponent vComponent, boolean includeClasspathComponents) {
- super(vComponent, includeClasspathComponents);
- }
- protected synchronized ArtifactEdit getArtifactEditForRead() {
- if(artifactEdit == null){
- artifactEdit = EJBArtifactEdit.getEJBArtifactEditForRead(vComponent);
- }
- return artifactEdit;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBJarExtensionsImportOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBJarExtensionsImportOperation.java
deleted file mode 100644
index 81ffb92..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBJarExtensionsImportOperation.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 7, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface EJBJarExtensionsImportOperation {
- //Default
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientJarCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientJarCreationDataModelProvider.java
deleted file mode 100644
index 90c792f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientJarCreationDataModelProvider.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class EjbClientJarCreationDataModelProvider
- extends AbstractDataModelProvider
- implements IEjbClientJarCreationDataModelProperties{
-
- public EjbClientJarCreationDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(PROJECT_NAME);
- propertyNames.add(EJB_PROJECT_NAME);
- propertyNames.add(CLIENT_URI);
- return propertyNames;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new EjbClientJarCreationOperation(model);
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(CLIENT_URI)){
- String projectName = model.getStringProperty(EJB_PROJECT_NAME).replace(' ','_');
- return projectName + "Client.jar"; //$NON-NLS-1$
- }
- if (propertyName.equals(PROJECT_NAME)){
- String projectName = model.getStringProperty(EJB_PROJECT_NAME);
- return projectName + "Client"; //$NON-NLS-1$
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean status = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(PROJECT_NAME)){
- String projectName = model.getStringProperty(PROJECT_NAME);
- if(projectName != null)
- projectName = projectName.replace(' ','_');
- setProperty(CLIENT_URI, projectName + "Client.jar");//$NON-NLS-1$
- }
- return status;
- }
-
- public IStatus validate(String propertyName) {
-
- IStatus status = OK_STATUS;
- if(status.isOK()) {
- if(propertyName.equals(PROJECT_NAME)){
- String ejbProjectName = getStringProperty(EJB_PROJECT_NAME);
- String clientProjectName = getStringProperty(PROJECT_NAME);
- if(ejbProjectName.equals(clientProjectName)){
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.CLIENT_SAME_NAME_AS_EJB);
- }
- }
- if(propertyName.equals(PROJECT_NAME)){
- if(hasExistingClientJar())
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.EJB_JAR_already_has_client_Jar_);
- status = checkForValidProjectName(getStringProperty(PROJECT_NAME));
-// if(status.isOK())
-// status = validateClientJarUri();
- }
-
-// } else if (propertyName.equals(CLIENT_URI)){
-// status = validateClientJarUri();
-// }
- }
- return status;
- }
-
- private IStatus checkForValidProjectName(String aProjectName) {
- return ResourcesPlugin.getWorkspace().validateName(aProjectName, IResource.PROJECT);
- }
-
- protected IProject getEJBProject() {
- String projectName = getStringProperty(EJB_PROJECT_NAME);
- return ProjectUtilities.getProject( projectName );
- }
-
- public boolean hasExistingClientJar() {
- IProject project = getEJBProject();
- if( project.exists() && project.isAccessible()){
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(project);
- if (edit != null && edit.hasEJBClientJARProject()){
- return true;
- }
- return false;
- } finally {
- if(edit != null)
- edit.dispose();
-
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientJarCreationOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientJarCreationOperation.java
deleted file mode 100644
index 8ef5723..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientJarCreationOperation.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.facet.IUtilityFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider;
-import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IEJBCreateDeploymentFilesDataModelProperties;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class EjbClientJarCreationOperation
- extends AbstractDataModelOperation
- implements IEjbClientJarCreationDataModelProperties{
-
- private IProgressMonitor monitor = null;
-
- public EjbClientJarCreationOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor aMonitor, IAdaptable info) throws ExecutionException {
-
- monitor = aMonitor;
-
- IStatus stat = OK_STATUS;
-
- IProject ejbproject = ProjectUtilities.getProject(model.getStringProperty( EJB_PROJECT_NAME ));
- if( ejbproject.exists() && ejbproject.isAccessible()){
- IFacetedProject facetedProject = null;
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime = null;
- String javaSourceFolder = ""; //$NON-NLS-1$
-
- boolean canContinue = true;
- try {
- facetedProject = ProjectFacetsManager.create(ejbproject);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- canContinue = false;
- }
- if( canContinue ){
- runtime = facetedProject.getRuntime();
-
- IContainer container = J2EEProjectUtilities.getSourceFolderOrFirst(ejbproject, null);
- if( container.getType() == IResource.FOLDER ){
- javaSourceFolder = container.getName();
- }
-
- }
- IProject[] earprojects = J2EEProjectUtilities.getReferencingEARProjects( ejbproject );
-
-
- String projectName = model.getStringProperty( PROJECT_NAME );
- //String earProjectName = model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.EAR_PROJECT_NAME );
-
-
- IDataModel dm = DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
-
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(UtilityProjectCreationDataModelProvider.FACET_DM_MAP);
-
- IDataModel javadm = map.getFacetDataModel( IModuleConstants.JST_JAVA );
- IDataModel utildm = map.getFacetDataModel( J2EEProjectUtilities.UTILITY );
-
- // because we do not want utility->add to ear, as we are going to add it later to all referencing ear projects
- utildm.setBooleanProperty(IUtilityFacetInstallDataModelProperties.ADD_TO_EAR, false);
-
- javadm.setProperty( JavaFacetInstallDataModelProvider.FACET_PROJECT_NAME,
- projectName);
-
-
- javadm.setProperty( JavaFacetInstallDataModelProvider.SOURCE_FOLDER_NAME,
- javaSourceFolder);
-
-
- utildm.setProperty( IUtilityFacetInstallDataModelProperties.EAR_PROJECT_NAME, earprojects[0].getName());
-
- utildm.setProperty( IUtilityFacetInstallDataModelProperties.FACET_RUNTIME, runtime );
- dm.setProperty(UtilityProjectCreationDataModelProvider.FACET_RUNTIME, runtime);
-
- FacetProjectCreationOperation op = new FacetProjectCreationOperation(dm);
- try {
- stat = op.execute( monitor, null );
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
-
- final IVirtualComponent c = ComponentCore.createComponent( ejbproject );
- c.setMetaProperty(CreationConstants.EJB_CLIENT_NAME, projectName );
-
- String clientURI = model.getStringProperty(CLIENT_URI);
- c.setMetaProperty(CreationConstants.CLIENT_JAR_URI, clientURI);
-
-
- try{
- for( int i = 0; i< earprojects.length; i++ ){
- runAddClientToEAROperation( earprojects[i].getName(), model, monitor);
- }
- runAddClientToEJBOperation(model, monitor);
-
- updateEJBDD(model, monitor);
- moveOutgoingJARDependencies();
- EJBClientJarCreationHelper.copyOutgoingClasspathEntries( ejbproject,
- ProjectUtilities.getProject(projectName), true);
- modifyEJBModuleJarDependency(model, earprojects[0], monitor);
- IProject clientProject = ProjectUtilities.getProject( model.getStringProperty( PROJECT_NAME ) );
- moveIncomingJARDependencies( ejbproject, clientProject );
-
-
- }catch (CoreException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
- EJBClientJarCreationHelper helper = new EJBClientJarCreationHelper( ejbproject );
-
-
- IDataModel moveModel = DataModelFactory.createDataModel( new EJBClientJarFileMoveDataModelProvider());
- moveModel.setProperty(IEJBClientJarFileMoveDataModelProperties.EJB_PROJECT_NAME,
- ejbproject.getName() );
- moveModel.setProperty(IEJBClientJarFileMoveDataModelProperties.EJB_CLIENTVIEW_PROJECT_NAME,
- model.getStringProperty( PROJECT_NAME ));
-
- moveModel.setProperty( IEJBClientJarFileMoveDataModelProperties.FILES_TO_MOVE_MAP,
- helper.getFilesToMove() );
- moveModel.getDefaultOperation().execute(monitor, null);
-
- }
-
-
-
- return stat;
- }
-
- protected void runAddClientToEAROperation(String earProjectName, IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
-
- IProject earproject = ProjectUtilities.getProject(earProjectName);
-
- IVirtualComponent earComp = ComponentCore.createComponent(earproject);
-
-
- String clientProjectName = model.getStringProperty( PROJECT_NAME );
-
- IProject clientProject = ProjectUtilities.getProject(clientProjectName);
- IVirtualComponent component = ComponentCore.createComponent(clientProject);
-
- if (earComp.exists() && component.exists()) {
- IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
-
- List modList = (List) dm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(component);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
-
- String clientURI = model.getStringProperty(CLIENT_URI);
- ((Map)dm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP)).put(component, clientURI);
-
- try {
- dm.getDefaultOperation().execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
- }
- }
-
-
- protected void runAddClientToEJBOperation(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
- String ejbprojectName = model.getStringProperty( EJB_PROJECT_NAME);
- IProject ejbProj = ProjectUtilities.getProject(ejbprojectName);
- IVirtualComponent ejbcomponent = ComponentCore.createComponent(ejbProj);
-
-
- String clientProjectName = model.getStringProperty( PROJECT_NAME);
- IProject clientProject = ProjectUtilities.getProject(clientProjectName);
- IVirtualComponent ejbclientcomponent = ComponentCore.createComponent(clientProject);
-
- IDataModel dm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, ejbcomponent);
-
- List modList = (List) dm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(ejbclientcomponent);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- try {
- dm.getDefaultOperation().execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
-
- }
-
- private void modifyEJBModuleJarDependency(IDataModel model, IProject earProject,
- IProgressMonitor aMonitor) throws InvocationTargetException, InterruptedException {
-
-
- String ejbprojectName = model.getStringProperty( EJB_PROJECT_NAME );
- IProject ejbProj = ProjectUtilities.getProject(ejbprojectName);
- IVirtualComponent ejbComponent = ComponentCore.createComponent(ejbProj);
- IVirtualFile vf = ejbComponent.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
- IFile manifestmf = vf.getUnderlyingFile();
-
- String clientURI = model.getStringProperty(CLIENT_URI);
-
- IDataModel updateManifestDataModel = DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, ejbprojectName);
- updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, UpdateManifestDataModelProvider.convertClasspathStringToList(clientURI));
-
-
- try {
- updateManifestDataModel.getDefaultOperation().execute(aMonitor, null);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
-
- }
-
-
- private void updateEJBDD(final IDataModel model, IProgressMonitor monitor) {
-
- String ejbprojectName = model.getStringProperty( EJB_PROJECT_NAME );
- final IProject ejbProj = ProjectUtilities.getProject(ejbprojectName);
-
- //if deployment descriptor does not exist then we need to generate one
- if (!hasDeploymentDescriptor(ejbProj)) {
- IDataModel dataModel = DataModelFactory.createDataModel(IEJBCreateDeploymentFilesDataModelProperties.class);
- dataModel.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, ejbProj);
- try {
- dataModel.getDefaultOperation().execute(new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError( e );
- }
- }
-
- IModelProvider ejbModel = ModelProviderManager.getModelProvider(ejbProj);
- ejbModel.modify(new Runnable() {
- public void run() {
- IModelProvider writableEjbModel = ModelProviderManager.getModelProvider(ejbProj);
- Object modelObject = writableEjbModel.getModelObject();
- String clientProjectName = model.getStringProperty(PROJECT_NAME);
- IVirtualComponent c = ComponentCore.createComponent(ejbProj);
- Properties props = c.getMetaProperties();
- String clienturi = props.getProperty(CreationConstants.CLIENT_JAR_URI);
-
- if (modelObject instanceof org.eclipse.jst.javaee.ejb.EJBJar) {
- org.eclipse.jst.javaee.ejb.EJBJar ejbres = (org.eclipse.jst.javaee.ejb.EJBJar) writableEjbModel.getModelObject();
- if (clienturi != null && !clienturi.equals("")) { //$NON-NLS-1$
- ejbres.setEjbClientJar(clienturi);
- } else
- ejbres.setEjbClientJar(clientProjectName + ".jar");//$NON-NLS-1$
- }
- else {
- org.eclipse.jst.j2ee.ejb.EJBJar ejbres = (org.eclipse.jst.j2ee.ejb.EJBJar) writableEjbModel.getModelObject();
- if (clienturi != null && !clienturi.equals("")) { //$NON-NLS-1$
- ejbres.setEjbClientJar(clienturi);
- } else
- ejbres.setEjbClientJar(clientProjectName + ".jar");//$NON-NLS-1$
- }
- }
- },null);
- }
-
- //The referencing projects which were having Ejb will now have ejbclient
- private void moveIncomingJARDependencies(IProject ejbProject, IProject clientProject ) throws InvocationTargetException, InterruptedException {
-
- InvertClientJARDependencyCompoundOperation op =
- new InvertClientJARDependencyCompoundOperation( J2EEProjectUtilities.getReferencingEARProjects( ejbProject ),
- ejbProject,
- clientProject );
-
- try {
- op.execute(createSubProgressMonitor(1), null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError( e );
- }
- }
-
- protected IProgressMonitor createSubProgressMonitor(int ticks) {
- return new SubProgressMonitor(monitor, ticks);
- }
-
- //from the ejb project collect the entries in its manifest, and put it in the client project,
- //remove these entries from the ejb project
-
- private void moveOutgoingJARDependencies() throws InvocationTargetException, InterruptedException {
-
- IProject ejbproject = ProjectUtilities.getProject(model.getStringProperty( EJB_PROJECT_NAME ));
- String clientProjectName = model.getStringProperty( PROJECT_NAME );
-
- //from the ejb project collect the entries in its manifest
- ArchiveManifest ejbMf = J2EEProjectUtilities.readManifest( ejbproject );
- if (ejbMf == null)
- return;
- String[] mfEntries = ejbMf.getClassPathTokenized();
- if (mfEntries.length == 0)
- return;
-
- IProject[] earProjects = J2EEProjectUtilities.getReferencingEARProjects( ejbproject );
-
- IProgressMonitor sub = createSubProgressMonitor( earProjects.length * 2 );
- for (int i = 0; i < earProjects.length; i++) {
- List normalized = EJBClientJarCreationHelper.normalize(mfEntries, earProjects[i], ejbproject, true );
-
- //transfer the manifest entries from the ejb project to the client project
- IDataModel addDataModel = DataModelFactory.createDataModel( new JARDependencyDataModelProvider() );
- addDataModel.setIntProperty(JARDependencyDataModelProperties.JAR_MANIPULATION_TYPE,
- JARDependencyDataModelProperties.JAR_MANIPULATION_ADD);
-
- addDataModel.setProperty(JARDependencyDataModelProperties.PROJECT_NAME,
- clientProjectName );
-
- addDataModel.setProperty(JARDependencyDataModelProperties.EAR_PROJECT_NAME, earProjects[i].getName());
- addDataModel.setProperty(JARDependencyDataModelProperties.JAR_LIST, normalized);
-
-
- //remove the manifest entries from the ejb project
- IDataModel removeDataModel = DataModelFactory.createDataModel( new JARDependencyDataModelProvider() );
-
- removeDataModel.setIntProperty(JARDependencyDataModelProperties.JAR_MANIPULATION_TYPE,
- JARDependencyDataModelProperties.JAR_MANIPULATION_REMOVE);
- removeDataModel.setProperty(JARDependencyDataModelProperties.PROJECT_NAME,
- ejbproject.getName());
-
- removeDataModel.setProperty(JARDependencyDataModelProperties.EAR_PROJECT_NAME,
- earProjects[i].getName());
-
- removeDataModel.setProperty(JARDependencyDataModelProperties.JAR_LIST, normalized);
-
-
- try {
- addDataModel.getDefaultOperation().execute( new SubProgressMonitor(sub, 1), null );
- removeDataModel.getDefaultOperation().execute( new SubProgressMonitor(sub, 1), null );
- } catch (ExecutionException e) {
- Logger.getLogger().logError( e );
- }
-
-
-
- }
- }
-
- private boolean hasDeploymentDescriptor(IProject project) {
- boolean ret = true;
- IPath ddFilePath = new Path(J2EEConstants.EJBJAR_DD_URI);
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component.getRootFolder() != null && component.getRootFolder().getUnderlyingFolder() != null) {
- IFile ddXmlFile = component.getRootFolder().getUnderlyingFolder().getFile(ddFilePath);
- ret = ddXmlFile.exists();
- }
- return ret;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectCreationDataModelProvider.java
deleted file mode 100644
index a7b656d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
-import org.eclipse.jst.j2ee.project.facet.JavaUtilityProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class EjbClientProjectCreationDataModelProvider
- extends JavaUtilityProjectCreationDataModelProvider
- implements IEjbClientProjectCreationDataModelProperties{
-
- public EjbClientProjectCreationDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(EJB_PROJECT_NAME);
- propertyNames.add(CLIENT_URI);
- propertyNames.add(ADD_TO_EAR);
- return propertyNames;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new EjbClientProjectCreationOperation(model);
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(CLIENT_URI)){
- String projectName = model.getStringProperty(EJB_PROJECT_NAME);
- return projectName + "Client.jar"; //$NON-NLS-1$
- }
- if (propertyName.equals(PROJECT_NAME)){
- String projectName = model.getStringProperty(EJB_PROJECT_NAME);
- return projectName + "Client"; //$NON-NLS-1$
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public IStatus validate(String propertyName) {
-
- IStatus status = OK_STATUS;
- if(status.isOK()) {
- if(propertyName.equals(PROJECT_NAME)){
- String ejbProjectName = getStringProperty(EJB_PROJECT_NAME);
- String clientProjectName = getStringProperty(PROJECT_NAME);
- if(ejbProjectName.equals(clientProjectName)){
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.CLIENT_SAME_NAME_AS_EJB);
- }
- }
- if(propertyName.equals(PROJECT_NAME)){
- if(hasExistingClientJar())
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.EJB_JAR_already_has_client_Jar_);
- status = checkForValidProjectName(getStringProperty(PROJECT_NAME));
-// if(status.isOK())
-// status = validateClientJarUri();
- }
-
-// } else if (propertyName.equals(CLIENT_URI)){
-// status = validateClientJarUri();
-// }
- }
- return status;
- }
-
- private IStatus checkForValidProjectName(String aProjectName) {
- return ResourcesPlugin.getWorkspace().validateName(aProjectName, IResource.PROJECT);
- }
-
- protected IProject getEJBProject() {
- String projectName = getStringProperty(EJB_PROJECT_NAME);
- return ProjectUtilities.getProject( projectName );
- }
-
- public boolean hasExistingClientJar() {
- IProject project = getEJBProject();
- if( project.exists() && project.isAccessible()){
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(project);
- if (edit != null && edit.hasEJBClientJARProject()){
- return true;
- }
- return false;
- } finally {
- if(edit != null)
- edit.dispose();
-
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectCreationOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectCreationOperation.java
deleted file mode 100644
index a310e5f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectCreationOperation.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJavaUtilityProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IUtilityFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaUtilityProjectCreationOperation;
-import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class EjbClientProjectCreationOperation
- extends JavaUtilityProjectCreationOperation
- implements IEjbClientProjectCreationDataModelProperties{
-
- public EjbClientProjectCreationOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
- IStatus stat = OK_STATUS;
-
- String projectName = model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.PROJECT_NAME );
- String earProjectName = model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.EAR_PROJECT_NAME );;
- String javaSourceFolder = model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.SOURCE_FOLDER );
-
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime = (IRuntime) model.getProperty(IJavaUtilityProjectCreationDataModelProperties.RUNTIME);
-
- IDataModel dm = DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
-
-
- //IDataModel pdm = dm.getNestedModel( IFacetProjectCreationDataModelProperties.NESTED_PROJECT_DM );
- //pdm.setStringProperty( IProjectCreationPropertiesNew.PROJECT_LOCATION, model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.PROJECT_LOCATION ) );
-
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(UtilityProjectCreationDataModelProvider.FACET_DM_MAP);
-
- IDataModel javadm = map.getFacetDataModel( IModuleConstants.JST_JAVA );
- IDataModel utildm = map.getFacetDataModel( J2EEProjectUtilities.UTILITY );
-
-
- javadm.setProperty( JavaFacetInstallDataModelProvider.FACET_PROJECT_NAME,
- projectName);
-
-
- javadm.setProperty( JavaFacetInstallDataModelProvider.SOURCE_FOLDER_NAME,
- javaSourceFolder);
-
- // if the parent data model has set these properties we will use it, or else default to the utility facet install
- if(model.isPropertySet(ADD_TO_EAR))
- utildm.setProperty(IUtilityFacetInstallDataModelProperties.ADD_TO_EAR, model.getProperty(ADD_TO_EAR));
-
- if(model.isPropertySet(CLIENT_URI))
- utildm.setProperty(IUtilityFacetInstallDataModelProperties.MODULE_URI, model.getProperty(CLIENT_URI));
-
-
- utildm.setProperty( IUtilityFacetInstallDataModelProperties.EAR_PROJECT_NAME, earProjectName);
-
- utildm.setProperty( IUtilityFacetInstallDataModelProperties.FACET_RUNTIME, runtime );
- dm.setProperty(UtilityProjectCreationDataModelProvider.FACET_RUNTIME, runtime);
-
- FacetProjectCreationOperation op = new FacetProjectCreationOperation(dm);
- try {
- stat = op.execute( monitor, null );
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- return stat;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectRemovalDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectRemovalDataModelProvider.java
deleted file mode 100644
index d42ee80..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectRemovalDataModelProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class EjbClientProjectRemovalDataModelProvider
- extends AbstractDataModelProvider
- implements IEjbClientProjectRemovalDataModelProperties{
-
- public EjbClientProjectRemovalDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add( EJB_PROJECT );
- propertyNames.add( EJB_CLIENT_VIEW_PROJECT );
- propertyNames.add( OP_HANDLER );
- return propertyNames;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new EJBClientJARRemovalOperation(model);
- }
-
- public Object getDefaultProperty(String propertyName) {
- return super.getDefaultProperty(propertyName);
- }
-
-// private IStatus checkForValidProjectName(String aProjectName) {
-// return ResourcesPlugin.getWorkspace().validateName(aProjectName, IResource.PROJECT);
-// }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEJBClientJarFileMoveDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEJBClientJarFileMoveDataModelProperties.java
deleted file mode 100644
index 77b64c7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEJBClientJarFileMoveDataModelProperties.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-public interface IEJBClientJarFileMoveDataModelProperties {
-
- /**
- * Required, type String
- */
- public static final String EJB_PROJECT_NAME = "IEJBClientJarFileMoveDataModelProperties.EJB_PROJECT_NAME"; //$NON-NLS-1$
- /**
- * Required, type String
- */
- public static final String EJB_CLIENTVIEW_PROJECT_NAME = "IEJBClientJarFileMoveDataModelProperties.CLIENT_PROJECT_NAME"; //$NON-NLS-1$
-
- /**
- * Required, type Map
- */
- public static final String FILES_TO_MOVE_MAP = "IEJBClientJarFileMoveDataModelProperties.FILES_TO_MOVE_MAP"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEjbClientJarCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEjbClientJarCreationDataModelProperties.java
deleted file mode 100644
index 13aee53..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEjbClientJarCreationDataModelProperties.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-
-public interface IEjbClientJarCreationDataModelProperties{
-
- public static final String PROJECT_NAME = "IJavaUtilityProjectCreationDataModelProperties.PROJECT_NAME"; //$NON-NLS-1$
- public static final String EJB_PROJECT_NAME = "IEjbClientProjectCreationDataModelProperties.EJB_PROJECT_NAME"; //$NON-NLS-1$
- public static final String CLIENT_URI = "IEjbClientProjectCreationDataModelProperties.CLIENT_URI ";//$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEjbClientProjectCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEjbClientProjectCreationDataModelProperties.java
deleted file mode 100644
index 2d28afd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEjbClientProjectCreationDataModelProperties.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-
-/**
- * This class has become public API. Please use {@link org.eclipse.jst.j2ee.ejb.archiveoperations.IEjbClientProjectCreationDataModelProperties}
- *
- * @deprecated
- * @see org.eclipse.jst.j2ee.ejb.archiveoperations.IEjbClientProjectCreationDataModelProperties
- */
-
-public interface IEjbClientProjectCreationDataModelProperties extends org.eclipse.jst.j2ee.ejb.archiveoperations.IEjbClientProjectCreationDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEjbClientProjectRemovalDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEjbClientProjectRemovalDataModelProperties.java
deleted file mode 100644
index 1d2091d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEjbClientProjectRemovalDataModelProperties.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-
-public interface IEjbClientProjectRemovalDataModelProperties{
-
- public static final String EJB_PROJECT = "IEjbClientProjectRemovalDataModelProperties.EJB_PROJECT"; //$NON-NLS-1$
-
- public static final String EJB_CLIENT_VIEW_PROJECT = "IEjbClientProjectRemovalDataModelProperties.EJB_CLIENT_VIEW_PROJECT"; //$NON-NLS-1$
-
- public static final String OP_HANDLER = "IEjbClientProjectRemovalDataModelProperties.OP_HANDLER"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/InvertClientJARDependencyCompoundOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/InvertClientJARDependencyCompoundOperation.java
deleted file mode 100644
index 7704a47..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/InvertClientJARDependencyCompoundOperation.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProvider;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyOperation;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-public class InvertClientJARDependencyCompoundOperation extends AbstractDataModelOperation {
-
- protected IProject[] earProjects;
- protected IProject oldProject;
- protected IProject newProject;
- protected List childOperations = null;
- protected IProgressMonitor monitor;
-
- public InvertClientJARDependencyCompoundOperation(IProject[] referencingEARs,
- IProject anOldProject, IProject aNewProject) {
-
- earProjects = referencingEARs;
- oldProject = anOldProject;
- newProject = aNewProject;
- }
-
-
- public IStatus execute(IProgressMonitor aMonitor, IAdaptable info) throws ExecutionException {
- monitor = aMonitor;
- createChildOperations();
- executeChildOperations();
- return OK_STATUS;
- }
-
-
- private void createChildOperations() {
-
- childOperations = new ArrayList();
- for (int i = 0; i < earProjects.length; i++) {
- IVirtualComponent earComponent = ComponentCore.createComponent( earProjects[i]);
- IVirtualReference[] refs = earComponent.getReferences();
-
- for( int j=0; j< refs.length; j++ ){
- IVirtualReference ref = refs[j];
- IVirtualComponent comp = ref.getReferencedComponent();
- if ( comp != null ){
- IProject project = comp.getProject();
- if ( project != null && !project.equals(oldProject)
- && !project.equals(newProject) && !JemProjectUtilities.isBinaryProject(project)
- && !comp.isBinary()){
-
- IDataModel model = DataModelFactory.createDataModel( new JARDependencyDataModelProvider());
-
- model.setIntProperty(JARDependencyDataModelProperties.JAR_MANIPULATION_TYPE,
- JARDependencyDataModelProperties.JAR_MANIPULATION_INVERT);
-
- model.setProperty(JARDependencyDataModelProperties.PROJECT_NAME,
- project.getName());
- model.setProperty(JARDependencyDataModelProperties.OPPOSITE_PROJECT_NAME,
- newProject.getName());
- model.setProperty(JARDependencyDataModelProperties.EAR_PROJECT_NAME,
- earProjects[i].getName() );
- model.setProperty(JARDependencyDataModelProperties.REFERENCED_PROJECT_NAME,
- oldProject.getName());
- childOperations.add(new JARDependencyOperation(model));
- }
- }
- }
-
- }
- }
-
- private void executeChildOperations() {
- monitor.beginTask("", childOperations.size()); //$NON-NLS-1$
- for (int i = 0; i < childOperations.size(); i++) {
- JARDependencyOperation op = (JARDependencyOperation) childOperations.get(i);
- try {
- op.execute(new SubProgressMonitor(monitor, 1), null);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/XML4J_Ver_2_0_15.info b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/XML4J_Ver_2_0_15.info
deleted file mode 100644
index f25816e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/XML4J_Ver_2_0_15.info
+++ /dev/null
@@ -1 +0,0 @@
-2_0_15
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/componentcore/util/EJBArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/componentcore/util/EJBArtifactEdit.java
deleted file mode 100644
index 9762eb6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/componentcore/util/EJBArtifactEdit.java
+++ /dev/null
@@ -1,617 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.componentcore.util;
-
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.componentcore.JavaEEBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.BinaryComponentHelper;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * <p>
- * EJBArtifactEdit obtains a EJB Deployment Descriptor metamodel specifec data from a
- * {@see org.eclipse.jst.j2ee.ejb.EJBResource} which stores the metamodel. The
- * {@see org.eclipse.jst.j2ee.ejb.EJBResource} is retrieved from the
- * {@see org.eclipse.wst.common.modulecore.ArtifactEditModel} using a constant {@see
- * J2EEConstants#EJBJAR_DD_URI_OBJ}. The defined methods extract data or manipulate the contents of
- * the underlying resource.
- * </p>
- *
- */
-public class EJBArtifactEdit extends EnterpriseArtifactEdit implements IArtifactEditFactory {
-
- private static final String EJB_CONTENT_TYPE = "org.eclipse.jst.j2ee.ejbDD";
- /**
- * <p>
- * Identifier used to link EJBArtifactEdit to a EJBEditAdapterFactory {@see
- * EJBEditAdapterFactory} stored in an AdapterManger (@see AdapterManager)
- * </p>
- */
-
- public static final Class ADAPTER_TYPE = EJBArtifactEdit.class;
-
- /**
- *
- */
- public EJBArtifactEdit() {
- super();
- }
-
- public EJBArtifactEdit(IVirtualComponent aModule) {
- super(aModule);
- }
-
- protected BinaryComponentHelper initBinaryComponentHelper(IVirtualComponent binaryModule) {
- return new JavaEEBinaryComponentHelper(binaryModule);
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public EJBArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- }
-
- public EJBArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.EJB);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
- public EJBArtifactEdit(ArtifactEditModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- *
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from the given
- * {@see ModuleCoreNature}
- */
- public EJBArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- *
- * @return EJBResource from (@link getDeploymentDescriptorResource())
- *
- */
-
- public EJBResource getEJBJarXmiResource() {
- verifyOperationSupported();
- return (EJBResource) getDeploymentDescriptorResource();
- }
-
- /**
- * Experimental API subject to change
- *
- * @return IVirtualFolder that contains the deployment descriptor resource.
- * @throws CoreException
- */
-
- public IVirtualFolder getDeploymentDescriptorFolder() throws CoreException {
- IVirtualResource[] resources = getComponent().getRootFolder().members();
- if (resources != null && resources.length > 0) {
- for (int i = 0; i < resources.length; i++) {
- IVirtualResource resource = resources[i];
- if (resource.getType() == IVirtualResource.FOLDER) {
- IVirtualFolder folder = (IVirtualFolder) resource;
- IVirtualResource ddResource = folder.findMember(J2EEConstants.EJBJAR_DD_SHORT_NAME);
- if (ddResource != null)
- return folder;
- }
- }
- }
- return null;
- }
-
- /**
- * Experimental API subject to change
- *
- * @return String form of the ejbModule folder path relative to the full path.
- * @throws CoreException
- */
-
- public String getEjbModuleRelative(String fullPath) throws CoreException {
- if (fullPath != null) {
- if (getDeploymentDescriptorFolder() != null) {
- String modulePath;
- if (fullPath.indexOf('/') == 0)
- modulePath = getDeploymentDescriptorFolder().getProjectRelativePath().removeTrailingSeparator().removeLastSegments(1).toOSString();
- else
- modulePath = getDeploymentDescriptorFolder().getProjectRelativePath().removeTrailingSeparator().removeLastSegments(1).makeRelative().toOSString();
- int indx = (fullPath.indexOf(modulePath) + modulePath.length() + 1);
- if (fullPath.indexOf(modulePath) != -1)
- return fullPath.substring(indx);
- }
- }
- return fullPath;
- }
-
-
- /**
- * <p>
- * Retrieves J2EE version information from EJBResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- *
- */
-
- public int getJ2EEVersion() {
- verifyOperationSupported();
- return getEJBJarXmiResource().getJ2EEVersionID();
- }
-
- /**
- * <p>
- * Checks is a EJB Client Jar exists for the ejb module project
- * </p>
- *
- * @return boolean
- *
- */
-
- public boolean hasEJBClientJARProject() {
- verifyOperationSupported();
-
- if (getEJBClientJarModule() != null)
- return true;
- return false;
- }
-
- /**
- * <p>
- * Creates a new EJB module
- * </p>
- *
- * @return
- */
- public Module createNewModule() {
- verifyOperationSupported();
- if (isBinary()) {
- throwAttemptedBinaryEditModelAccess();
- }
- return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createEjbModule();
- }
-
-
- /**
- * @param project
- * @return WorkbenchComponent
- */
- public IVirtualComponent getEJBClientJarModule() {
- verifyOperationSupported();
- EJBJar jar = getEJBJar();
- IVirtualComponent ejbComponent, ejbClientComponent = null;
- ejbComponent = ComponentCore.createComponent(getProject());
- if (ejbComponent == null)
- return null;
- Properties props = ejbComponent.getMetaProperties();
- String clientCompName = props.getProperty(CreationConstants.EJB_CLIENT_NAME);
- if (clientCompName != null && !clientCompName.equals("")) { //$NON-NLS-1$
- IVirtualReference vRef = ejbComponent.getReference(clientCompName);
- if (vRef != null)
- ejbClientComponent = vRef.getReferencedComponent();
- } else {
- String clientJAR = null;
- if (jar != null)
- clientJAR = jar.getEjbClientJar();
- if (clientJAR != null) {
- clientJAR = clientJAR.substring(0, clientJAR.length() - 4);
- ejbComponent = ComponentCore.createComponent(getProject());
- if (ejbComponent == null)
- return null;
- IVirtualReference ref = ejbComponent.getReference(clientJAR);
- if (ref != null)
- ejbClientComponent = ref.getReferencedComponent();
- }
- }
- return ejbClientComponent;
- }
-
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using defined URI.
- * </p>
- *
- * @return Resource
- *
- */
-
- public Resource getDeploymentDescriptorResource() {
- verifyOperationSupported();
- if (isBinary()) {
- return getBinaryComponentHelper().getResource(J2EEConstants.EJBJAR_DD_URI_OBJ);
- }
- return getArtifactEditModel().getResource(J2EEConstants.EJBJAR_DD_URI_OBJ);
- }
-
- /**
- *
- * @return EJBJar from (@link getDeploymentDescriptorRoot())
- *
- */
- public EJBJar getEJBJar() {
- verifyOperationSupported();
- return (EJBJar) getDeploymentDescriptorRoot();
- }
-
- /**
- * <p>
- * Obtains the EJBJar (@see EJBJar) root object from the EJBResource. If the root object does
- * not exist, then one is created (@link addEJBJarIfNecessary(getEJBJarXmiResource())). The root
- * object contains all other resource defined objects.
- * </p>
- *
- * @return EObject
- *
- */
- public EObject getDeploymentDescriptorRoot() {
- verifyOperationSupported();
- Resource res = getDeploymentDescriptorResource();
- List contents = res.getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- if (isBinary()) {
- return null;
- }
- if (!WorkbenchResourceHelper.getFile(res).exists())
- return null;
- addEJBJarIfNecessary((EJBResource) getDeploymentDescriptorResource());
- return (EObject) contents.get(0);
- }
-
- /**
- * Returns the deployment descriptor type of the EJB module.
- *
- * @return int
- */
-
- public int getDeploymentDescriptorType() {
- return XMLResource.EJB_TYPE;
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (EJBJar) and populates with data. Adds the root
- * object to the deployment descriptor resource.
- * </p>
- *
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource} Note: This method is typically used
- * for JUNIT - move?
- * </p>
- */
- protected void addEJBJarIfNecessary(XMLResource aResource) {
- if (isBinary()) {
- throwAttemptedBinaryEditModelAccess();
- }
- if (aResource != null) {
- if (aResource.getContents() == null || aResource.getContents().isEmpty()) {
- EJBJar ejbJar = EjbFactory.eINSTANCE.createEJBJar();
- aResource.getContents().add(ejbJar);
- }
- EJBJar ejbJar = (EJBJar) aResource.getContents().get(0);
- URI moduleURI = getArtifactEditModel().getModuleURI();
- try {
- ejbJar.setDisplayName(StructureEdit.getDeployedName(moduleURI));
- } catch (UnresolveableURIException e) {
- // Ignore
- }
- aResource.setID(ejbJar, J2EEConstants.EJBJAR_ID);
- // TODO add more mandatory elements
- try {
- if (aResource.isModified())
- aResource.saveIfNecessary();
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the underlying content
- * model
- */
- public static EJBArtifactEdit getEJBArtifactEditForRead(IProject aProject) {
- EJBArtifactEdit artifactEdit = null;
- try {
- if (isValidEJBModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new EJBArtifactEdit(aProject, true, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static EJBArtifactEdit getEJBArtifactEditForWrite(IProject aProject) {
- EJBArtifactEdit artifactEdit = null;
- try {
- if (isValidEJBModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new EJBArtifactEdit(aProject, false, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are returned through this
- * method must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an EJBArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of EJBArtifactEdit that may only be used to read the underlying content
- * model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static EJBArtifactEdit getEJBArtifactEditForRead(IVirtualComponent aModule) {
- if (aModule == null)
- return null;
- if (aModule.isBinary()) {
- return new EJBArtifactEdit(aModule);
- }
- return getEJBArtifactEditForRead(aModule.getProject());
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are returned through this
- * method must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an EJBArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of EJBArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static EJBArtifactEdit getEJBArtifactEditForWrite(IVirtualComponent aModule) {
- if (aModule == null || aModule.isBinary())
- return null;
- return getEJBArtifactEditForWrite(aModule.getProject());
- }
-
- /**
- * @param module
- * A {@see WorkbenchComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(WorkbenchComponent)}and the moduleTypeId is
- * a JST module
- */
- public static boolean isValidEJBModule(IVirtualComponent aModule) throws UnresolveableURIException {
- if (!isValidEditableModule(aModule))
- return false;
- /* and match the JST_EJB_MODULE type */
- return J2EEProjectUtilities.isEJBProject(aModule.getProject());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
- */
- public EObject createModelRoot() {
- verifyOperationSupported();
- if (isBinary()) {
- throwAttemptedBinaryEditModelAccess();
- }
-
- return createModelRoot(getJ2EEVersion());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(int)
- */
- public EObject createModelRoot(int version) {
- verifyOperationSupported();
- if (isBinary()) {
- throwAttemptedBinaryEditModelAccess();
- }
-
- EJBResource res = (EJBResource) getDeploymentDescriptorResource();
- res.setModuleVersionID(version);
- addEJBJarIfNecessary(res);
- return ((EJBResource) getDeploymentDescriptorResource()).getRootObject();
- }
-
- public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
- return getEJBArtifactEditForRead(aComponent);
- }
-
- public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
- return getEJBArtifactEditForWrite(aComponent);
- }
-
- public Archive asArchive(boolean includeSource, boolean includeClasspathComponents) throws OpenFailureException {
- if (isBinary()) {
- JavaEEBinaryComponentHelper helper = (JavaEEBinaryComponentHelper)getBinaryComponentHelper();
- return helper.accessLegacyArchive();
- } else {
- EJBComponentLoadStrategyImpl loader = new EJBComponentLoadStrategyImpl(getComponent(), includeClasspathComponents);
- loader.setExportSource(includeSource);
- String uri = ModuleURIUtil.getHandleString(getComponent());
- return CommonarchiveFactory.eINSTANCE.openEJBJarFile(loader, uri);
- }
- }
-
- public static void createDeploymentDescriptor(IProject project, int version) {
- EnterpriseArtifactEdit ejbEdit = new EJBArtifactEdit(project, false, true);
- try {
- ejbEdit.createModelRoot(version);
- ejbEdit.save(null);
- } finally { // Make sure new resource is removed - the uri used for creation shouldn't be cached
- Resource newRes = ejbEdit.getDeploymentDescriptorResource();
- WorkbenchResourceHelperBase.getResourceSet(project).getResources().remove(newRes);
- newRes.unload();
- ejbEdit.dispose();
- }
- }
- public IModelProvider create(IProject project) {
- return (IModelProvider)getEJBArtifactEditForRead(project);
- }
-
- public IModelProvider create(IVirtualComponent component) {
- return (IModelProvider)getEJBArtifactEditForRead(component);
- }
- public void modify(Runnable runnable, IPath modelPath) {
- setWritableEdit(getEJBArtifactEditForWrite(getProject()));
- try{
- runnable.run();
- if( getWritableEdit() != null ){
- // Always save regardless of resource path passed - Artifactedits save resources as a unit
- getWritableEdit().saveIfNecessary( new NullProgressMonitor() );
- }
-
- } finally { //Properly dispose the write artifact edit
- getWritableEdit().dispose();
- setWritableEdit(null);
- }
- }
-
-
- protected String getContentTypeDescriber() {
- return EJB_CONTENT_TYPE;
- }
- protected URI getRootURI() {
- return J2EEConstants.EJBJAR_DD_URI_OBJ;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/componentcore/util/package.xml b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/componentcore/util/package.xml
deleted file mode 100644
index afe8e37..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/componentcore/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>EJB Artifact Edit api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes the EJBArtifactEdit api. This api is used to work with the emf model
- of a flexible ejb module. It contains api to read and serialize out the emf model.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/internal/modulecore/util/EJBArtifactEditUtilities.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/internal/modulecore/util/EJBArtifactEditUtilities.java
deleted file mode 100644
index 606c573..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/internal/modulecore/util/EJBArtifactEditUtilities.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.modulecore.util;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBArtifactEditUtilities {
-
- public static IVirtualComponent getEJBComponent(EnterpriseBean bean) {
- IProject project = ProjectUtilities.getProject(bean);
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component == null) return null;
- EJBArtifactEdit edit = null;
- try {
- if (J2EEProjectUtilities.isEJBProject(component.getProject())) {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(component);
- EJBJar jar = edit.getEJBJar();
- if (jar.getEnterpriseBeanNamed(bean.getName()) != null)
- return component;
- }
- } finally {
- if (edit != null)
- edit.dispose();
- }
-
- return null;
- }
-
- public static EJBJar getEJBJar(IVirtualComponent comp) {
- EJBArtifactEdit edit = null;
- EJBJar ejbJar = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(comp);
- if (edit != null)
- ejbJar = edit.getEJBJar();
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return ejbJar;
- }
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/internal/modulecore/util/EJBEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/internal/modulecore/util/EJBEditAdapterFactory.java
deleted file mode 100644
index fa7228a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/internal/modulecore/util/EJBEditAdapterFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.modulecore.util;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-
-public class EJBEditAdapterFactory implements IAdapterFactory {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adapterType == EJBArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
- ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
- if (J2EEProjectUtilities.isEJBProject(editModel.getProject()))
- return new EJBArtifactEdit((ArtifactEditModel) adaptableObject);
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return new Class[]{ArtifactEdit.class, EJBArtifactEdit.class};
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java
deleted file mode 100644
index 6fe89ca..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.project.facet;
-
-
-
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainerUtils;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class EjbFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- IDataModel model = (IDataModel) config;
-
- final IJavaProject jproj = JavaCore.create(project);
-
- // Add WTP natures.
-
- WtpUtils.addNatures(project);
-
- // Create the directory structure.
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final IPath pjpath = project.getFullPath();
-
- // Setup the flexible project structure.
- final IVirtualComponent c = ComponentCore.createComponent(project);
- c.create(0, null);
- setOutputFolder(model,c);
- final IVirtualFolder ejbroot = c.getRootFolder();
-
- IFolder ejbFolder = null;
- String configFolder = null;
-
- configFolder = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
- ejbroot.createLink(new Path("/" + configFolder), 0, null); //$NON-NLS-1$
-
- String ejbFolderName = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
- IPath ejbFolderpath = pjpath.append(ejbFolderName);
-
- ejbFolder = ws.getRoot().getFolder(ejbFolderpath);
-
- IFile vf = ejbFolder.getFile(new Path(J2EEConstants.MANIFEST_URI));
- if (vf == null || !vf.exists()) {
- try {
- createManifest(project, ejbFolder, monitor);
- } catch (InvocationTargetException e) {
- Logger.getLogger().logError(e);
- } catch (InterruptedException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- if( fv == IJ2EEFacetConstants.EJB_30 )
- {
- if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
- // Create the deployment descriptor (ejb-jar.xml) if one doesn't exist
- IFile ejbJarXmlFile = ejbFolder.getFile(J2EEConstants.EJBJAR_DD_URI);
- if (!ejbJarXmlFile.exists()) {
- try {
- final String ejbJarXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ejb-jar version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\">\n <display-name> \n" + project.getName() +" </display-name> \n </ejb-jar>"; //$NON-NLS-1$
- ejbJarXmlFile.create(new ByteArrayInputStream(ejbJarXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$
- } catch (UnsupportedEncodingException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- }
- else
- {
- if (!ejbFolder.getFile(J2EEConstants.EJBJAR_DD_URI).exists()) {
- String ver = model.getStringProperty(IFacetDataModelProperties.FACET_VERSION_STR);
- int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
- EJBArtifactEdit.createDeploymentDescriptor(project, nVer);
- }
- }
-
- // add source folder maps
- final IClasspathEntry[] cp = jproj.getRawClasspath();
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
- if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- ejbroot.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
- }
- }
-
- // Setup the classpath.
- ClasspathHelper.removeClasspathEntries(project, fv);
-
- if (!ClasspathHelper.addClasspathEntries(project, fv)) {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- if(J2EEComponentClasspathContainerUtils.getDefaultUseEARLibraries()){
- final IPath earLibContainer = new Path(J2EEComponentClasspathContainer.CONTAINER_ID);
- addToClasspath(jproj, JavaCore.newContainerEntry(earLibContainer));
- }
-
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
-
- if (monitor != null) {
- monitor.worked(1);
- }
- }
-
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetPostInstallDelegate.java
deleted file mode 100644
index 9893a12..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetPostInstallDelegate.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.project.facet;
-
-
-
-import static org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties.FACETED_PROJECT_WORKING_COPY;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.archiveoperations.IEjbClientProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbClientProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJavaUtilityProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class EjbFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- IDataModel model = (IDataModel) config;
-
- final IVirtualComponent c = ComponentCore.createComponent(project);
-
- final String earProjectName = (String) model.getProperty(
- IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
-
- // Associate with an EAR, if necessary.
- if (model.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR)) {
- if (earProjectName != null && !earProjectName.equals("")) { //$NON-NLS-1$
-
- String ver = fv.getVersionString();
- String j2eeVersionText = J2EEVersionUtil.convertVersionIntToString
- (J2EEVersionUtil.convertEJBVersionStringToJ2EEVersionID(ver));
-
- final String moduleURI = model.getStringProperty(
- IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI);
-
- final IFacetedProjectWorkingCopy fpjwc
- = (IFacetedProjectWorkingCopy) model.getProperty( FACETED_PROJECT_WORKING_COPY );
-
- installAndAddModuletoEAR( j2eeVersionText,
- earProjectName,
- fpjwc.getPrimaryRuntime(),
- project,
- moduleURI,
- monitor );
-
- }
-
-
- // Create the Ejb Client View
- final boolean createClient = model.getBooleanProperty(IEjbFacetInstallDataModelProperties.CREATE_CLIENT);
- String clientProjectName = (String) model.getProperty(IEjbFacetInstallDataModelProperties.CLIENT_NAME);
- if (createClient && clientProjectName != null && clientProjectName != "") { //$NON-NLS-1$
- IProject ejbClientProject = ProjectUtilities.getProject(clientProjectName);
- if (ejbClientProject.exists())
- return;
-
- c.setMetaProperty(CreationConstants.EJB_CLIENT_NAME, clientProjectName);
-
- String clientURI = model.getStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_URI);
- c.setMetaProperty(CreationConstants.CLIENT_JAR_URI, clientURI);
-
-
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime rt = (IRuntime) model.getProperty(IJ2EEFacetInstallDataModelProperties.FACET_RUNTIME);
- try {
-
- IDataModel dm = DataModelFactory.createDataModel(new EjbClientProjectCreationDataModelProvider());
-
- dm.setStringProperty(IJavaUtilityProjectCreationDataModelProperties.PROJECT_NAME, clientProjectName);
- dm.setStringProperty(IEjbClientProjectCreationDataModelProperties.EJB_PROJECT_NAME, model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME));
- dm.setStringProperty(IJavaUtilityProjectCreationDataModelProperties.EAR_PROJECT_NAME, earProjectName);
- dm.setStringProperty(IJavaUtilityProjectCreationDataModelProperties.SOURCE_FOLDER, (String) model.getProperty(IEjbFacetInstallDataModelProperties.CLIENT_SOURCE_FOLDER));
- dm.setProperty(IJavaUtilityProjectCreationDataModelProperties.RUNTIME, rt);
-
- // because we do not want utility->add to ear, as we are going to perform ejb client->add to ear
- dm.setBooleanProperty(IEjbClientProjectCreationDataModelProperties.ADD_TO_EAR, false);
-
- dm.getDefaultOperation().execute(monitor, null);
-
-
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
-
- if (createClient && clientProjectName != null && clientProjectName != "") { //$NON-NLS-1$
- try {
- if (model.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR))
- runAddClientToEAROperation(model, monitor);
- runAddClientToEJBOperation(model, monitor);
- modifyEJBModuleJarDependency(model, monitor);
- updateEJBDD(model, monitor);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- }
-
-
- }
-
- if (monitor != null) {
- monitor.worked(1);
- }
-
- }
-
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- protected void runAddClientToEAROperation(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
- final String earProjectName = (String) model.getProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
- IProject earproject = ProjectUtilities.getProject(earProjectName);
-
- IVirtualComponent earComp = ComponentCore.createComponent(earproject);
-
-
- String clientProjectName = model.getStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_NAME);
-
- IProject clientProject = ProjectUtilities.getProject(clientProjectName);
- IVirtualComponent component = ComponentCore.createComponent(clientProject);
-
- if (earComp.exists() && component.exists()) {
- IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
-
- List modList = (List) dm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(component);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
-
- String clientURI = model.getStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_URI);
- ((Map)dm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP)).put(component, clientURI);
-
- try {
- dm.getDefaultOperation().execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
- }
- }
-
-
- protected void runAddClientToEJBOperation(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
- String ejbprojectName = model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
- IProject ejbProj = ProjectUtilities.getProject(ejbprojectName);
- IVirtualComponent ejbcomponent = ComponentCore.createComponent(ejbProj);
-
-
- String clientProjectName = model.getStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_NAME);
- IProject clientProject = ProjectUtilities.getProject(clientProjectName);
- IVirtualComponent ejbclientcomponent = ComponentCore.createComponent(clientProject);
-
- IDataModel dm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, ejbcomponent);
-
- List modList = (List) dm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(ejbclientcomponent);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- try {
- dm.getDefaultOperation().execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
-
- }
-
- private void modifyEJBModuleJarDependency(IDataModel model, IProgressMonitor aMonitor) throws InvocationTargetException, InterruptedException {
- String ejbprojectName = model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
- IProject ejbProj = ProjectUtilities.getProject(ejbprojectName);
- IVirtualComponent ejbComponent = ComponentCore.createComponent(ejbProj);
- IVirtualFile vf = ejbComponent.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
- IFile manifestmf = vf.getUnderlyingFile();
- if (manifestmf == null || !manifestmf.exists()) {
- try {
- createManifest(ejbProj, ejbComponent.getRootFolder().getUnderlyingFolder(), aMonitor);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- String manifestFolder = IPath.SEPARATOR + model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER) + IPath.SEPARATOR + J2EEConstants.META_INF;
- IContainer container = ejbProj.getFolder(manifestFolder);
- manifestmf = container.getFile(new Path(J2EEConstants.MANIFEST_SHORT_NAME));
- }
-
- String clientURI = model.getStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_URI);
-
- IDataModel updateManifestDataModel = DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, ejbprojectName);
- updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, UpdateManifestDataModelProvider.convertClasspathStringToList(clientURI));
-
-
- try {
- updateManifestDataModel.getDefaultOperation().execute(aMonitor, null);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
-
- }
-
-
- private void updateEJBDD(final IDataModel model, IProgressMonitor monitor) {
-
- String ejbprojectName = model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
- final IProject ejbProj = ProjectUtilities.getProject(ejbprojectName);
-
- IModelProvider ejbModel = ModelProviderManager.getModelProvider(ejbProj);
- ejbModel.modify(new Runnable() {
- public void run() {
- String clientProjectName = model.getStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_NAME);
- IVirtualComponent c = ComponentCore.createComponent(ejbProj);
- Properties props = c.getMetaProperties();
- String clienturi = props.getProperty(CreationConstants.CLIENT_JAR_URI);
- IModelProvider writableEjbModel = ModelProviderManager.getModelProvider(ejbProj);
- Object modelObject = writableEjbModel.getModelObject();
-
- if( modelObject instanceof org.eclipse.jst.javaee.ejb.EJBJar )
- {
- org.eclipse.jst.javaee.ejb.EJBJar ejbres = (org.eclipse.jst.javaee.ejb.EJBJar) writableEjbModel.getModelObject();
- if (ejbres != null) {// Could have no DD
- if (clienturi != null && !clienturi.equals("")) { //$NON-NLS-1$
- ejbres.setEjbClientJar(clienturi);
- } else
- ejbres.setEjbClientJar(clientProjectName + ".jar");//$NON-NLS-1$
- }
- }
- else
- {
- org.eclipse.jst.j2ee.ejb.EJBJar ejbres = (org.eclipse.jst.j2ee.ejb.EJBJar) writableEjbModel.getModelObject();
- if (clienturi != null && !clienturi.equals("")) { //$NON-NLS-1$
- ejbres.setEjbClientJar(clienturi);
- } else
- ejbres.setEjbClientJar(clientProjectName + ".jar");//$NON-NLS-1$
- }
- }
- },null);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetRuntimeChangedDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetRuntimeChangedDelegate.java
deleted file mode 100644
index 669f7a9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetRuntimeChangedDelegate.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EjbFacetRuntimeChangedDelegate
-
- implements IDelegate
-
-{
- public void execute( final IProject project,
- final IProjectFacetVersion fv,
- final Object cfg,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 1 );
- }
-
- try
- {
- ClasspathHelper.removeClasspathEntries( project, fv );
-
- if( ! ClasspathHelper.addClasspathEntries( project, fv ) )
- {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- if( monitor != null )
- {
- monitor.worked( 1 );
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/operations/IEjbFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/operations/IEjbFacetInstallDataModelProperties.java
deleted file mode 100644
index d3b4431..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/operations/IEjbFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.project.operations;
-
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-
-public interface IEjbFacetInstallDataModelProperties
- extends IJ2EEModuleFacetInstallDataModelProperties {
-
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = EjbFacetProjectCreationDataModelProvider.class;
-
- public static final String CREATE_CLIENT = "IEjbFacetInstallDataModelProperties.CREATE_CLIENT"; //$NON-NLS-1$
- public static final String CLIENT_NAME = "IEjbFacetInstallDataModelProperties.CLIENT_NAME ";//$NON-NLS-1$
- public static final String CLIENT_SOURCE_FOLDER = "IEjbFacetInstallDataModelProperties.CLIENT_SOURCE_FOLDER ";//$NON-NLS-1$
- public static final String CLIENT_URI = "IEjbFacetInstallDataModelProperties.CLIENT_URI ";//$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/ArrayHelper.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/ArrayHelper.java
deleted file mode 100644
index b1a0fc6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/ArrayHelper.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project;
-
-
-/**
- * Insert the type's description here. Creation date: (09/07/00 9:06:48 AM)
- *
- * @author: Administrator
- */
-public class ArrayHelper {
- /**
- * ArrayHelper constructor comment.
- */
- public ArrayHelper() {
- super();
- }
-
- /**
- * Insert the method's description here. Creation date: (09/07/00 9:06:53 AM)
- */
- void newMethod() {
- //do nothing
- }
-
- /**
- * Sort the strings in the given collection.
- */
- private static void quickSort(String[] sortedCollection, int left, int right) {
- int original_left = left;
- int original_right = right;
- String mid = sortedCollection[(left + right) / 2];
- do {
- while (sortedCollection[left].compareTo(mid) < 0) {
- left++;
- }
- while (mid.compareTo(sortedCollection[right]) < 0) {
- right--;
- }
- if (left <= right) {
- String tmp = sortedCollection[left];
- sortedCollection[left] = sortedCollection[right];
- sortedCollection[right] = tmp;
- left++;
- right--;
- }
- } while (left <= right);
- if (original_left < right) {
- quickSort(sortedCollection, original_left, right);
- }
- if (left < original_right) {
- quickSort(sortedCollection, left, original_right);
- }
- }
-
- /**
- * Sorts an array of strings in place using quicksort.
- */
- public static int[] searchWhenTyping(String[] array, String typedText) {
- int[] indices = new int[array.length];
- int count = 0;
- for (int i = 0; i < array.length; i++) {
- if (array[i].startsWith(typedText)) {
- indices[count] = i;
- count++;
- }
- }
- int[] result = new int[count];
- for (int i = 0; i < count; i++) {
- result[i] = indices[i];
- }
- return result;
- }
-
- /**
- * Sort an int array Shell Sort from K&R, pg 108
- */
- public static void sort(int[] items) {
- int length = items.length;
- for (int gap = length / 2; gap > 0; gap /= 2) {
- for (int i = gap; i < length; i++) {
- for (int j = i - gap; j >= 0; j -= gap) {
- if (items[j] <= items[j + gap]) {
- int swap = items[j];
- items[j] = items[j + gap];
- items[j + gap] = swap;
- }
- }
- }
- }
- }
-
- /**
- * Sorts an array of strings in place using quicksort.
- */
- public static void sort(String[] strings) {
- if (strings.length > 1)
- quickSort(strings, 0, strings.length - 1);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/IEJBApplicationConstants.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/IEJBApplicationConstants.java
deleted file mode 100644
index afa970e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/IEJBApplicationConstants.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project;
-
-
-/*
- * The IWebApplicationContents are the list of tags that are usuable for specifying a web
- * application parameters via XML
- *
- * @see WebApplicationSpecification for the full DTD
- */
-
-public interface IEJBApplicationConstants {
-
- // EJB Application parameters
- String NODE = "node"; //$NON-NLS-1$
- String PORT = "port"; //$NON-NLS-1$
- String CLASSPATH = "classpath"; //$NON-NLS-1$
- String SOURCE_PATH = "sourcepath"; //$NON-NLS-1$
- String META_PATH = "metapath"; //$NON-NLS-1$
- String PATH = "path"; //$NON-NLS-1$
- String EXTENSION = "extension"; //$NON-NLS-1$
- String ERROR_HANDLER = "ErrorHandler"; //$NON-NLS-1$
-
- //We always use the same value so there is no need to have a proper setting
- String VIRTUAL_HOST_VALUE = "default_host"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/IOverwriteQuery.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/IOverwriteQuery.java
deleted file mode 100644
index 20ba730..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/IOverwriteQuery.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project;
-
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
-
-
-
-/**
- * Implementors of this interface answer one of the prescribed return codes when asked whether to
- * overwrite a certain path string (which could represent a resource path, a file system path, etc)
- */
-public interface IOverwriteQuery {
- public static final String CANCEL = EJBCreationResourceHandler.CANCEL_UI_;
- public static final String NO = EJBCreationResourceHandler.NO_UI_;
- public static final String YES = EJBCreationResourceHandler.YES_UI_;
- public static final String ALL = EJBCreationResourceHandler.ALL_UI_;
-
- /**
- * Answer one of the interface's prescribed responses indicating whether the entity represented
- * by the passed String should be overwritten
- *
- * @return String
- * @param pathString
- * java.lang.String
- */
- String queryOverwrite(String pathString);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/StringMatcher.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/StringMatcher.java
deleted file mode 100644
index 6a63b59..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/StringMatcher.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project;
-
-
-import java.util.Vector;
-
-public class StringMatcher {
- public static class Position {
- int start; //inclusive
- int end; //exclusive
-
- public Position(int start, int end) {
- this.start = start;
- this.end = end;
- }
-
- public int getStart() {
- return start;
- }
-
- public int getEnd() {
- return end;
- }
- }
-
- protected String fPattern;
- protected int fLength; // pattern length
- protected boolean fIgnoreWildCards;
- protected boolean fIgnoreCase;
- protected boolean fHasLeadingStar;
- protected boolean fHasTrailingStar;
- protected String fSegments[]; //the given pattern is split into * separated segments
- /* boundary value beyond which we don't need to search in the text */
- protected int fBound = 0;
- protected static final char fSingleWildCard = '\u0000';
-
- /**
- * StringMatcher constructor takes in a String object that is a simple pattern which may contain
- * |221*|222 for 0 and many characters and |221?|222 for exactly one character. Also takes as
- * parameter a boolean object specifying if case should be ignored
- *
- * @deprecated Use StringMatcher(pattern, ignoreCase, ignoreWildCards).
- */
- public StringMatcher(String aPattern, boolean ignoreCase) {
- this(aPattern, ignoreCase, false);
- }
-
- /**
- * StringMatcher constructor takes in a String object that is a simple pattern which may contain
- * |221*|222 for 0 and many characters and |221?|222 for exactly one character.
- *
- * Literal '*' and '?' characters must be escaped in the pattern e.g., "\*" means literal "*",
- * etc.
- *
- * Escaping any other character (including the escape character itself), just results in that
- * character in the pattern. e.g., "\a" means "a" and "\\" means "\"
- *
- * If invoking the StringMatcher with string literals in Java, don't forget escape characters
- * are represented by "\\".
- *
- * @param aPattern
- * the pattern to match text against
- * @param ignoreCase
- * if true, case is ignored
- * @param ignoreWildCards
- * if true, wild cards and their escape sequences are ignored (everything is taken
- * literally).
- */
- public StringMatcher(String aPattern, boolean ignoreCase, boolean ignoreWildCards) {
- fIgnoreCase = ignoreCase;
- fIgnoreWildCards = ignoreWildCards;
- fLength = aPattern.length();
-
- /* convert case */
- if (fIgnoreCase) {
- fPattern = aPattern.toUpperCase();
- } else {
- fPattern = aPattern;
- }
-
- if (fIgnoreWildCards) {
- parseNoWildCards();
- } else {
- parseWildCards();
- }
- }
-
- /**
- * Find the first occurrence of the pattern between <code>start</code)(inclusive)
- * and <code>end</code>(exclusive).
- * @param <code>text</code>, the String object to search in
- * @param <code>start</code>, the starting index of the search range, inclusive
- * @param <code>end</code>, the ending index of the search range, exclusive
- * @return an <code>StringMatcher.Position</code> object that keeps the starting
- * (inclusive) and ending positions (exclusive) of the first occurrence of the
- * pattern in the specified range of the text; return null if not found or subtext
- * is empty (start==end). A pair of zeros is returned if pattern is empty string
- * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
- * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
- */
-
- public StringMatcher.Position find(String text, int start, int end) {
- if (fPattern == null || text == null)
- throw new IllegalArgumentException();
-
- int tlen = text.length();
- if (start < 0)
- start = 0;
- if (end > tlen)
- end = tlen;
- if (end < 0 || start >= end)
- return null;
- if (fLength == 0)
- return new Position(start, start);
- if (fIgnoreWildCards) {
- int x = posIn(text, start, end);
- if (x < 0)
- return null;
- return new Position(x, x + fLength);
- }
-
- int segCount = fSegments.length;
- if (segCount == 0)//pattern contains only '*'(s)
- return new Position(start, end);
-
- int curPos = start;
- int matchStart = -1;
- for (int i = 0; i < segCount && curPos < end; ++i) {
- String current = fSegments[i];
- int nextMatch = regExpPosIn(text, curPos, end, current);
- if (nextMatch < 0)
- return null;
- if (i == 0)
- matchStart = nextMatch;
- curPos = nextMatch + current.length();
- }
- return new Position(matchStart, curPos);
- }
-
- /**
- * match the given <code>text</code> with the pattern
- *
- * @return true if matched eitherwise false
- * @param <code>text</code>, a String object
- */
- public boolean match(String text) {
- return match(text, 0, text.length());
- }
-
- /**
- * Given the starting (inclusive) and the ending (exclusive) poisitions in the <code>text</code>,
- * determine if the given substring matches with aPattern
- *
- * @return true if the specified portion of the text matches the pattern
- * @param String
- * <code>text</code>, a String object that contains the substring to match
- * @param int
- * <code>start<code> marks the starting position (inclusive) of the substring
- * @param int <code>end<code> marks the ending index (exclusive) of the substring
- */
- public boolean match(String text, int start, int end) {
- if (null == fPattern || null == text)
- throw new IllegalArgumentException();
-
- if (start > end)
- return false;
-
- if (fIgnoreWildCards)
- return fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
- int segCount = fSegments.length;
- if (segCount == 0)//pattern contains only '*'(s) or empty pattern
- return true;
- if (start == end)
- return fLength == 0;
- if (fLength == 0)
- return start == end;
-
- int tlen = text.length();
- if (start < 0)
- start = 0;
- if (end > tlen)
- end = tlen;
-
- int tCurPos = start;
- int bound = end - fBound;
- if (bound < 0)
- return false;
- int i = 0;
- String current = fSegments[i];
- int segLength = current.length();
-
- /* process first segment */
- if (!fHasLeadingStar) {
- if (!regExpRegionMatches(text, start, current, 0, segLength)) {
- return false;
- }
- ++i;
- tCurPos = tCurPos + segLength;
- }
-
- /* process middle segments */
- for (; i < segCount && tCurPos <= bound; ++i) {
- current = fSegments[i];
- int currentMatch;
- int k = current.indexOf(fSingleWildCard);
- if (k < 0) {
- currentMatch = textPosIn(text, tCurPos, end, current);
- if (currentMatch < 0)
- return false;
- } else {
- currentMatch = regExpPosIn(text, tCurPos, end, current);
- if (currentMatch < 0)
- return false;
- }
- tCurPos = currentMatch + current.length();
- }
-
- /* process final segment */
- if (!fHasTrailingStar && tCurPos != end) {
- int clen = current.length();
- return regExpRegionMatches(text, end - clen, current, 0, clen);
- }
- return i == segCount;
- }
-
- /**
- * This method parses the given pattern into segments seperated by wildcard '*' characters.
- * Since wildcards are not being used in this case, the pattern consists of a single segment.
- */
- private void parseNoWildCards() {
- fSegments = new String[1];
- fSegments[0] = fPattern;
- fBound = fLength;
- }
-
- /**
- * This method parses the given pattern into segments seperated by wildcard '*' characters.
- *
- * @param p,
- * a String object that is a simple regular expression with |221*|222 and/or
- * |221?|222
- */
- private void parseWildCards() {
- if (fPattern.startsWith("*"))//$NON-NLS-1$
- fHasLeadingStar = true;
- if (fPattern.endsWith("*")) {//$NON-NLS-1$
- /* make sure it's not an escaped wildcard */
- if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
- fHasTrailingStar = true;
- }
- }
-
- Vector temp = new Vector();
-
- int pos = 0;
- StringBuffer buf = new StringBuffer();
- while (pos < fLength) {
- char c = fPattern.charAt(pos++);
- switch (c) {
- case '\\' :
- if (pos >= fLength) {
- buf.append(c);
- } else {
- char next = fPattern.charAt(pos++);
- /* if it's an escape sequence */
- if (next == '*' || next == '?' || next == '\\') {
- buf.append(next);
- } else {
- /* not an escape sequence, just insert literally */
- buf.append(c);
- buf.append(next);
- }
- }
- break;
- case '*' :
- if (buf.length() > 0) {
- /* new segment */
- temp.addElement(buf.toString());
- fBound += buf.length();
- buf.setLength(0);
- }
- break;
- case '?' :
- /* append special character representing single match wildcard */
- buf.append(fSingleWildCard);
- break;
- default :
- buf.append(c);
- }
- }
-
- /* add last buffer to segment list */
- if (buf.length() > 0) {
- temp.addElement(buf.toString());
- fBound += buf.length();
- }
-
- fSegments = new String[temp.size()];
- temp.copyInto(fSegments);
- }
-
- /**
- * @param <code>text</code>, a string which contains no wildcard
- * @param <code>start</code>, the starting index in the text for search, inclusive
- * @param <code>end</code>, the stopping point of search, exclusive
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int posIn(String text, int start, int end) {//no wild card in pattern
- int max = end - fLength;
-
- if (!fIgnoreCase) {
- int i = text.indexOf(fPattern, start);
- if (i == -1 || i > max)
- return -1;
- return i;
- }
-
- for (int i = start; i <= max; ++i) {
- if (text.regionMatches(true, i, fPattern, 0, fLength))
- return i;
- }
-
- return -1;
- }
-
- /**
- * @param <code>text</code>, a simple regular expression that may only contain '?'(s)
- * @param <code>start</code>, the starting index in the text for search, inclusive
- * @param <code>end</code>, the stopping point of search, exclusive
- * @param <code>p</code>, a simple regular expression that may contains '?'
- * @param <code>caseIgnored</code>, wether the pattern is not casesensitive
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int regExpPosIn(String text, int start, int end, String p) {
- int plen = p.length();
-
- int max = end - plen;
- for (int i = start; i <= max; ++i) {
- if (regExpRegionMatches(text, i, p, 0, plen))
- return i;
- }
- return -1;
- }
-
- /**
- *
- * @return boolean
- * @param <code>text</code>, a String to match
- * @param <code>start</code>, int that indicates the starting index of match, inclusive
- * @param <code>end</code> int that indicates the ending index of match, exclusive
- * @param <code>p</code>, String, String, a simple regular expression that may contain '?'
- * @param <code>ignoreCase</code>, boolean indicating wether code>p</code> is case sensitive
- */
- protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
- while (plen-- > 0) {
- char tchar = text.charAt(tStart++);
- char pchar = p.charAt(pStart++);
-
- /* process wild cards */
- if (!fIgnoreWildCards) {
- /* skip single wild cards */
- if (pchar == fSingleWildCard) {
- continue;
- }
- }
- if (pchar == tchar)
- continue;
- if (fIgnoreCase) {
- char tc = Character.toUpperCase(tchar);
- if (tc == pchar)
- continue;
- }
- return false;
- }
- return true;
- }
-
- /**
- * @param <code>text</code>, the string to match
- * @param <code>start</code>, the starting index in the text for search, inclusive
- * @param <code>end</code>, the stopping point of search, exclusive
- * @param code>p
- * </code>, a string that has no wildcard
- * @param <code>
- * ignoreCase</code>, boolean indicating wether code>p</code> is case sensitive
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int textPosIn(String text, int start, int end, String p) {
-
- int plen = p.length();
- int max = end - plen;
-
- if (!fIgnoreCase) {
- int i = text.indexOf(p, start);
- if (i == -1 || i > max)
- return -1;
- return i;
- }
-
- for (int i = 0; i <= max; ++i) {
- if (text.regionMatches(true, i, p, 0, plen))
- return i;
- }
-
- return -1;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/ClientJARCreationConstants.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/ClientJARCreationConstants.java
deleted file mode 100644
index 042a6f0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/ClientJARCreationConstants.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 11, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-
-
-
-/**
- * @author schacher
- */
-public interface ClientJARCreationConstants {
- String DOT_JAR = ".jar"; //$NON-NLS-1$
- String SRC_FOLDER_NAME = "src"; //$NON-NLS-1$
- String _STUB = "_Stub"; //$NON-NLS-1$
- String UNDERSCORE = "_"; //$NON-NLS-1$
- String CREATING_CLIENT_JAR = EJBCreationResourceHandler.CREATING_CLIENT_JAR_UI_;
- String FILES_OUT_OF_SYNC = EJBCreationResourceHandler.FILES_OUT_OF_SYNC_UI_;
- String REMOVING_CLIENT_JAR = EJBCreationResourceHandler.ClientJAR_8;
- String SHOULD_OVERWRITE = EJBCreationResourceHandler.ClientJAR_9;
- String REMOVE_TITLE = EJBCreationResourceHandler.ClientJAR_10;
- String REMOVE_MESSAGE = EJBCreationResourceHandler.ClientJAR_11;
- String NO_CLIENT_JAR_TITLE = EJBCreationResourceHandler.ClientJAR_12;
- String NO_CLIENT_JAR_MSG = EJBCreationResourceHandler.ClientJAR_13;
- String REMOVE_ERROR_TITLE = EJBCreationResourceHandler.ClientJAR_14;
- String BINARY_EJB_PROJECT = EJBCreationResourceHandler.remove_client_jar_binary;
- String BINARY_CLIENT_PROJECT = EJBCreationResourceHandler.remove_client_jar_client_binary;
- String ERROR_REMOVING_CLIENT = EJBCreationResourceHandler.ClientJAR_15;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBComponentExportDataModelProvider.java
deleted file mode 100644
index 350d0ab..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBComponentExportOperation;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class EJBComponentExportDataModelProvider extends J2EEComponentExportDataModelProvider {
-
- public EJBComponentExportDataModelProvider() {
- super();
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new EJBComponentExportOperation(model);
- }
-
- protected String getProjectType() {
- return J2EEProjectUtilities.EJB;
- }
-
- protected String getWrongComponentTypeString(String projectName) {
- return EARCreationResourceHandler.getString(EARCreationResourceHandler.NOT_AN_EJB, new Object[]{projectName});
- }
-
- protected String getModuleExtension() {
- return ".jar"; //$NON-NLS-1$
- }
-
- public IStatus validate(String propertyName) {
- IStatus status = super.validate(propertyName);
- // if (status.isOK()) {
- // if (COMPONENT_NAME.equals(propertyName)) {
- // String projectName = (String) model.getProperty(COMPONENT_NAME);
- // IStatus status2 = ProjectCreationDataModel.validateProjectName(projectName);
- // if (!status2.isOK()) {
- // return status2;
- // }
- // IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- // EJBNatureRuntime nature = EJBNatureRuntime.getRuntime(project);
- // if (nature != null && nature.hasEJBClientJARProject()) {
- // return
- // WTPCommonPlugin.createWarningStatus(EJBCreationResourceHandler.getString("EJB_EXPORT_PROJECT_CONTAINS_CLEINT_WARNING"));
- // //$NON-NLS-1$
- // }
- // }
- // }
- return status;
- }
- /**
- * Exports the specified EJB Module project to the specified EJB JAR file.
- *
- * @param ejbProjectName
- * The name of the EJB Module project to export.
- * @param ejbJarFileName
- * The fully qualified EJB JAR file location to export the specified EJB Module
- * project.
- * @param overwriteExisting
- * If this is <code>true</code> then an existing file at the location specified by
- * <code>earFileName</code> will be overwritten.
- * @param exportSource
- * If this is <code>true</code> then all source files in the specified EJB Module
- * will be included in the resulting EJB JAR file.
- * @plannedfor WTP 1.0
- */
- // TODO: how should this be handled in new dm providers
- // public static void exportProject(String ejbProjectName, String ejbJarFileName, boolean
- // overwriteExisting, boolean exportSource) {
- // EJBModuleExportDataModel dataModel = new EJBModuleExportDataModel();
- // dataModel.setProperty(PROJECT_NAME, ejbProjectName);
- // dataModel.setBooleanProperty(OVERWRITE_EXISTING, overwriteExisting);
- // dataModel.setProperty(ARCHIVE_DESTINATION, ejbJarFileName);
- // dataModel.setBooleanProperty(EXPORT_SOURCE_FILES, exportSource);
- // try {
- // dataModel.getDefaultOperation().run(null);
- // } catch (InvocationTargetException e) {
- // Logger.getLogger().logError(e);
- // } catch (InterruptedException e) {
- // Logger.getLogger().logError(e);
- // }
- // }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBComponentImportDataModelProvider.java
deleted file mode 100644
index c374dcc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEJBComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBComponentImportOperation;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * This dataModel is used for to import EJB Modules (from EJB Jar files) into the workspace.
- *
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- *
- * @plannedfor WTP 1.0
- */
-public final class EJBComponentImportDataModelProvider extends J2EEComponentImportDataModelProvider implements IEJBComponentImportDataModelProperties {
-
- protected int getType() {
- return XMLResource.EJB_TYPE;
- }
-
- protected Archive openArchive(String uri) throws OpenFailureException {
- Archive archive = CommonarchiveFactory.eINSTANCE.openEJBJarFile(getArchiveOptions(), uri);
- return archive;
- }
-
- @Override
- protected void handleUnknownType(JavaEEQuickPeek jqp) {
- jqp.setType(J2EEVersionConstants.EJB_TYPE);
- jqp.setVersion(J2EEVersionConstants.EJB_3_0_ID);
- jqp.setJavaEEVersion(J2EEVersionConstants.JEE_5_0_ID);
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new EJBComponentImportOperation(model);
- }
-
- protected IDataModel createJ2EEComponentCreationDataModel() {
- IDataModel ejbCreationDM = DataModelFactory.createDataModel(new EjbFacetProjectCreationDataModelProvider());
-
- FacetDataModelMap map = (FacetDataModelMap) ejbCreationDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel ejbFacetDataModel = map.getFacetDataModel( J2EEProjectUtilities.EJB );
- ejbFacetDataModel.setBooleanProperty(IEjbFacetInstallDataModelProperties.CREATE_CLIENT, false);
- return ejbCreationDM;
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean set = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(ARCHIVE_WRAPPER)) {
- IDataModel moduleDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
- if (getArchiveWrapper() != null) {
-
- FacetDataModelMap map = (FacetDataModelMap) moduleDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel ejbFacetDataModel = map.getFacetDataModel( J2EEProjectUtilities.EJB );
-
- int version = getModuleSpecVersion();
- String versionText = J2EEVersionUtil.getEJBTextVersion( version );
- ejbFacetDataModel.setStringProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionText);
- updateJavaFacetVersion();
- model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- }
- }
- return set;
- }
-
- public void init() {
- super.init();
- IDataModel componentCreationDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
- FacetDataModelMap map = (FacetDataModelMap) componentCreationDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel ejbFacet = map.getFacetDataModel( IJ2EEFacetConstants.EJB );
- ejbFacet.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, false);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBCreationResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBCreationResourceHandler.java
deleted file mode 100644
index 0def8db..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBCreationResourceHandler.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EJBCreationResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "ejbcreation";//$NON-NLS-1$
-
- private EJBCreationResourceHandler() {
- // Do not instantiate
- }
-
- public static String Error_occured_getting_ejb__ERROR_;
- public static String Loading_examples_____UI_;
- public static String Traversing_file_system____UI_;
- public static String Importing_files____UI_;
- public static String Creating_EJB_Project____UI_;
- public static String Not_an_ejb_project_UI_;
- public static String An_ejb_project_must_be_open_and_must_exist_for_properties_to_be_edited_UI_;
- public static String CANCEL_UI_;
- public static String NO_UI_;
- public static String YES_UI_;
- public static String ALL_UI_;
- public static String None_UI_;
- public static String Enter_bean_name_UI_;
- public static String Message_invalid_bean_name_UI_;
- public static String Bean_name_is_already_used_UI_;
- public static String Bean_name_UI_;
- public static String Default_pack_not_be_null_UI_;
- public static String The_project_does_not_conta_UI_;
- public static String Select_a_source_folder__UI_;
- public static String The_selected_source_folder_UI_;
- public static String The_selected_source_folder1_UI_;
- public static String Package_root_must_be_direc_UI_;
- public static String Bean_class_UI_;
- public static String Bean_superclass_UI_;
- public static String Message_Enter_bean_class_name_UI_;
- public static String Bean_Class_Cannot_Be_In_UI_;
- public static String Class_implements;
- public static String Message_Enter_home_interface_name_UI_;
- public static String Message_Home_Interface_UI_;
- public static String Message_Enter_remote_interface_name_UI_;
- public static String Message_Remote_Interface_UI_;
- public static String Remote_interface_cannot_be_i_UI_;
- public static String Home_interface_cannot_be_i_UI_;
- public static String Interface_extends;
- public static String Local_Home_not_in_a_default_pkg_UI_;
- public static String Enter_local_home_name_UI_;
- public static String Enter_local_int_name_UI_;
- public static String Local_home_interface_UI_;
- public static String Local_interface_UI_;
- public static String Local_not_in_a_default_pkg_UI_;
- public static String Enter_service_endpoint_name_UI_;
- public static String Service_endpoint_interface_UI_;
- public static String Service_endpoint_not_in_a_default_pkg_UI_;
- public static String Atleast_one_client;
- public static String Atleast_one_client_with_service;
- public static String Name_collision_pattern;
- public static String Creating_source_folder__1;
- public static String Select_valid_EJB_project;
- public static String BEAN_SUPERCLASS_NOT_EXIST;
- public static String Super_EJB_has_no_local_interface;
- public static String Super_EJB_has_no_remote_interface;
- public static String Key_class_UI_;
- public static String Entity_enter_primary_key;
- public static String Entyty_primary_key_not_default;
- public static String Entity_primary_key_duplicate;
- public static String EJB_CLIENT_JAR_CREATION_ERROR_;
- public static String EJB_CLIENT_JAR_CREATION_MESSAGE_;
- public static String CREATING_CLIENT_JAR_UI_;
- public static String FILES_OUT_OF_SYNC_UI_;
- public static String EJB_Client_JAR_name_exists_;
- public static String EJB_JAR_already_has_client_Jar_;
- public static String CLIENT_JAR_URI_NOT_RESOLVE_UI_;
- public static String ClientJAR_8;
- public static String ClientJAR_9;
- public static String ClientJAR_10;
- public static String ClientJAR_11;
- public static String ClientJAR_12;
- public static String ClientJAR_13;
- public static String ClientJAR_14;
- public static String ClientJAR_15;
- public static String remove_client_jar_binary;
- public static String CANNOT_RESOLVE_INTERFACE_UI_;
- public static String _1;
- public static String _2;
- public static String Neither_Bean_A_nor_Bean_B_have_a_local_client_view_UI_;
- public static String Relationship_name_cannot_be_empty_UI_;
- public static String Relationship_name_already_exist_198_UI_;
- public static String Role_name_for_Bean_A_cannot_be_empty_UI_;
- public static String Role_name_for_Bean_A_must_be_java_valid_field_UI_;
- public static String Role_name_for_Bean_B_cannot_be_empty_UI_;
- public static String Role_name_for_Bean_B_must_be_java_valid_field_UI_;
- public static String Multiplicity_for_Bean_A_cannot_be_empty_UI_;
- public static String Multiplicity_for_Bean_B_cannot_be_empty_UI_;
- public static String CMR_field_name_for_Bean_A_cannot_be_empty_UI_;
- public static String CMR_field_name_for_Bean_B_cannot_be_empty_UI_;
- public static String CMR_field_type_for_Bean_A_cannot_be_empty_UI_;
- public static String CMR_field_type_for_Bean_B_cannot_be_empty_UI_;
- public static String Relationship_must_be_navigable_atleast_in_one_direction_UI_;
- public static String Role_name_cannot_be_the_same_UI_;
- public static String Cannot_create_many_to_many_relationship_UI_;
- public static String is_not_an_unique_CMR_;
- public static String is_not_an_unique_role_name_;
- public static String CMR_fields_must_be_unique_;
- public static String Bean_A_does_not_match_Bean_B_client_view_;
- public static String Bean_A_CMR_field_name_is_not_valid_java_field_UI_;
- public static String Bean_B_CMR_field_name_is_not_valid_java_field_UI_;
- public static String Bean_empty_;
- public static String Selected_bean_a_must_be_a_cmp_;
- public static String Selected_bean_b_must_be_a_cmp_;
- public static String Selected_bean_a_must_be_2_x_cmp_;
- public static String Selected_bean_b_must_be_2_x_cmp_;
- public static String FIELD_CANNOT_BE_EMPTY;
- public static String AN_OPERATION_MUST_BE_SELECTED;
- public static String CLIENT_VIEW_ERR_DELETE_SUPERCLASS;
- public static String CANNOT_REMOVE_BOTH_LOCAL_AND_REMOTE;
- public static String SELECT_ONE_OR_MORE_VIEWS;
- public static String ONLY_ONE_VIEW_CREATE;
- public static String ERR_CMP_FIELD_LIST_EMPTY;
- public static String ERR_CMP_FIELD_LIST_KEY_FIELD_EMPTY;
- public static String ERR_PLEASE_SELECT_A_FOREIGN_KEY;
- public static String ERR_FOREIGN_KEY_SELECTED;
- public static String ServiceEndpoint_interface_cannot_be_UI_;
- public static String NON_INTERFACE_NAME_CANNOT_BE_NULL_UI_;
- public static String ONE_END_MUST_BE_NAV;
- public static String CANT_BE_BINARY_PROJECT_UI_;
- public static String EJB_EXPORT_PROJECT_CONTAINS_CLEINT_WARNING;
- public static String remove_client_jar_client_binary;
- public static String EJB_Client_JAR_Creation_Error_;
- public static String Cannot_Be_Binary_Project_For_Client_;
- public static String Cannot_Be_StandAlone_Project_For_Client_;
- public static String TRANSACTION_TYPE_CONTAINER;
- public static String TRANSACTION_TYPE_BEAN;
- public static String STATE_TYPE_STATELESS;
- public static String STATE_TYPE_STATEFUL;
- public static String DESTINATION_TYPE_QUEUE;
- public static String DESTINATION_TYPE_TOPIC;
-
- public static String ERR_BEAN_ALREADY_EXISTS;
- public static String ERR_COULD_NOT_RESOLVE_INTERFACE;
- public static String ERR_LOCAL_HOME_MISSING_CREATE_METHOD;
- public static String ERR_REMOTE_HOME_MISSING_CREATE_METHOD;
- public static String ERR_LOCAL_HOME_CREATE_METHOD_RETURN_TYPE_INVALID;
- public static String ERR_REMOTE_HOME_CREATE_METHOD_RETURN_TYPE_INVALID;
- public static String ERR_LOCAL_COMPONENT_NOT_INTERFACE;
- public static String ERR_LOCAL_HOME_NOT_INTERFACE;
- public static String ERR_REMOTE_COMPONENT_NOT_INTERFACE;
- public static String ERR_REMOTE_HOME_NOT_INTERFACE;
- public static String ERR_NO_MESSAGE_LISTENER_INTERFACE;
- public static String WRN_BEAN_NAME_IS_EMPTY;
-
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EJBCreationResourceHandler.class);
- }
-
- public static final String CLIENT_SAME_NAME_AS_EJB = _1; //$NON-NLS-1$
- public static final String CLIENT_SAME_NAME_AS_EAR = _2; //$NON-NLS-1$
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("ejbcreation");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java
deleted file mode 100644
index 9208dec..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class EjbFacetInstallDataModelProvider
- extends J2EEModuleFacetInstallDataModelProvider
- implements IEjbFacetInstallDataModelProperties{
-
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(CONFIG_FOLDER);
- names.add(CREATE_CLIENT);
- names.add(CLIENT_NAME);
- names.add(CLIENT_SOURCE_FOLDER);
- names.add(CLIENT_URI);
- return names;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if(propertyName.equals(FACET_ID)){
- return EJB;
- }else if (propertyName.equals(CREATE_CLIENT)) {
- return getProperty(ADD_TO_EAR);
- } else if (propertyName.equals(CLIENT_SOURCE_FOLDER)) {
- return J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.EJB_CONTENT_FOLDER);
- }else if (propertyName.equals(CONFIG_FOLDER)){
- return J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.EJB_CONTENT_FOLDER);
- }else if (propertyName.equals(CLIENT_NAME)){
- String clientProjectName = model.getStringProperty(FACET_PROJECT_NAME);
- clientProjectName = clientProjectName + "Client";
-
- //check that the default name does not already exist, if it does try 1-9, if none of thouse work use orginal default
- IStatus status = ProjectCreationDataModelProviderNew.validateName(clientProjectName);
- int append = 0;
- while(!status.isOK() && append <= 9) {
- append++;
- status = ProjectCreationDataModelProviderNew.validateName(clientProjectName + append);
- }
- if(append > 0 && append <= 9) {
- clientProjectName = clientProjectName + append;
- }
-
- return clientProjectName; //$NON-NLS-1$
- }else if (propertyName.equals(CLIENT_URI)){
- String clientProjectURI = model.getStringProperty(CLIENT_NAME).replace(' ', '_');
- return clientProjectURI + ".jar"; //$NON-NLS-1$
- } else if (propertyName.equals(MODULE_URI)) {
- String projectName = model.getStringProperty(FACET_PROJECT_NAME).replace(' ', '_');
- return projectName + IJ2EEModuleConstants.JAR_EXT;
- } else if (propertyName.equals(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)) {
- if (getBooleanProperty(CREATE_CLIENT)) {
- return Boolean.TRUE;
- }
- IProjectFacetVersion facetVersion = (IProjectFacetVersion)getProperty(FACET_VERSION);
- if (facetVersion == EJB_30) {
- return J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EJB_GENERATE_DD);
- }
- return Boolean.TRUE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
- return J2EEVersionUtil.convertEJBVersionStringToJ2EEVersionID(version.getVersionString());
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- if (CLIENT_NAME.equals(propertyName)) {
- return getBooleanProperty(CREATE_CLIENT);
- } else if (CLIENT_URI.equals(propertyName)) {
- return getBooleanProperty(CREATE_CLIENT);
- } else if (CREATE_CLIENT.equals(propertyName)) {
- return getBooleanProperty(ADD_TO_EAR);
- } else if (GENERATE_DD.equals(propertyName)) {
- return !getBooleanProperty(CREATE_CLIENT);
- }
- return super.isPropertyEnabled(propertyName);
- }
-
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean status = super.propertySet(propertyName, propertyValue);
-
- if (propertyName.equals(CREATE_CLIENT)) {
- model.notifyPropertyChange(CLIENT_NAME, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(CLIENT_URI, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(GENERATE_DD, IDataModel.ENABLE_CHG);
- if ((Boolean) propertyValue && isPropertySet(GENERATE_DD)) {
- model.setBooleanProperty(GENERATE_DD, true);
- } else {
- model.notifyPropertyChange(GENERATE_DD, IDataModel.DEFAULT_CHG);
- }
- } else if (propertyName.equals(FACET_PROJECT_NAME)) {
- model.setStringProperty(CLIENT_NAME, (String) model.getDefaultProperty(CLIENT_NAME));
- model.setStringProperty(CLIENT_URI, (String) model.getDefaultProperty(CLIENT_URI));
- } else if (propertyName.equals(ADD_TO_EAR)) {
- boolean addToEar = (Boolean) propertyValue;
- if (!addToEar && isPropertySet(CREATE_CLIENT)) {
- model.setBooleanProperty(CREATE_CLIENT, false);
- } else {
- model.notifyPropertyChange(CREATE_CLIENT, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(CLIENT_NAME, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(CLIENT_URI, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(GENERATE_DD, IDataModel.ENABLE_CHG);
- if ((Boolean) getProperty(CREATE_CLIENT) && isPropertySet(GENERATE_DD)) {
- model.setBooleanProperty(GENERATE_DD, true);
- } else {
- model.notifyPropertyChange(GENERATE_DD, IDataModel.DEFAULT_CHG);
- }
- }
- model.notifyPropertyChange(CREATE_CLIENT, IDataModel.ENABLE_CHG);
- } else if (propertyName.equals(CONFIG_FOLDER))
- {
- if( this.javaFacetInstallConfig != null )
- {
- final IPath sourceFolder
- = propertyValue == null ? null : new Path( (String) propertyValue );
-
- this.javaFacetInstallConfig.setSourceFolder( sourceFolder );
- }
- }
-
- return status;
- }
-
- public IStatus validate(String propertyName) {
- if (propertyName.equals(CLIENT_NAME)) {
- //should only validate on CLIENT_NAME if going to create a client
- boolean createCleint = model.getBooleanProperty(CREATE_CLIENT);
- if(createCleint) {
- String projectName = model.getStringProperty( CLIENT_NAME );
- IStatus status = ProjectCreationDataModelProviderNew.validateName( projectName );
- return status;
- } else {
- return OK_STATUS;
- }
- }else if( propertyName.equals(CLIENT_URI)){
- //should only validate on CLIENT_URI if going to create a client
- boolean createCleint = model.getBooleanProperty(CREATE_CLIENT);
- if(createCleint) {
- String clientURI = model.getStringProperty( CLIENT_URI );
- IStatus status = ProjectCreationDataModelProviderNew.validateName( clientURI );
- return status;
- } else {
- return OK_STATUS;
- }
- }
- return super.validate(propertyName);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index 24fe53e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public class EjbFacetProjectCreationDataModelProvider extends
-J2EEFacetProjectCreationDataModelProvider {
-
- public EjbFacetProjectCreationDataModelProvider() {
- super();
- }
-
- public void init() {
- super.init();
-
- Collection<IProjectFacet> requiredFacets = new ArrayList<IProjectFacet>();
- requiredFacets.add(JavaFacetUtils.JAVA_FACET);
- requiredFacets.add(IJ2EEFacetConstants.EJB_FACET);
- setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
-
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel javaFacet = map.getFacetDataModel(JavaFacetUtils.JAVA_FACET.getId());
- IDataModel ejbFacet = map.getFacetDataModel(IJ2EEFacetConstants.EJB_FACET.getId());
- String ejbRoot = ejbFacet.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
- javaFacet.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, ejbRoot);
- // If using optimized single root structure, set the output folder to be the content folder
- if (ProductManager.shouldUseSingleRootStructure())
- javaFacet.setProperty(IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME, ejbRoot);
- ejbFacet.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
- if (isPropertySet(EAR_PROJECT_NAME))
- setProperty(EAR_PROJECT_NAME, event.getProperty());
- else
- model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
- }else if (IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR.equals(event.getPropertyName())) {
- setProperty(ADD_TO_EAR, event.getProperty());
- }
- }
- });
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- if( propertyName.equals( MODULE_URI )){
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel ejbFacet = map.getFacetDataModel( IJ2EEFacetConstants.EJB );
- ejbFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
- }
- return super.propertySet(propertyName, propertyValue);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/IEjbFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/IEjbFacetInstallDataModelProperties.java
deleted file mode 100644
index 2862f55..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/IEjbFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-/**
- * This interface is being made public. Please use org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties
- *
- * @deprecated
- * @see org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties
- */
-public interface IEjbFacetInstallDataModelProperties
- extends org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties {
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/refactor/UpdateEJBClientRefOnDeleteOp.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/refactor/UpdateEJBClientRefOnDeleteOp.java
deleted file mode 100644
index fe42996..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/refactor/UpdateEJBClientRefOnDeleteOp.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ejb.refactor;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Subclass of <code>UpdateEJBClientRefOp</code> that updates the ejb client ref
- * in the ejb-jar.xml file of a dependent EJB module when the name of the ejb
- * client project is deleted.
- */
-public class UpdateEJBClientRefOnDeleteOp extends UpdateEJBClientRefOp {
-
- public UpdateEJBClientRefOnDeleteOp() {
- super();
- }
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return updateEJBClientRef(monitor, true);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/refactor/UpdateEJBClientRefOnRenameOp.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/refactor/UpdateEJBClientRefOnRenameOp.java
deleted file mode 100644
index a875182..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/refactor/UpdateEJBClientRefOnRenameOp.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ejb.refactor;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Subclass of <code>UpdateEJBClientRefOp</code> that updates the ejb client ref
- * in the ejb-jar.xml file of a dependent EJB module when the name of the ejb
- * client project is renamed.
- */
-public class UpdateEJBClientRefOnRenameOp extends UpdateEJBClientRefOp {
-
- public UpdateEJBClientRefOnRenameOp() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return updateEJBClientRef(monitor, false);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/refactor/UpdateEJBClientRefOp.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/refactor/UpdateEJBClientRefOp.java
deleted file mode 100644
index 43b15f2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/refactor/UpdateEJBClientRefOp.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ejb.refactor;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EJBJarImpl;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRefactoringProperties;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.componentcore.internal.Property;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Abstract based class of operations that update the ejb client ref in the ejb-jar.xml file
- * of a dependent EJB module when the name of the ejb client project is refactored.
- */
-public abstract class UpdateEJBClientRefOp extends AbstractDataModelOperation
- implements ProjectRefactoringProperties {
-
- public UpdateEJBClientRefOp() {
- super();
- }
-
- protected IStatus updateEJBClientRef(final IProgressMonitor monitor, final boolean remove) throws ExecutionException {
-
- final ProjectRefactorMetadata dependentMetadata = (ProjectRefactorMetadata) model.getProperty(DEPENDENT_PROJECT_METADATA);
- final ProjectRefactorMetadata refactoredMetadata = (ProjectRefactorMetadata) model.getProperty(PROJECT_METADATA);
- ProjectRefactorMetadata originalMetadata = refactoredMetadata;
- if (!remove) {
- originalMetadata = (ProjectRefactorMetadata) model.getProperty(ORIGINAL_PROJECT_METADATA);
- }
-
- // the dependent project must be an EJB project and the refactored project must be a utility project
- if (!(dependentMetadata.isEJB() && refactoredMetadata.isUtility())) {
- return Status.OK_STATUS;
- }
-
- // Update the ejb client jar prop in the ejb-jar.xml
- final String originalProjectName = originalMetadata.getProjectName();
- EnterpriseArtifactEdit ejbEdit = null;
- try{
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForWrite(dependentMetadata.getProject());
- if(ejbEdit != null) {
- final EJBJarImpl ejbres = (EJBJarImpl) ejbEdit.getDeploymentDescriptorRoot();
- final String ejbClientJar = ejbres.getEjbClientJar();
- if (ejbClientJar != null && ejbClientJar.equals(originalProjectName + ".jar")) { //$NON-NLS-1$
- if (remove) {
- ejbres.setEjbClientJar(null);
- } else {
- final String newProjectName = refactoredMetadata.getProjectName();
- ejbres.setEjbClientJar(newProjectName + ".jar");//$NON-NLS-1$
- }
- ejbEdit.saveIfNecessary(monitor);
- }
- }
- } finally {
- if(ejbEdit != null) {
- ejbEdit.dispose();
- }
- }
-
- // update the client jar props in the .component file
- StructureEdit core = null;
- try {
- core = StructureEdit.getStructureEditForWrite(dependentMetadata.getProject());
- if(core != null){
- WorkbenchComponent component = core.getComponent();
- // if the deploy-name had been set to the old project name, update it to
- // the new project name
- // if there is a context-root property that had been set to the old project name, update it to
- // the new project name
- List propList = component.getProperties();
- for (int i = 0; i < propList.size(); i++) {
- final Property prop = (Property) propList.get(i);
- if (prop.getName().equals(CreationConstants.EJB_CLIENT_NAME) && prop.getValue().equals(originalMetadata.getProjectName())) {
- propList.remove(i);
- if (!remove) {
- final Property newProp = ComponentcoreFactory.eINSTANCE.createProperty();
- newProp.setName(CreationConstants.EJB_CLIENT_NAME);
- newProp.setValue(refactoredMetadata.getProjectName());
- propList.add(0, newProp);
- } else {
- i--;
- }
- } else if (prop.getName().equals(CreationConstants.CLIENT_JAR_URI) && prop.getValue().equals(originalMetadata.getProjectName() + ".jar")) { //$NON-NLS-1$
- propList.remove(i);
- if (!remove) {
- final Property newProp = ComponentcoreFactory.eINSTANCE.createProperty();
- newProp.setName(CreationConstants.CLIENT_JAR_URI);
- newProp.setValue(refactoredMetadata.getProjectName() + ".jar");
- propList.add(0, newProp);
- } else {
- i--;
- }
- }
- }
- }
- } finally {
- if(core != null) {
- core.saveIfNecessary(null);
- core.dispose();
- }
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * Override to disable redo support
- * @see org.eclipse.core.commands.operations.IUndoableOperation#canRedo()
- */
- public boolean canRedo() {
- return false;
- }
-
- /**
- * Override to disable undo support.
- * @see org.eclipse.core.commands.operations.IUndoableOperation#canUndo()
- */
- public boolean canUndo() {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ActivationConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ActivationConfigItemProvider.java
deleted file mode 100644
index 9b075cd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ActivationConfigItemProvider.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.ActivationConfig}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ActivationConfigItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ActivationConfigItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(EjbPackage.eINSTANCE.getActivationConfig_ConfigProperties());
- childrenReferences.add(EjbPackage.eINSTANCE.getActivationConfig_Descriptions());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ActivationConfig.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ActivationConfig"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- */
- public String getText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("_UI_ActivationConfig_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ActivationConfig.class)) {
- case EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES :
- case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getActivationConfig_ConfigProperties(), EjbFactory.eINSTANCE.createActivationConfigProperty()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getActivationConfig_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getActivationConfig_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ActivationConfigPropertyItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ActivationConfigPropertyItemProvider.java
deleted file mode 100644
index 49fa5d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ActivationConfigPropertyItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.ActivationConfigProperty}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ActivationConfigPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ActivationConfigPropertyItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- //addValuePropertyDescriptor(object);
- //addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ActivationConfigProperty_value_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ActivationConfigProperty_value_feature", "_UI_ActivationConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getActivationConfigProperty_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ActivationConfigProperty_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ActivationConfigProperty_name_feature", "_UI_ActivationConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getActivationConfigProperty_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns ActivationConfigProperty.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ActivationConfigProperty"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- */
- public String getText(Object object) {
- String label = ((ActivationConfigProperty) object).getName();
- return label == null || label.length() == 0 ? EJBProviderLibrariesResourceHandler.getString("_UI_ActivationConfigProperty_type") : //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("_UI_ActivationConfigProperty_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ActivationConfigProperty.class)) {
- case EjbPackage.ACTIVATION_CONFIG_PROPERTY__VALUE :
- case EjbPackage.ACTIVATION_CONFIG_PROPERTY__NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/AssemblyDescriptorItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/AssemblyDescriptorItemProvider.java
deleted file mode 100644
index adc6a02..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/AssemblyDescriptorItemProvider.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.AssemblyDescriptor}object.
- */
-public class AssemblyDescriptorItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public AssemblyDescriptorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- MethodPermission child = EjbFactory.eINSTANCE.createMethodPermission();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- EjbPackage pkg = EjbPackage.eINSTANCE;
- Collection result = new ArrayList();
- result.add(pkg.getAssemblyDescriptor_SecurityRoles());
- result.add(pkg.getAssemblyDescriptor_MethodPermissions());
- result.add(pkg.getAssemblyDescriptor_MethodTransactions());
- result.add(pkg.getAssemblyDescriptor_ExcludeList());
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "CreateMethodPermission");//$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("Create_MethodPermission_UI_"); //$NON-NLS-1$ = "Create MethodPermission"
- }
-
- /**
- * This returns the help text for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return EJBProviderLibrariesResourceHandler.getString("Create_a_child_of_type_Met_UI_") + refObject.eClass().getName() + ".";//$NON-NLS-2$ //$NON-NLS-1$ = "Create a child of type MethodPermission for the selected "
- }
-
- /**
- * This returns AssemblyDescriptor.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("assemblyDescriptor_obj");//$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the AssemblyDescriptor.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the ejbJar feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("EjbJar_UI_"), //$NON-NLS-1$ = "EjbJar"
- EJBProviderLibrariesResourceHandler.getString("The_ejbJar_property_UI_"), //$NON-NLS-1$ = "The ejbJar property"
- pkg.getAssemblyDescriptor_EjbJar()));
-
- }
- return itemPropertyDescriptors;
- }
-
- public String getText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("AssemblyDescriptor_UI_"); //$NON-NLS-1$ = "AssemblyDescriptor"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(AssemblyDescriptor.class)) {
- case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS :
- case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS :
- case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES :
- case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST :
- case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getAssemblyDescriptor_MethodPermissions(), EjbFactory.eINSTANCE.createMethodPermission()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getAssemblyDescriptor_MethodTransactions(), EjbFactory.eINSTANCE.createMethodTransaction()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getAssemblyDescriptor_SecurityRoles(), CommonFactory.eINSTANCE.createSecurityRole()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getAssemblyDescriptor_ExcludeList(), EjbFactory.eINSTANCE.createExcludeList()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getAssemblyDescriptor_MessageDestinations(), CommonFactory.eINSTANCE.createMessageDestination()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/CMPAttributeItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/CMPAttributeItemProvider.java
deleted file mode 100644
index 6b4ef1e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/CMPAttributeItemProvider.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.CMPAttribute}object.
- */
-public class CMPAttributeItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- protected static final String[] choiceOfTypes = {"boolean", "byte", "byte[]", "char", "double", "float", "int", "long", "short", "java.lang.Boolean", "java.lang.Byte", "java.lang.Character", "java.lang.Double", "java.lang.Float", "java.lang.Integer", "java.lang.Long", "java.lang.Short", "java.lang.String", "java.math.BigDecimal", "java.sql.Date", "java.sql.Time", "java.sql.Timestamp", "java.util.Calendar", "java.util.Date"}; //$NON-NLS-24$//$NON-NLS-23$//$NON-NLS-22$//$NON-NLS-21$//$NON-NLS-20$//$NON-NLS-19$//$NON-NLS-18$//$NON-NLS-17$//$NON-NLS-16$//$NON-NLS-15$//$NON-NLS-14$//$NON-NLS-13$//$NON-NLS-12$//$NON-NLS-11$//$NON-NLS-10$//$NON-NLS-9$//$NON-NLS-8$//$NON-NLS-7$//$NON-NLS-6$//$NON-NLS-5$//$NON-NLS-4$//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public CMPAttributeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- ContainerManagedEntity child = EjbFactory.eINSTANCE.createContainerManagedEntity();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This creates a primitive {@link com.ibm.etools.emf.edit.command.SetCommand}.
- */
- protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value) {
-
- if (feature == EcorePackage.eINSTANCE.getENamedElement_Name()) {
- return new SetCommand(domain, owner, feature, value) {
- protected Command setTypeCommand;
-
- public void doExecute() {
- CMPAttribute cmpAttribute = (CMPAttribute) this.owner;
- JavaHelpers type = cmpAttribute.getType();
- super.doExecute();
- if (cmpAttribute.getType() != type) {
- setTypeCommand = SetCommand.create(this.domain, this.owner, EcorePackage.eINSTANCE.getETypedElement_EType(), type);
- if (setTypeCommand.canExecute()) {
- setTypeCommand.execute();
- } else {
- setTypeCommand.dispose();
- setTypeCommand = null;
- }
- }
- }
-
- public void doUndo() {
- if (setTypeCommand != null) {
- setTypeCommand.undo();
- }
- super.doUndo();
- }
-
- public void doRedo() {
- super.doRedo();
- if (setTypeCommand != null) {
- setTypeCommand.redo();
- }
- }
-
- public void doDispose() {
- super.doDispose();
- if (setTypeCommand != null) {
- setTypeCommand.dispose();
- }
- }
- };
- }
- return super.createSetCommand(domain, owner, feature, value);
- }
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "CreateContainerManagedEntity"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("Create_ContainerManagedEnt_UI_"); //$NON-NLS-1$ = "Create ContainerManagedEntity"
- }
-
- /**
- * This returns the help text for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return EJBProviderLibrariesResourceHandler.getString("Create_a_child_of_type_Con_UI_") + refObject.eClass().getName() + "."; //$NON-NLS-2$ //$NON-NLS-1$ = "Create a child of type ContainerManagedEntity for the selected "
- }
-
- /**
- * This returns CMPAttribute.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage((((CMPAttribute) object).isKey()) ? "attributeKey_obj" : "attribute_obj"); //$NON-NLS-2$//$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the CMPAttribute.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- // EjbPackage pkg = EjbPackage.eINSTANCE;
- EcorePackage ePackageEcore = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
- /*
- * // This is for the value feature. // itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Value", "The
- * value property", pkg.getCMPAttribute_Value())); // This is for the isTransient
- * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "IsTransient",
- * "The isTransient property", pkg.getCMPAttribute_IsTransient())); // This is for the
- * isVolatile feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "IsVolatile",
- * "The isVolatile property", pkg.getCMPAttribute_IsVolatile())); // This is for the
- * isChangeable feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "IsChangeable",
- * "The isChangeable property", pkg.getCMPAttribute_IsChangeable()));
- */
-
- // This is for the name feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Name_UI_"), //$NON-NLS-1$ = "Name"
- EJBProviderLibrariesResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$ = "The name property"
- ePackageEcore.getENamedElement_Name(), false, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- // This is for the eTypeClassifier feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Type_UI_"), //$NON-NLS-1$ = "ETypeClassifier"
- EJBProviderLibrariesResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$ = "The eTypeClassifier property"
- ePackageEcore.getETypedElement_EType(), false) {
- public Object getPropertyValue(Object o) {
- CMPAttribute thisCMPAttribute = (CMPAttribute) o;
- return createPropertyValueWrapper(o, thisCMPAttribute.getType().getQualifiedName());
- }
-
- public Collection getChoiceOfValues(Object o) {
- CMPAttribute thisCMPAttribute = (CMPAttribute) o;
- Collection result = new ArrayList();
- for (int i = 0; i < choiceOfTypes.length; ++i) {
- result.add(JavaRefFactory.eINSTANCE.reflectType(choiceOfTypes[i], thisCMPAttribute));
- }
- return result;
- }
- });
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_CMPAttribute_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CMPAttribute_description_feature", "_UI_CMPAttribute_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getCMPAttribute_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(EjbPackage.eINSTANCE.getCMPAttribute_Descriptions());
- }
- return childrenReferences;
- }
-
- public String getText(Object object) {
-
- CMPAttribute cmpAttribute = (CMPAttribute) object;
- JavaHelpers type = cmpAttribute.getType();
- String typeName = (type != null) ? (" : " + type.getQualifiedName()) : ""; //$NON-NLS-2$//$NON-NLS-1$
- return cmpAttribute.getName() + typeName;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(CMPAttribute.class)) {
- case EjbPackage.CMP_ATTRIBUTE__DESCRIPTION :
- case EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS :
- case EjbPackage.CMP_ATTRIBUTE__NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getCMPAttribute_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getCMPAttribute_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- public void setTarget(Notifier target) {
- if (targets == null || !targets.contains(target))
- super.setTarget(target);
- if (target != null && target instanceof CMPAttribute) {
- if (targets != null && targets.contains(target) || ((CMPAttribute) target).eContainer() == null)
- return;
- Notifier container = ((CMPAttribute) target).eContainer();
- if (container != null && !container.eAdapters().contains(this)) {
- container.eAdapters().add(this);
- super.setTarget(container);
- }
- }
- }
-
-
- /**
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getElements(Object)
- */
- public Collection getElements(Object object) {
- return super.getElements(object);
- }
-
- /**
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(Object)
- */
- public Collection getChildren(Object object) {
- try {
- return super.getChildren(object);
- } catch (Exception e) {
- //Ignore
- }
- return Collections.EMPTY_LIST;
- }
-
- public void dispose() {
- // TODO Auto-generated method stub
- super.dispose();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/CMRFieldItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/CMRFieldItemProvider.java
deleted file mode 100644
index 405a5db..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/CMRFieldItemProvider.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.CMRField}object.
- */
-public class CMRFieldItemProvider extends CMPAttributeItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public CMRFieldItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns CMRField.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("CMRField"); //$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the CMRField.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the role feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Role_2"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_role_of_the_cmr_field_3"), //$NON-NLS-1$
- pkg.getCMRField_Role(), false));
-
- // This is for the collectionType feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Collection_Type_4"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_collection_type_of_the_cmr_field_5"), //$NON-NLS-1$
- pkg.getCMRField_CollectionType(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Collection Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addCollectionTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_CMRField_collectionType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CMRField_collectionType_feature", "_UI_CMRField_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getCMRField_CollectionType(), true));
- }
-
-
- public String getText(Object object) {
- CMRField cmrField = ((CMRField) object);
- return EJBProviderLibrariesResourceHandler.getString("CMRField__6") + cmrField.getName(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ContainerManagedEntityItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ContainerManagedEntityItemProvider.java
deleted file mode 100644
index c18e8d8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ContainerManagedEntityItemProvider.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.ModelledPersistentAttributeFilter;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.ContainerManagedEntity}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ContainerManagedEntityItemProvider extends EntityItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ContainerManagedEntityItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addVersionPropertyDescriptor(object);
- addAbstractSchemaNamePropertyDescriptor(object);
- addKeyAttributesPropertyDescriptor(object);
- //addCMPAttributePropertyDescriptor(object);
- addPrimKeyFieldPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- protected void addVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("_UI_EJBJar_version_feature"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("_UI_EJBJar_version_feature_desc"), //$NON-NLS-1$
- EjbPackage.eINSTANCE.getContainerManagedEntity_Version(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Abstract Schema Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addAbstractSchemaNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("_UI_ContainerManagedEntity_abstractSchemaName_feature"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("_UI_ContainerManagedEntity_abstractSchemaName_feature_desc"), //$NON-NLS-1$
- EjbPackage.eINSTANCE.getContainerManagedEntity_AbstractSchemaName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Key Attributes feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- protected void addKeyAttributesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("_UI_ContainerManagedEntity_keyAttributes_feature"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("_UI_ContainerManagedEntity_keyAttributes_feature_desc"), //$NON-NLS-1$
- EjbPackage.eINSTANCE.getContainerManagedEntity_KeyAttributes(), false));
- }
-
- /**
- * This adds a property descriptor for the CMP Attribute feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- protected void addCMPAttributePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("_UI_ContainerManagedEntity_CMPAttribute_feature"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("_UI_ContainerManagedEntity_CMPAttribute_feature_desc"), //$NON-NLS-1$
- EjbPackage.eINSTANCE.getContainerManagedEntity_CMPAttribute(), true));
- }
-
- /**
- * This adds a property descriptor for the Prim Key Field feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- protected void addPrimKeyFieldPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("_UI_ContainerManagedEntity_primKeyField_feature"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("_UI_ContainerManagedEntity_primKeyField_feature_desc"), //$NON-NLS-1$
- EjbPackage.eINSTANCE.getContainerManagedEntity_PrimKeyField(), false));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- //childrenReferences.add(EjbPackage.eINSTANCE.getContainerManagedEntity_PersistentAttributes());
- childrenReferences.add(EjbPackage.eINSTANCE.getContainerManagedEntity_Queries());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> Don't remove this
- * method or it will be regenerated. <!-- end-user-doc -->
- *
- */
- public String getText(Object object) {
- return super.getText(object);
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ContainerManagedEntity.class)) {
- case EjbPackage.CONTAINER_MANAGED_ENTITY__VERSION :
- case EjbPackage.CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME :
- case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES :
- case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES :
- case EjbPackage.CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE :
- case EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES :
- case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD :
- case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIMARY_KEY : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getContainerManagedEntity_PersistentAttributes(), EjbFactory.eINSTANCE.createCMPAttribute()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getContainerManagedEntity_PersistentAttributes(), EjbFactory.eINSTANCE.createCMRField()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getContainerManagedEntity_Queries(), EjbFactory.eINSTANCE.createQuery()));
- }
-
- /**
- * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
- boolean qualify = feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs() || feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs();
- return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
- new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This returns ContainerManagedEntity.gif.
- */
- public Object getImage(Object object) {
- //Cmp 20 should have their own Itemprovider
- ContainerManagedEntity cmp = null;
- if (object instanceof ContainerManagedEntity) {
- cmp = (ContainerManagedEntity) object;
- }
- switch (cmp.getVersionID()) {
-
- case J2EEVersionConstants.EJB_1_0_ID :
- case J2EEVersionConstants.EJB_1_1_ID :
- return J2EEPlugin.getPlugin().getImage("11_cmpbean_obj"); //$NON-NLS-1$
- case J2EEVersionConstants.EJB_2_0_ID :
- return J2EEPlugin.getPlugin().getImage("20_cmpbean_obj"); //$NON-NLS-1$
- case J2EEVersionConstants.EJB_2_1_ID :
- default :
- return J2EEPlugin.getPlugin().getImage("21_cmpbean_obj"); //$NON-NLS-1$
- }
- }
-
- public boolean hasChildren(Object arg0) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- Collection result = super.getChildren(object);
- result.addAll(ModelledPersistentAttributeFilter.singleton().filter((ContainerManagedEntity) object));
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBJarItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBJarItemProvider.java
deleted file mode 100644
index 3f0af10..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBJarItemProvider.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class EJBJarItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public EJBJarItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addEjbClientJarPropertyDescriptor(object);
- addVersionPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Ejb Client Jar feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- protected void addEjbClientJarPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("_UI_EJBJar_ejbClientJar_feature"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("_UI_EJBJar_ejbClientJar_feature_desc"), //$NON-NLS-1$
- EjbPackage.eINSTANCE.getEJBJar_EjbClientJar(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- protected void addVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("_UI_EJBJar_version_feature"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("_UI_EJBJar_version_feature_desc"), //$NON-NLS-1$
- EjbPackage.eINSTANCE.getEJBJar_Version(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(EjbPackage.eINSTANCE.getEJBJar_AssemblyDescriptor());
- childrenReferences.add(EjbPackage.eINSTANCE.getEJBJar_EnterpriseBeans());
- childrenReferences.add(EjbPackage.eINSTANCE.getEJBJar_RelationshipList());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(EJBJar.class)) {
- case EjbPackage.EJB_JAR__EJB_CLIENT_JAR :
- case EjbPackage.EJB_JAR__VERSION :
- case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR :
- case EjbPackage.EJB_JAR__ENTERPRISE_BEANS :
- case EjbPackage.EJB_JAR__RELATIONSHIP_LIST : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBJar_AssemblyDescriptor(), EjbFactory.eINSTANCE.createAssemblyDescriptor()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBJar_EnterpriseBeans(), EjbFactory.eINSTANCE.createEntity()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBJar_EnterpriseBeans(), EjbFactory.eINSTANCE.createContainerManagedEntity()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBJar_EnterpriseBeans(), EjbFactory.eINSTANCE.createSession()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBJar_EnterpriseBeans(), EjbFactory.eINSTANCE.createMessageDriven()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBJar_RelationshipList(), EjbFactory.eINSTANCE.createRelationships()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This returns EJBJar.gif.
- */
- public Object getImage(Object object) {
- String key = null;
- if (((EJBJar) object).eResource() == null)
- return J2EEPlugin.getPlugin().getImage("ejbJar_obj"); //$NON-NLS-1$
- switch (((EJBJar) object).getVersionID()) {
- case J2EEVersionConstants.EJB_1_0_ID :
- key = "10_ejbjar_obj"; //$NON-NLS-1$
- break;
- case J2EEVersionConstants.EJB_1_1_ID :
- key = "11_ejbjar_obj"; //$NON-NLS-1$
- break;
- case J2EEVersionConstants.EJB_2_0_ID :
- key = "20_ejbjar_obj"; //$NON-NLS-1$
- break;
- case J2EEVersionConstants.EJB_2_1_ID :
- default :
- key = "21_ejb_obj"; //$NON-NLS-1$
- break;
- }
- return J2EEPlugin.getPlugin().getImage(key);
- }
-
- public String getText(Object object) {
- EJBJar ejbJar = (EJBJar) object;
- if (ejbJar.getDisplayName() == null) {
- try {
- IProject project = ProjectUtilities.getProject(ejbJar);
- return project.getDescription().getName();
- } catch (Exception e) {
- //Ignore
- }
-
- Resource resource = ejbJar.eResource();
- if (resource != null) {
- return new Path(resource.getURI().toString()).removeFileExtension().lastSegment();
- }
- return EJBProviderLibrariesResourceHandler.getString("EJBJar_UI_"); //$NON-NLS-1$ = "EJBJar"
-
- }
- return ejbJar.getDisplayName();
- }
-
- /**
- * @see ITreeItemContentProvider#hasChildren(Object)
- */
- public boolean hasChildren(Object parent) {
- if (parent == null)
- return false;
- return !((EJBJar) parent).getEnterpriseBeans().isEmpty() || ((EJBJar) parent).getAssemblyDescriptor() != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- List children = new ArrayList();
- EJBJar aJar = (EJBJar) object;
- if (aJar.getAssemblyDescriptor() != null)
- children.add(aJar.getAssemblyDescriptor());
- if (aJar.getEnterpriseBeans() != null)
- children.addAll(aJar.getEnterpriseBeans());
- if (aJar.getRelationshipList() != null && aJar.getRelationshipList().getEjbRelations() != null)
- children.addAll(aJar.getRelationshipList().getEjbRelations());
- return children;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBMethodCategoryItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBMethodCategoryItemProvider.java
deleted file mode 100644
index 3f2a7ae..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBMethodCategoryItemProvider.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBMethodCategory}object.
- */
-public class EJBMethodCategoryItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public EJBMethodCategoryItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns EJBMethodCategory.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("EJBMethodCategory");//$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the EJBMethodCategory.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- }
- return itemPropertyDescriptors;
- }
-
- public String getText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("EJBMethodCategory_UI_"); //$NON-NLS-1$ = "EJBMethodCategory"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBNameComparator.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBNameComparator.java
deleted file mode 100644
index 0551310..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBNameComparator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Comparator;
-
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-// This class sorts the name of Enterprise Beans
-
-public class EJBNameComparator implements Comparator {
- private static EJBNameComparator singleton;
-
- public int compare(Object o1, Object o2) {
- String name1, name2;
- name1 = ((EnterpriseBean) o1).getName();
- name2 = ((EnterpriseBean) o2).getName();
- if (name1 == null) {
- if (name2 == null)
- return 0;
- return -1;
- } else if (name2 == null)
- return 1;
- else
- return name1.compareTo(name2);
- }
-
- public static Comparator singleton() {
- if (singleton == null)
- singleton = new EJBNameComparator();
- return singleton;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBProviderLibrariesResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBProviderLibrariesResourceHandler.java
deleted file mode 100644
index 93371d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBProviderLibrariesResourceHandler.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-public class EJBProviderLibrariesResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
- public static ResourceLocator RESOURCE_LOCATOR = new ResourceLocator() {
- public URL getBaseURL() {
- return null;
- }
-
- public Object getImage(String arg0) {
- return J2EEPlugin.getPlugin().getImage(arg0);
- }
-
- public String getString(String arg0) {
- return EJBProviderLibrariesResourceHandler.getString(arg0);
- }
-
- public String getString(String arg0, Object[] arg1) {
- return EJBProviderLibrariesResourceHandler.getString(arg0, arg1);
- }
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
- };
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("ejbproviderlibraries");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBRelationItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBRelationItemProvider.java
deleted file mode 100644
index fb5718d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBRelationItemProvider.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBRelation}object.
- */
-public class EJBRelationItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public EJBRelationItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- EJBRelationshipRole child = EjbFactory.eINSTANCE.createEJBRelationshipRole();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(EjbPackage.eINSTANCE.getEJBRelation_RelationshipRoles());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + EJBProviderLibrariesResourceHandler.getString("CreateEJBRelationshipRole_1")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("Create_EJBRelationshipRole_2"); //$NON-NLS-1$
- }
-
- /**
- * This returns the help text for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return EJBProviderLibrariesResourceHandler.getString("Create_a_child_of_type_EJBRelationshipRole_for_the_selected__3") + refObject.eClass().getName() + EJBProviderLibrariesResourceHandler.getString("_4"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This returns EJBRelation.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("EJBRelation"); //$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the EJBRelation.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Description_6"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_description_property_of_the_ejb_relation_7"), //$NON-NLS-1$
- pkg.getEJBRelation_Description(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- // This is for the name feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Name_8"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_name_property_of_the_ejb_relation_9"), //$NON-NLS-1$
- pkg.getEJBRelation_Name(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- // This is for the relationshipList feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Relationship_List_10"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_relationship_list_of_the_ejb_relation_11"), //$NON-NLS-1$
- pkg.getEJBRelation_RelationshipList(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EJBRelation_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EJBRelation_description_feature", "_UI_EJBRelation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getEJBRelation_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EJBRelation_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EJBRelation_name_feature", "_UI_EJBRelation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getEJBRelation_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- public String getText(Object object) {
- EJBRelation ejbRelation = ((EJBRelation) object);
- String name = ejbRelation.getName();
- return name != null ? name : ""; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(EJBRelation.class)) {
- case EjbPackage.EJB_RELATION__DESCRIPTION :
- case EjbPackage.EJB_RELATION__NAME :
- case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES :
- case EjbPackage.EJB_RELATION__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBRelation_RelationshipRoles(), EjbFactory.eINSTANCE.createEJBRelationshipRole()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBRelation_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBRelation_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBRelationshipRoleItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBRelationshipRoleItemProvider.java
deleted file mode 100644
index cf5ae6b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBRelationshipRoleItemProvider.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedImage;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBRelationshipRole}object.
- */
-public class EJBRelationshipRoleItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- protected static final EStructuralFeature ROLES_SF = EjbFactoryImpl.getPackage().getEJBRelation_RelationshipRoles();
- protected EJBRelationshipRole targetRole;
- private static final Class ITreeItemContentProviderClass = ITreeItemContentProvider.class;
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public EJBRelationshipRoleItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: create some child object.
- return null;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- // Exclude these children for mapping purposes
- // childrenReferences.add(EjbPackage.eINSTANCE.getEJBRelationshipRole_CmrField());
- // childrenReferences.add(EjbPackage.eINSTANCE.getEJBRelationshipRole_Source());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "Create#CHILD_CLASS_NAME#"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return "Create #CHILD_CLASS_NAME#"; //$NON-NLS-1$
- }
-
- /**
- * This returns the help text for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return "Create a child of type #CHILD_CLASS_NAME# for the selected " + refObject.eClass().getName() + EJBProviderLibrariesResourceHandler.getString("_4"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This returns EJBRelationshipRole.gif.
- */
- public Object getImage(Object object) {
- CommonRelationshipRole role = (CommonRelationshipRole) object;
- String imageName;
- if (role.isKey()) {
- imageName = "roleKey_obj"; //$NON-NLS-1$
- } else if (role.isForward()) {
- Object base = J2EEPlugin.getPlugin().getImage("role_obj"); //$NON-NLS-1$
- Object overlayImage = J2EEPlugin.getPlugin().getImage("frnkeyrelnshp_ovr"); //$NON-NLS-1$
- ArrayList imageObjects = new ArrayList();
- imageObjects.add(base);
- imageObjects.add(overlayImage);
- return new ComposedImage(imageObjects) {
- public List getDrawPoints(Size size) {
- List result = super.getDrawPoints(size);
- if (result.size() > 1) {
- ((Point) result.get(1)).x = ((Point) result.get(1)).x + 8;
- ((Point) result.get(1)).y = ((Point) result.get(1)).y + 2;
- }
- return result;
- }
- };
- } else {
- imageName = "role_obj"; //$NON-NLS-1$
- }
- return J2EEPlugin.getPlugin().getImage(imageName);
- }
-
- /**
- * This returns the parent of the EJBRelationshipRole.
- */
- public Object getParent(Object object) {
- // override to convince the mapping domain that we are part of the input object graph
- // return ((EObject)object).eContainer();
-
- return (((EJBRelationshipRole) object).getSource() != null) ? ((EJBRelationshipRole) object).getSourceEntity() : null;
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Description_5"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_description_property_of_the_ejb_relationship_role_6"), //$NON-NLS-1$
- pkg.getEJBRelationshipRole_Description(), false, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- // This is for the name feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Name_7"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_roleName_property_of_the_ejb_relationship_role_8"), //$NON-NLS-1$
- pkg.getEJBRelationshipRole_RoleName(), false, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- // This is for the multiplicity feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Multiplicity_9"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_multiplicity_property_of_the_ejb_relationship_role_10"), //$NON-NLS-1$
- pkg.getEJBRelationshipRole_Multiplicity(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-
- // This is for the cascadeDelete feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Cascade_Delete_11"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_cascade_delete_property_of_the_ejb_relationship_role_12"), //$NON-NLS-1$
- pkg.getEJBRelationshipRole_CascadeDelete(), false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-
- // This is for the cmrField feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Cmr_Field_13"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_cmr_field_of_the_ejb_relationship_role_14"), //$NON-NLS-1$
- pkg.getEJBRelationshipRole_CmrField(), false));
-
- // This is for the relationship feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Relationship_15"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_relationship_of_the_ejb_relationship_role_16"), //$NON-NLS-1$
- pkg.getEJBRelationshipRole_Relationship(), false));
-
- // This is for the source feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Source_17"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_source_of_the_ejb_relationship_role_18"), //$NON-NLS-1$
- pkg.getEJBRelationshipRole_Source(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EJBRelationshipRole_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EJBRelationshipRole_description_feature", "_UI_EJBRelationshipRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getEJBRelationshipRole_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Role Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRoleNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EJBRelationshipRole_roleName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EJBRelationshipRole_roleName_feature", "_UI_EJBRelationshipRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getEJBRelationshipRole_RoleName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Multiplicity feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addMultiplicityPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EJBRelationshipRole_multiplicity_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EJBRelationshipRole_multiplicity_feature", "_UI_EJBRelationshipRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getEJBRelationshipRole_Multiplicity(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Cascade Delete feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addCascadeDeletePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EJBRelationshipRole_cascadeDelete_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EJBRelationshipRole_cascadeDelete_feature", "_UI_EJBRelationshipRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getEJBRelationshipRole_CascadeDelete(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- public String getText(Object object) {
- try {
- CommonRelationshipRole aRole = (CommonRelationshipRole) object;
- if (aRole == null)
- return ""; //$NON-NLS-1$
- StringBuffer b = new StringBuffer();
- if (aRole.isMany())
- b.append("[0..*]"); //$NON-NLS-1$
- else {
- if (aRole.isKey())
- b.append("[1..1]"); //$NON-NLS-1$
- else
- b.append("[0..1]"); //$NON-NLS-1$
- }
- b.append(" "); //$NON-NLS-1$
- b.append(aRole.getRoleName()).append(" : "); //$NON-NLS-1$
- ContainerManagedEntity type = aRole.getTypeEntity();
- if (type == null)
- b.append(EJBProviderLibrariesResourceHandler.getString("Unknown_Role_Type_UI_")); //$NON-NLS-1$
- else
- b.append(type.getName());
- return b.toString();
- } catch (Exception e) {
- return e.toString();
- }
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(EJBRelationshipRole.class)) {
- case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTION :
- case EjbPackage.EJB_RELATIONSHIP_ROLE__ROLE_NAME :
- case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY :
- case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE :
- case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE :
- case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD :
- case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBRelationshipRole_Source(), EjbFactory.eINSTANCE.createRoleSource()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBRelationshipRole_CmrField(), EjbFactory.eINSTANCE.createCMRField()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBRelationshipRole_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEJBRelationshipRole_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}.
- */
- /*
- * public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue,
- * Object newValue, int index) { EjbPackage pkg = EjbPackage.eINSTANCE;; if (feature ==
- * pkg.getEJBRelationshipRole_Description() || feature == pkg.getEJBRelationshipRole_RoleName() ||
- * feature == pkg.getEJBRelationshipRole_Multiplicity() || feature ==
- * pkg.getEJBRelationshipRole_CascadeDelete() || // feature ==
- * pkg.getEJBRelationshipRole_CmrField() || feature == pkg.getEJBRelationshipRole_Relationship() ||
- * feature == pkg.getEJBRelationshipRole_Source()) { fireNotifyChanged(notifier, eventType,
- * feature, oldValue, newValue, index); return; } super.notifyChanged(notifier, eventType,
- * feature, oldValue, newValue, index); }
- */
- /**
- * @see ItemProviderAdapter#setTarget(Notifier)
- */
- public void setTarget(Notifier arg0) {
- EJBRelationshipRole role = arg0 instanceof EJBRelationshipRole ? (EJBRelationshipRole) arg0 : null;
- super.setTarget(arg0);
- if (role != null) {
- if (getAdapterFactory() == null) {
- return;
- }
- if (role.getSourceEntity() != null && !role.getSourceEntity().eAdapters().contains(this)) {
- getAdapterFactory().adapt(role.getSourceEntity(), ITreeItemContentProviderClass);
- role.getSourceEntity().eAdapters().add(this);
- }
- RoleSource rs = role.getSource();
- if (rs != null) {
- getAdapterFactory().adapt(rs, getAdapterFactory());
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EjbItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EjbItemProviderAdapter.java
deleted file mode 100644
index d6fa832..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EjbItemProviderAdapter.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.provider.EObjectItemProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This extended item provider supports the following commands:
- * {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}. The commands are implemented uniformly on
- * all our item adapters using this common base class.
- */
-public class EjbItemProviderAdapter extends EObjectItemProvider {
- protected EjbItemProviderAdapter(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This implements the default behavior for
- * {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- return null;
- }
-
- /**
- * This returns the default image for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("CreateChild");//$NON-NLS-1$
- }
-
- /**
- * This returns the default label for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$ = "Create Child"
- }
-
- /**
- * This returns the default help text for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return EJBProviderLibrariesResourceHandler.getString("Create_a_new_child_for_the_UI_") + refObject.eClass().getName() + ".";//$NON-NLS-2$ //$NON-NLS-1$ = "Create a new child for the selected "
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.IDisposable#dispose()
- */
- public void dispose() {
- super.dispose();
- target = null;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EjbItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EjbItemProviderAdapterFactory.java
deleted file mode 100644
index 2f41ceb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EjbItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,563 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.Disposable;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.util.EjbAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
- * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class EjbItemProviderAdapterFactory extends EjbAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- */
- protected ComposedAdapterFactory parentAdapterFactory;
- /**
- * This is used to implement {@link #IDisposable}.
- */
- protected Disposable disposable = new Disposable();
- /**
- * This is used to implement {@link #IChangeNotifier}.
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}.
- */
- protected Collection supportedTypes = new ArrayList();
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.MethodPermission}
- * instances.
- */
- protected MethodPermissionItemProvider methodPermissionItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.ejb.AssemblyDescriptor}instances.
- */
- protected AssemblyDescriptorItemProvider assemblyDescriptorItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.MethodTransaction}
- * instances.
- */
- protected MethodTransactionItemProvider methodTransactionItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.EnterpriseBean}
- * instances.
- */
- protected EnterpriseBeanItemProvider enterpriseBeanItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.Session}
- * instances.
- */
- protected SessionItemProvider sessionItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.MessageDriven}
- * instances.
- */
- protected MessageDrivenItemProvider messageDrivenItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.ejb.MessageDrivenDestination}instances.
- */
- protected MessageDrivenDestinationItemProvider messageDrivenDestinationItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.Entity}instances.
- */
- protected EntityItemProvider entityItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.ejb.ContainerManagedEntity}instances.
- */
- protected ContainerManagedEntityItemProvider containerManagedEntityItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.CMPAttribute}
- * instances.
- */
- protected CMPAttributeItemProvider cmpAttributeItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.CMRField}
- * instances.
- */
- protected CMRFieldItemProvider cmrFieldItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBRelationshipRole}instances.
- */
- protected EJBRelationshipRoleItemProvider ejbRelationshipRoleItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBRelation}
- * instances.
- */
- protected EJBRelationItemProvider ejbRelationItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.Relationships}
- * instances.
- */
- protected RelationshipsItemProvider relationshipsItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar}instances.
- */
- protected EJBJarItemProvider eJBJarItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.RoleSource}
- * instances.
- */
- protected RoleSourceItemProvider roleSourceItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.Query}instances.
- */
- protected QueryItemProvider queryItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.QueryMethod}
- * instances.
- */
- protected QueryMethodItemProvider queryMethodItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.MethodElement}
- * instances.
- */
- protected MethodElementItemProvider methodElementItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.ExcludeList}
- * instances.
- */
- protected ExcludeListItemProvider excludeListItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBMethodCategory}
- * instances.
- */
- protected EJBMethodCategoryItemProvider ejbMethodCategoryItemProvider;
-
- /**
- * This constructs an instance.
- */
- public EjbItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter.
- */
- public Adapter adapt(Notifier notifier, Object type) {
- adaptContainerIfNecessary((EObject) notifier, type);
- return super.adapt(notifier, this);
- }
-
- public Object adapt(Object object, Object type) {
- // This is a kludge to deal with enumerators, which crash the doSwitch.
- //
- if (object instanceof EObject && ((EObject) object).eClass() == null) {
- return null;
- }
-
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- public Adapter adaptNew(Notifier target, Object adapterType) {
- Adapter adapter = super.adaptNew(target, adapterType);
- disposable.add(adapter);
- return adapter;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.AssemblyDescriptor}.
- */
- public Adapter createAssemblyDescriptorAdapter() {
- if (assemblyDescriptorItemProvider == null) {
- assemblyDescriptorItemProvider = new AssemblyDescriptorItemProvider(this);
- }
-
- return assemblyDescriptorItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.CMPAttribute}.
- */
- public Adapter createCMPAttributeAdapter() {
- if (cmpAttributeItemProvider == null) {
- cmpAttributeItemProvider = new CMPAttributeItemProvider(this);
- }
-
- return cmpAttributeItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.CMRField}.
- */
- public Adapter createCMRFieldAdapter() {
- if (cmrFieldItemProvider == null) {
- cmrFieldItemProvider = new CMRFieldItemProvider(this);
- }
-
- return cmrFieldItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.ContainerManagedEntity}.
- */
- public Adapter createContainerManagedEntityAdapter() {
- if (containerManagedEntityItemProvider == null) {
- containerManagedEntityItemProvider = new ContainerManagedEntityItemProvider(this);
- }
-
- return containerManagedEntityItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar}.
- */
- public Adapter createEJBJarAdapter() {
- if (eJBJarItemProvider == null) {
- eJBJarItemProvider = new EJBJarItemProvider(this);
- }
-
- return eJBJarItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBMethodCategory}.
- */
- public Adapter createEJBMethodCategoryAdapter() {
- if (ejbMethodCategoryItemProvider == null) {
- ejbMethodCategoryItemProvider = new EJBMethodCategoryItemProvider(this);
- }
-
- return ejbMethodCategoryItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar}instances.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EJBJarItemProvider ejbJarItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBRelation}.
- */
- public Adapter createEJBRelationAdapter() {
- if (ejbRelationItemProvider == null) {
- ejbRelationItemProvider = new EJBRelationItemProvider(this);
- }
-
- return ejbRelationItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBRelationshipRole}.
- */
- public Adapter createEJBRelationshipRoleAdapter() {
- if (ejbRelationshipRoleItemProvider == null) {
- ejbRelationshipRoleItemProvider = new EJBRelationshipRoleItemProvider(this);
- }
-
- return ejbRelationshipRoleItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EnterpriseBean}.
- */
- public Adapter createEnterpriseBeanAdapter() {
- if (enterpriseBeanItemProvider == null) {
- enterpriseBeanItemProvider = new EnterpriseBeanItemProvider(this);
- }
-
- return enterpriseBeanItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Entity}.
- */
- public Adapter createEntityAdapter() {
- if (entityItemProvider == null) {
- entityItemProvider = new EntityItemProvider(this);
- }
-
- return entityItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.ExcludeList}.
- */
- public Adapter createExcludeListAdapter() {
- if (excludeListItemProvider == null) {
- excludeListItemProvider = new ExcludeListItemProvider(this);
- }
-
- return excludeListItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.MessageDriven}.
- */
- public Adapter createMessageDrivenAdapter() {
- if (messageDrivenItemProvider == null) {
- messageDrivenItemProvider = new MessageDrivenItemProvider(this);
- }
-
- return messageDrivenItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.MessageDrivenDestination}.
- */
- public Adapter createMessageDrivenDestinationAdapter() {
- if (messageDrivenDestinationItemProvider == null) {
- messageDrivenDestinationItemProvider = new MessageDrivenDestinationItemProvider(this);
- }
-
- return messageDrivenDestinationItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.MethodElement}.
- */
- public Adapter createMethodElementAdapter() {
- if (methodElementItemProvider == null) {
- methodElementItemProvider = new MethodElementItemProvider(this);
- }
-
- return methodElementItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.MethodPermission}.
- */
- public Adapter createMethodPermissionAdapter() {
- if (methodPermissionItemProvider == null) {
- methodPermissionItemProvider = new MethodPermissionItemProvider(this);
- }
-
- return methodPermissionItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.MethodTransaction}.
- */
- public Adapter createMethodTransactionAdapter() {
- if (methodTransactionItemProvider == null) {
- methodTransactionItemProvider = new MethodTransactionItemProvider(this);
- }
-
- return methodTransactionItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Query}.
- */
- public Adapter createQueryAdapter() {
- if (queryItemProvider == null) {
- queryItemProvider = new QueryItemProvider(this);
- }
-
- return queryItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.QueryMethod}.
- */
- public Adapter createQueryMethodAdapter() {
- if (queryMethodItemProvider == null) {
- queryMethodItemProvider = new QueryMethodItemProvider(this);
- }
-
- return queryMethodItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.ejb.ActivationConfigProperty}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected ActivationConfigPropertyItemProvider activationConfigPropertyItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.ActivationConfigProperty}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createActivationConfigPropertyAdapter() {
- if (activationConfigPropertyItemProvider == null) {
- activationConfigPropertyItemProvider = new ActivationConfigPropertyItemProvider(this);
- }
-
- return activationConfigPropertyItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.ejb.ActivationConfig}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ActivationConfigItemProvider activationConfigItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.ActivationConfig}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createActivationConfigAdapter() {
- if (activationConfigItemProvider == null) {
- activationConfigItemProvider = new ActivationConfigItemProvider(this);
- }
-
- return activationConfigItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Relationships}.
- */
- public Adapter createRelationshipsAdapter() {
- if (relationshipsItemProvider == null) {
- relationshipsItemProvider = new RelationshipsItemProvider(this);
- }
-
- return relationshipsItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.RoleSource}.
- */
- public Adapter createRoleSourceAdapter() {
- if (roleSourceItemProvider == null) {
- roleSourceItemProvider = new RoleSourceItemProvider(this);
- }
-
- return roleSourceItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Session}.
- */
- public Adapter createSessionAdapter() {
- if (sessionItemProvider == null) {
- sessionItemProvider = new SessionItemProvider(this);
- }
-
- return sessionItemProvider;
- }
-
- public void dispose() {
- disposable.dispose();
- }
-
- /**
- * This returns the root adapter factory that contains this factory.
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- public boolean isFactoryForType(Object type) {
- return super.isFactoryForType(type) || supportedTypes.contains(type);
- }
-
- /**
- * This removes a listener.
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This sets the composed adapter factory that contains this factory.
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- protected void adaptContainerIfNecessary(EObject eObj, Object type) {
- if (eObj == null || eObj.eContainer() == null)
- return;
- EClass theEClass = eObj.eClass();
- if (theEClass.eContainer() == modelPackage) {
- switch (theEClass.getClassifierID()) {
- case EjbPackage.CMP_ATTRIBUTE :
- adapt(eObj.eContainer(), type);
- break;
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EnterpriseBeanItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EnterpriseBeanItemProvider.java
deleted file mode 100644
index 667939e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EnterpriseBeanItemProvider.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.provider.JNDIEnvRefsGroupItemProvider;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EnterpriseBean}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class EnterpriseBeanItemProvider extends JNDIEnvRefsGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public EnterpriseBeanItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- //addEjbClassPropertyDescriptor(object);
- //addHomeInterfacePropertyDescriptor(object);
- //addRemoteInterfacePropertyDescriptor(object);
- //addLocalHomeInterfacePropertyDescriptor(object);
- //addLocalInterfacePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("_UI_EnterpriseBean_name_feature"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("_UI_EnterpriseBean_name_feature_desc"), //$NON-NLS-1$
- EjbPackage.eINSTANCE.getEnterpriseBean_Name(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Ejb Class feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addEjbClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnterpriseBean_ejbClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EnterpriseBean_ejbClass_feature", "_UI_EnterpriseBean_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getEnterpriseBean_EjbClass(), true));
- }
-
- /**
- * This adds a property descriptor for the Home Interface feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addHomeInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnterpriseBean_homeInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EnterpriseBean_homeInterface_feature", "_UI_EnterpriseBean_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getEnterpriseBean_HomeInterface(), true));
- }
-
- /**
- * This adds a property descriptor for the Remote Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addRemoteInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnterpriseBean_remoteInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EnterpriseBean_remoteInterface_feature", "_UI_EnterpriseBean_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getEnterpriseBean_RemoteInterface(), true));
- }
-
- /**
- * This adds a property descriptor for the Local Home Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addLocalHomeInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnterpriseBean_localHomeInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EnterpriseBean_localHomeInterface_feature", "_UI_EnterpriseBean_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getEnterpriseBean_LocalHomeInterface(), true));
- }
-
- /**
- * This adds a property descriptor for the Local Interface feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLocalInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnterpriseBean_localInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EnterpriseBean_localInterface_feature", "_UI_EnterpriseBean_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getEnterpriseBean_LocalInterface(), true));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(EjbPackage.eINSTANCE.getEnterpriseBean_SecurityRoleRefs());
- childrenReferences.add(EjbPackage.eINSTANCE.getEnterpriseBean_SecurityIdentity());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(EnterpriseBean.class)) {
- case EjbPackage.ENTERPRISE_BEAN__EJB_CLASS :
- case EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE :
- case EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE :
- case EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE :
- case EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE :
- case EjbPackage.ENTERPRISE_BEAN__NAME :
- case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS :
- case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEnterpriseBean_SecurityRoleRefs(), CommonFactory.eINSTANCE.createSecurityRoleRef()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEnterpriseBean_SecurityIdentity(), CommonFactory.eINSTANCE.createSecurityIdentity()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEnterpriseBean_SecurityIdentity(), CommonFactory.eINSTANCE.createRunAsSpecifiedIdentity()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getEnterpriseBean_SecurityIdentity(), CommonFactory.eINSTANCE.createUseCallerIdentity()));
- }
-
- /**
- * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
- boolean qualify = feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs() || feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs();
- return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
- new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- public static String getEJBName(Object object) {
- String name = ((EnterpriseBean) object).getDisplayName();
- if (name == null || name.equals("")) //$NON-NLS-1$
- name = ((EnterpriseBean) object).getName();
- return name == null ? "<<??>>" : name; //$NON-NLS-1$
- }
-
- /**
- * This returns EnterpriseBean.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("bmpEntity_obj"); //$NON-NLS-1$
- }
-
- public String getText(Object object) {
- return getEJBName(object);
- }
-
- public Collection getChildrenSuper(Object object) {
- Collection myChildren = super.getChildren(object);
- EnterpriseBean bean = (EnterpriseBean) object;
- if (bean == null || bean.getEjbJar() == null)
- return myChildren;
- try {
- if (bean.getEjbJar().getJ2EEVersionID() <= J2EEVersionConstants.J2EE_1_3_ID) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- myChildren.addAll(serviceHelper.get13ServiceRefs(bean));
- }
- } catch (RuntimeException re) {
- Logger.getLogger().logError(re);
- }
- return myChildren;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- Collection myChildren = super.getChildren(object);
- EnterpriseBean bean = (EnterpriseBean) object;
- try {
- if (bean.getEjbJar().getJ2EEVersionID() <= J2EEVersionConstants.J2EE_1_3_ID) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- myChildren.addAll(serviceHelper.get13ServiceRefs(bean));
- }
- } catch (RuntimeException re) {
- Logger.getLogger().logError(re);
- }
- return myChildren;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EntityItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EntityItemProvider.java
deleted file mode 100644
index 7e5f14f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EntityItemProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Entity}object.
- */
-public class EntityItemProvider extends EnterpriseBeanItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public EntityItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns Entity.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("bmpEntity_obj");//$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> Don't remove this
- * method or it will be regenerated. <!-- end-user-doc -->
- *
- */
- public String getText(Object object) {
- return super.getText(object);
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Entity.class)) {
- case EjbPackage.ENTITY__REENTRANT : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
- boolean qualify = feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs() || feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs();
- return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
- new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This returns the parent of the Entity.
- */
- public Object getParent(Object object) {
- return super.getParent(object);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addReentrantPropertyDescriptor(object);
- //addPrimaryKeyPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Reentrant feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addReentrantPropertyDescriptor(Object object) {
- EjbPackage pkg = EjbPackage.eINSTANCE;
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("IsReentrant_UI_"), //$NON-NLS-1$ = "IsReentrant"
- EJBProviderLibrariesResourceHandler.getString("The_isReentrant_property_UI_"), //$NON-NLS-1$ = "The isReentrant property"
- pkg.getEntity_Reentrant(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-
- }
-
- /**
- * This adds a property descriptor for the Primary Key feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addPrimaryKeyPropertyDescriptor(Object object) {
- EjbPackage pkg = EjbPackage.eINSTANCE;
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("PrimaryKey_UI_"), //$NON-NLS-1$ = "PrimaryKey"
- EJBProviderLibrariesResourceHandler.getString("The_primaryKey_property_UI_"), //$NON-NLS-1$ = "The primaryKey property"
- pkg.getEntity_PrimaryKey(), false));
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildrenReferences(java.lang.Object)
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- childrenReferences = new ArrayList();
- childrenReferences.addAll(super.getChildrenReferences(object));
-// childrenReferences.add(EjbPackage.eINSTANCE.getEntity_Reentrant());
- }
- return childrenReferences;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListItemProvider.java
deleted file mode 100644
index 40d9719..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListItemProvider.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.ExcludeList}object.
- */
-public class ExcludeListItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ExcludeListItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- MethodElement child = EjbFactory.eINSTANCE.createMethodElement();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(EjbPackage.eINSTANCE.getExcludeList_MethodElements());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + EJBProviderLibrariesResourceHandler.getString("CreateMethodElement_1")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("Create_MethodElement_2"); //$NON-NLS-1$
- }
-
- /**
- * This returns the help text for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return EJBProviderLibrariesResourceHandler.getString("Create_a_child_of_type_MethodElement_for_the_selected__3") + refObject.eClass().getName() + EJBProviderLibrariesResourceHandler.getString("_4"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This returns ExcludeList.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("methPermission_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the ExcludeList.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Description_6"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_description_property_of_the_exclude_list_7"), //$NON-NLS-1$
- pkg.getExcludeList_Description(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExcludeList_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ExcludeList_description_feature", "_UI_ExcludeList_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getExcludeList_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- public String getText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("ExcludeList__8"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ExcludeList.class)) {
- case EjbPackage.EXCLUDE_LIST__DESCRIPTION :
- case EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS :
- case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getExcludeList_MethodElements(), EjbFactory.eINSTANCE.createMethodElement()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getExcludeList_MethodElements(), EjbFactory.eINSTANCE.createQueryMethod()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getExcludeList_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getExcludeList_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/J2EENotificationImpl.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/J2EENotificationImpl.java
deleted file mode 100644
index 1befe9b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/J2EENotificationImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-
-/**
- * @author dfholttp
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class J2EENotificationImpl extends NotificationImpl {
- Object feature = null;
- Object notifier = null;
-
- /**
- * Constructor for EJBNotificationImpl.
- */
- public J2EENotificationImpl(int eventType, Object oldValue, Object newValue) {
- super(eventType, oldValue, newValue);
- }
-
- /**
- * Constructor for EJBNotificationImpl.
- */
- public J2EENotificationImpl(int eventType, Object oldValue, Object newValue, boolean isSetChange) {
- super(eventType, oldValue, newValue, isSetChange);
- }
-
- /**
- * Constructor for EJBNotificationImpl.
- */
- public J2EENotificationImpl(int eventType, Object oldValue, Object newValue, int position) {
- super(eventType, oldValue, newValue, position);
- }
-
- /**
- * Constructor for full EJBNOtificationImpl
- */
- public J2EENotificationImpl(Object notifier, int eventType, Object oldValue, Object newValue, int position, Object feature) {
- super(eventType, oldValue, newValue, position);
- this.notifier = notifier;
- this.feature = feature;
- }
-
- /**
- * Constructor for full EJBNOtificationImpl
- */
- public J2EENotificationImpl(Object notifier, int eventType, Object oldValue, Object newValue, int position) {
- super(eventType, oldValue, newValue, position);
- this.notifier = notifier;
- }
-
- public Object getNotifier() {
- return notifier;
- }
-
- public Object getFeature() {
- return feature;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MessageDrivenDestinationItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MessageDrivenDestinationItemProvider.java
deleted file mode 100644
index 7afdf69..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MessageDrivenDestinationItemProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.MessageDrivenDestination}
- * object.
- */
-public class MessageDrivenDestinationItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public MessageDrivenDestinationItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns MessageDrivenDestination.gif.
- */
- public Object getImage(Object object) {
- String imageString = null;
- // MessageDrivenDestination messageDrivenDestination = ((MessageDrivenDestination)object);
- // if (messageDrivenDestination.getType().getValue() == 0)
- //this will change when the images are finished being designed
- // imageString = "msgdrivendestination_obj"; //$NON-NLS-1$
- // else
- // imageString ="msgdrivendestination_obj"; //$NON-NLS-1$
- imageString = "msgdrivendestination_obj"; //$NON-NLS-1$
- return J2EEPlugin.getPlugin().getImage(imageString); //$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the MessageDrivenDestination.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the type feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Type_2"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_type_property_of_the_message_driven_destination_3"), //$NON-NLS-1$
- pkg.getMessageDrivenDestination_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-
- // This is for the subscriptionDurability feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Subscription_Durability_4"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_subscription_durability_property_of_the_message_driven_destination_5"), //$NON-NLS-1$
- pkg.getMessageDrivenDestination_SubscriptionDurability(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-
- // This is for the bean feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Bean_6"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_bean_of_the_message_driven_destination_7"), //$NON-NLS-1$
- pkg.getMessageDrivenDestination_Bean(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageDrivenDestination_type_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MessageDrivenDestination_type_feature", "_UI_MessageDrivenDestination_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMessageDrivenDestination_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Subscription Durability feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addSubscriptionDurabilityPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageDrivenDestination_subscriptionDurability_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MessageDrivenDestination_subscriptionDurability_feature", "_UI_MessageDrivenDestination_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMessageDrivenDestination_SubscriptionDurability(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- MessageDrivenDestination messageDrivenDestination = ((MessageDrivenDestination) object);
- if (messageDrivenDestination.getType().getName() != null)
- return "Destination type: " + messageDrivenDestination.getType().getName(); //$NON-NLS-1$
- return "?>>?"; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MessageDrivenDestination.class)) {
- case EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE :
- case EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MessageDrivenItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MessageDrivenItemProvider.java
deleted file mode 100644
index 863b445..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MessageDrivenItemProvider.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.MessageDriven}object.
- */
-public class MessageDrivenItemProvider extends EnterpriseBeanItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public MessageDrivenItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- CMPAttribute child = EjbFactory.eINSTANCE.createCMPAttribute();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- childrenReferences = (List) super.getChildrenReferences(object);
- //childrenReferences.add(EjbPackage.eINSTANCE.getMessageDriven_Destination());
- //childrenReferences.add(EjbPackage.eINSTANCE.getMessageDriven_ActivationConfig());
- //childrenReferences.add(EjbPackage.eINSTANCE.getActivationConfig_ConfigProperties());
-
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "CreateCMPAttribute"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("Create_CMPAttribute_2"); //$NON-NLS-1$
- }
-
- /**
- * This returns the help text for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return EJBProviderLibrariesResourceHandler.getString("Create_a_child_of_type_CMPAttribute_for_the_selected__3") + refObject.eClass().getName() + EJBProviderLibrariesResourceHandler.getString("_4"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This returns MessageDriven.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("message_bean_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the transactionType feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Transaction_Type_6"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_transaction_type_property_of_the_message_driven_7"), //$NON-NLS-1$
- pkg.getMessageDriven_TransactionType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-
- // This is for the messageSelector feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Message_Selector_8"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_message_selector_property_of_the_message_driven_9"), //$NON-NLS-1$
- pkg.getMessageDriven_MessageSelector(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- // This is for the acknowledgeMode feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Acknowledge_Mode_10"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_acknowledge_mode_property_of_the_message_driven_11"), //$NON-NLS-1$
- pkg.getMessageDriven_AcknowledgeMode(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-
- // This is for the destination feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Destination_12"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_destination_of_the_message_driven_13"), //$NON-NLS-1$
- pkg.getMessageDriven_Destination(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Transaction Type feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addTransactionTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageDriven_transactionType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MessageDriven_transactionType_feature", "_UI_MessageDriven_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMessageDriven_TransactionType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Message Selector feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addMessageSelectorPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageDriven_messageSelector_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MessageDriven_messageSelector_feature", "_UI_MessageDriven_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMessageDriven_MessageSelector(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Acknowledge Mode feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAcknowledgeModePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageDriven_acknowledgeMode_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MessageDriven_acknowledgeMode_feature", "_UI_MessageDriven_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMessageDriven_AcknowledgeMode(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Message Destination feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addMessageDestinationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageDriven_messageDestination_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MessageDriven_messageDestination_feature", "_UI_MessageDriven_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMessageDriven_MessageDestination(), true));
- }
-
- /**
- * This adds a property descriptor for the Link feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLinkPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageDriven_link_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MessageDriven_link_feature", "_UI_MessageDriven_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMessageDriven_Link(), true));
- }
-
- /**
- * This adds a property descriptor for the Messaging Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addMessagingTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageDriven_messagingType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MessageDriven_messagingType_feature", "_UI_MessageDriven_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMessageDriven_MessagingType(), true));
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> Don't remove this
- * method or it will be regenerated. <!-- end-user-doc -->
- *
- */
- public String getText(Object object) {
- return super.getText(object);
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MessageDriven.class)) {
- case EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE :
- case EjbPackage.MESSAGE_DRIVEN__MESSAGE_SELECTOR :
- case EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE :
- case EjbPackage.MESSAGE_DRIVEN__DESTINATION :
- case EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMessageDriven_Destination(), EjbFactory.eINSTANCE.createMessageDrivenDestination()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMessageDriven_ActivationConfig(), EjbFactory.eINSTANCE.createActivationConfig()));
- }
-
- /**
- * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
- boolean qualify = feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs() || feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs();
- return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
- new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MethodElementItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MethodElementItemProvider.java
deleted file mode 100644
index 6d1245a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MethodElementItemProvider.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedImage;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.MethodElement}object.
- */
-public class MethodElementItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- protected final static EjbPackage PACK_SF = EjbFactoryImpl.getPackage();
- protected final static EStructuralFeature NAME_SF = PACK_SF.getMethodElement_Name();
- protected final static EStructuralFeature DESC_SF = PACK_SF.getMethodElement_Description();
- protected final static EStructuralFeature EJB_SF = PACK_SF.getMethodElement_EnterpriseBean();
- protected final static EStructuralFeature PARMS_SF = PACK_SF.getMethodElement_Parms();
- protected final static EStructuralFeature TYPE_SF = PACK_SF.getMethodElement_Type();
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public MethodElementItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns MethodElement.gif.
- */
- public Object getImage(Object object) {
-
- MethodElement gen = (MethodElement) object;
- String overlayString = null;
- Object base, overlayImage;
-
- if (gen.isValid())
- base = J2EEPlugin.getPlugin().getImage("methElement_obj"); //$NON-NLS-1$
- else
- base = J2EEPlugin.getPlugin().getImage("warn_tsk"); //$NON-NLS-1$
-
- if (gen.isHome()) { //$NON-NLS-1$ = "Home Methods"
- overlayString = "home_interf_ov"; //$NON-NLS-1$
- }
- if (gen.isRemote()) { //$NON-NLS-1$ = "Remote Methods"
- overlayString = "remote_interf_ov"; //$NON-NLS-1$
- }
- if (gen.isLocal()) {
- overlayString = "local_ovr"; //$NON-NLS-1$
- }
- if (gen.isLocalHome()) {
- overlayString = "local_home_ovr"; //$NON-NLS-1$
- }
- if (gen.isService()) {
- overlayString = "service_interface_ovr"; //$NON-NLS-1$
- }
- if (gen.isUnspecified()) { //$NON-NLS-1$ = "Common Methods"
- return base;
- }
- overlayImage = J2EEPlugin.getPlugin().getImage(overlayString);
- ArrayList imageObjects = new ArrayList();
- imageObjects.add(base);
- imageObjects.add(overlayImage);
- return new ComposedImage(imageObjects) {
- public List getDrawPoints(Size size) {
- List result = super.getDrawPoints(size);
- if (result.size() > 1) {
- ((Point) result.get(1)).x = ((Point) result.get(1)).x + 8;
- }
- return result;
- }
- };
- //return null;
- }
-
- /**
- * This returns the parent of the MethodElement.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the name feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Name_UI_"), //$NON-NLS-1$ = "Name"
- EJBProviderLibrariesResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$ = "The name property"
- pkg.getMethodElement_Name()));
-
- // This is for the parms feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Parms_UI_"), //$NON-NLS-1$ = "Parms"
- EJBProviderLibrariesResourceHandler.getString("The_parms_property_UI_"), //$NON-NLS-1$ = "The parms property"
- pkg.getMethodElement_Parms()));
-
- // This is for the type feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Type_UI_"), //$NON-NLS-1$ = "Type"
- EJBProviderLibrariesResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$ = "The type property"
- pkg.getMethodElement_Type()));
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Description_UI_"), //$NON-NLS-1$ = "Description"
- EJBProviderLibrariesResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
- pkg.getMethodElement_Description()));
-
- // This is for the enterpriseBean feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("EnterpriseBean_UI_"), //$NON-NLS-1$ = "EnterpriseBean"
- EJBProviderLibrariesResourceHandler.getString("The_enterpriseBean_propert_UI_"), //$NON-NLS-1$ = "The enterpriseBean property"
- pkg.getMethodElement_EnterpriseBean()));
-
- // This is for the methodPermission feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * ResourceHandler.getString("MethodPermission_UI_"), //$NON-NLS-1$ = "MethodPermission"
- * ResourceHandler.getString("The_methodPermission_prope_UI_"), //$NON-NLS-1$ = "The
- * methodPermission property" pkg.getMethodElement_MethodPermission()));
- */
- // This is for the methodTransaction feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * ResourceHandler.getString("MethodTransaction_UI_"), //$NON-NLS-1$ =
- * "MethodTransaction" ResourceHandler.getString("The_methodTransaction_prop_UI_"),
- * //$NON-NLS-1$ = "The methodTransaction property"
- * pkg.getMethodElement_MethodTransaction()));
- */
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodElement_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodElement_name_feature", "_UI_MethodElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMethodElement_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Parms feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParmsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodElement_parms_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodElement_parms_feature", "_UI_MethodElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMethodElement_Parms(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodElement_type_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodElement_type_feature", "_UI_MethodElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMethodElement_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodElement_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodElement_description_feature", "_UI_MethodElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMethodElement_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Enterprise Bean feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addEnterpriseBeanPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodElement_enterpriseBean_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodElement_enterpriseBean_feature", "_UI_MethodElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMethodElement_EnterpriseBean(), true));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(EjbPackage.eINSTANCE.getMethodElement_Descriptions());
- }
- return childrenReferences;
- }
-
-
- public String getText(Object object) {
- return ((MethodElement) object).getSignature();
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MethodElement.class)) {
- case EjbPackage.METHOD_ELEMENT__NAME :
- case EjbPackage.METHOD_ELEMENT__PARMS :
- case EjbPackage.METHOD_ELEMENT__TYPE :
- case EjbPackage.METHOD_ELEMENT__DESCRIPTION :
- case EjbPackage.METHOD_ELEMENT__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMethodElement_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMethodElement_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}.
- */
- /*
- * public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue,
- * Object newValue, int index) { if (feature == NAME_SF || feature == PARMS_SF || feature ==
- * TYPE_SF || feature == ZERO_PARAMS_SF || feature == PARAMS_SF || feature == DESC_SF || feature ==
- * EJB_SF || feature == PERMISSION_SF || feature == TRANSACTION_SF || feature == FLUSH_SF) {
- * fireNotifyChanged(notifier, eventType, feature, oldValue, newValue, index); return; }
- * super.notifyChanged(notifier, eventType, feature, oldValue, newValue, index); }
- */
- /**
- * @see Adapter#setTarget(Notifier)
- */
- public void setTarget(Notifier newTarget) {
- super.setTarget(newTarget);
- if (newTarget != null && newTarget instanceof MethodElement) {
- MethodElement me = (MethodElement) newTarget;
- EnterpriseBean ejb = me.getEnterpriseBean();
- if (ejb != null) {
- JavaClass javaClass = me.getTypeJavaClass();
- if (javaClass != null)
- adaptJavaClass(javaClass);
- else {
- //unspecified
- if (ejb.hasRemoteClient()) {
- adaptJavaClass(ejb.getRemoteInterface());
- adaptJavaClass(ejb.getHomeInterface());
- }
- if (ejb.hasLocalClient())
- adaptJavaClass(ejb.getLocalInterface());
- adaptJavaClass(ejb.getLocalHomeInterface());
- }
- }
- }
- }
-
- protected void adaptJavaClass(JavaClass javaClass) {
- if (javaClass != null) {
- javaClass.eAdapters().add(this);
- super.setTarget(javaClass);
- }
- }
-
- /**
- * @see IDisposable#dispose()
- */
- public void dispose() {
- super.dispose();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionItemProvider.java
deleted file mode 100644
index 42e44d7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionItemProvider.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.MethodPermission}object.
- */
-public class MethodPermissionItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public MethodPermissionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- MethodElement child = EjbFactory.eINSTANCE.createMethodElement();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- return Collections.singleton(EjbPackage.eINSTANCE.getMethodPermission_MethodElements());
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "CreateMethodElement"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("Create_MethodElement_UI_"); //$NON-NLS-1$ = "Create MethodElement"
- }
-
- /**
- * This returns the help text for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return EJBProviderLibrariesResourceHandler.getString("Create_a_child_of_type_Met1_UI_") + refObject.eClass().getName() + "."; //$NON-NLS-2$ //$NON-NLS-1$ = "Create a child of type MethodElement for the selected "
- }
-
- /**
- * This returns MethodPermission.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("methPermission_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the MethodPermission.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Description_UI_"), //$NON-NLS-1$ = "Description"
- EJBProviderLibrariesResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
- pkg.getMethodPermission_Description()));
-
- // This is for the assemblyDescriptor feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("AssemblyDescriptor_UI_"), //$NON-NLS-1$ = "AssemblyDescriptor"
- EJBProviderLibrariesResourceHandler.getString("The_assemblyDescriptor_pro_UI_"), //$NON-NLS-1$ = "The assemblyDescriptor property"
- pkg.getMethodPermission_AssemblyDescriptor()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodPermission_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodPermission_description_feature", "_UI_MethodPermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMethodPermission_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Unchecked feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUncheckedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodPermission_unchecked_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodPermission_unchecked_feature", "_UI_MethodPermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMethodPermission_Unchecked(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Roles feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRolesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodPermission_roles_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodPermission_roles_feature", "_UI_MethodPermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMethodPermission_Roles(), true));
- }
-
- public String getText(Object object) {
- if (object instanceof MethodPermission)
- return getText((MethodPermission) object);
- return super.getText(object);
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MethodPermission.class)) {
- case EjbPackage.METHOD_PERMISSION__DESCRIPTION :
- case EjbPackage.METHOD_PERMISSION__UNCHECKED :
- case EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS :
- case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMethodPermission_MethodElements(), EjbFactory.eINSTANCE.createMethodElement()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMethodPermission_MethodElements(), EjbFactory.eINSTANCE.createQueryMethod()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMethodPermission_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMethodPermission_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- public String getText(MethodPermission mp) {
- if (mp.isUnchecked())
- return EJBProviderLibrariesResourceHandler.getString("Unchecked_UI_"); //$NON-NLS-1$
- List roles = mp.getRoles();
- StringBuffer buf = new StringBuffer();
- //buf.append(ResourceHandler.getString("MethodPermission__UI_")); //$NON-NLS-1$ =
- // "MethodPermission "
- buf.append("("); //$NON-NLS-1$
- SecurityRole role = null;
- for (int i = 0; i < roles.size(); i++) {
- if (i != 0)
- buf.append(", "); //$NON-NLS-1$
- role = (SecurityRole) roles.get(i);
- buf.append(role.getRoleName());
- }
- buf.append(")"); //$NON-NLS-1$
- return buf.toString();
- }
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}.
- */
- /*
- * public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue,
- * Object newValue, int index) { if (feature == DESCRIPTION_SF || feature == ROLES_SF || feature ==
- * METHOD_ELEMENTS_SF || feature == UNCHECKED_SF) { fireNotifyChanged(notifier, eventType,
- * feature, oldValue, newValue, index); return; } super.notifyChanged(notifier, eventType,
- * feature, oldValue, newValue, index); }
- */
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionItemProvider.java
deleted file mode 100644
index e30eac2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionItemProvider.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.MethodTransaction}object.
- */
-public class MethodTransactionItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public MethodTransactionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- MethodElement child = EjbFactory.eINSTANCE.createMethodElement();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- return Collections.singleton(EjbPackage.eINSTANCE.getMethodTransaction_MethodElements());
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "CreateMethodElement");//$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("Create_MethodElement_UI_"); //$NON-NLS-1$ = "Create MethodElement"
- }
-
- /**
- * This returns the help text for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return EJBProviderLibrariesResourceHandler.getString("Create_a_child_of_type_Met1_UI_") + refObject.eClass().getName() + ".";//$NON-NLS-2$ //$NON-NLS-1$ = "Create a child of type MethodElement for the selected "
- }
-
- /**
- * This returns MethodTransaction.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("methTransaction_obj");//$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the MethodTransaction.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the transactionAttribute feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("TransactionAttribute_UI_"), //$NON-NLS-1$ = "TransactionAttribute"
- EJBProviderLibrariesResourceHandler.getString("The_transactionAttribute_p_UI_"), //$NON-NLS-1$ = "The transactionAttribute property"
- pkg.getMethodTransaction_TransactionAttribute()));
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Description_UI_"), //$NON-NLS-1$ = "Description"
- EJBProviderLibrariesResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
- pkg.getMethodTransaction_Description()));
-
- // This is for the assemblyDescriptor feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("AssemblyDescriptor_UI_"), //$NON-NLS-1$ = "AssemblyDescriptor"
- EJBProviderLibrariesResourceHandler.getString("The_assemblyDescriptor_pro_UI_"), //$NON-NLS-1$ = "The assemblyDescriptor property"
- pkg.getMethodTransaction_AssemblyDescriptor()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Transaction Attribute feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addTransactionAttributePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodTransaction_transactionAttribute_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodTransaction_transactionAttribute_feature", "_UI_MethodTransaction_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMethodTransaction_TransactionAttribute(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodTransaction_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodTransaction_description_feature", "_UI_MethodTransaction_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getMethodTransaction_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- public String getText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("MethodTransaction__UI_") + " " + ((MethodTransaction) object).getTransactionAttribute().getName(); //$NON-NLS-1$ = "MethodTransaction "//$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MethodTransaction.class)) {
- case EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE :
- case EjbPackage.METHOD_TRANSACTION__DESCRIPTION :
- case EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS :
- case EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMethodTransaction_MethodElements(), EjbFactory.eINSTANCE.createMethodElement()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMethodTransaction_MethodElements(), EjbFactory.eINSTANCE.createQueryMethod()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMethodTransaction_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getMethodTransaction_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/QueryItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/QueryItemProvider.java
deleted file mode 100644
index acdbb0b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/QueryItemProvider.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-// Referenced classes of package org.eclipse.jst.j2ee.internal.internal.ejb.provider:
-// EjbItemProviderAdapter
-
-public class QueryItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- public QueryItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- public Object createChild(Object object) {
- return null;
- }
-
- public Collection getChildrenReferences(Object object) {
- if (super.childrenReferences == null) {
- super.getChildrenReferences(object);
- super.childrenReferences.add(EjbPackage.eINSTANCE.getQuery_QueryMethod());
- }
- return super.childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "Create#CHILD_CLASS_NAME#"); //$NON-NLS-1$
- }
-
- public String getCreateChildText(Object object) {
- return "Create #CHILD_CLASS_NAME#"; //$NON-NLS-1$
- }
-
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return "Create a child of type #CHILD_CLASS_NAME# for the selected " + refObject.eClass().getName() + "."; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("db_obj"); //$NON-NLS-1$
- }
-
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- public List getPropertyDescriptors(Object object) {
- if (super.itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- EjbPackage pkg = EjbPackage.eINSTANCE;
- super.itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) super.adapterFactory).getRootAdapterFactory(), "Description_7", "The_description_property_of_the_query_8", pkg.getQuery_Description(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); //$NON-NLS-1$ //$NON-NLS-2$
- super.itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) super.adapterFactory).getRootAdapterFactory(), "Ejb_QL_9", "The_ejb_ql_property_of_the_query_10", pkg.getQuery_EjbQL(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); //$NON-NLS-1$ //$NON-NLS-2$
- super.itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) super.adapterFactory).getRootAdapterFactory(), "Return_Type_Mapping_11", "The_return_type_mapping_property_of_the_query_12", pkg.getQuery_ReturnTypeMapping(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); //$NON-NLS-1$ //$NON-NLS-2$
- super.itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) super.adapterFactory).getRootAdapterFactory(), "Entity_13", "The_entity_of_the_query_14", pkg.getQuery_Entity(), false)); //$NON-NLS-1$ //$NON-NLS-2$
- super.itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) super.adapterFactory).getRootAdapterFactory(), "Query_Method_15", "The_query_method_of_the_query_16", pkg.getQuery_QueryMethod(), false)); //$NON-NLS-1$ //$NON-NLS-2$
- }
- return super.itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Query_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Query_description_feature", "_UI_Query_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getQuery_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Ejb QL feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addEjbQLPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Query_ejbQL_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Query_ejbQL_feature", "_UI_Query_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getQuery_EjbQL(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Return Type Mapping feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addReturnTypeMappingPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Query_returnTypeMapping_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Query_returnTypeMapping_feature", "_UI_Query_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getQuery_ReturnTypeMapping(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- public String getText(Object object) {
- Query query = (Query) object;
- return "Query " + query.getEjbQL(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Query.class)) {
- case EjbPackage.QUERY__DESCRIPTION :
- case EjbPackage.QUERY__EJB_QL :
- case EjbPackage.QUERY__RETURN_TYPE_MAPPING :
- case EjbPackage.QUERY__QUERY_METHOD :
- case EjbPackage.QUERY__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getQuery_QueryMethod(), EjbFactory.eINSTANCE.createQueryMethod()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getQuery_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getQuery_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/QueryMethodItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/QueryMethodItemProvider.java
deleted file mode 100644
index f10ce85..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/QueryMethodItemProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.QueryMethod}object.
- */
-public class QueryMethodItemProvider extends MethodElementItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- protected final static EStructuralFeature QUERY_SF = PACK_SF.getQueryMethod_Query();
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public QueryMethodItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("query_method_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the QueryMethod.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the query feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Query_2"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_query_of_the_query_method_3"), //$NON-NLS-1$
- pkg.getQueryMethod_Query(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- public String getText(Object object) {
- QueryMethod queryMethod = (QueryMethod) object;
- return queryMethod.getName(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/RelationshipsItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/RelationshipsItemProvider.java
deleted file mode 100644
index 4a068ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/RelationshipsItemProvider.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Relationships}object.
- */
-public class RelationshipsItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public RelationshipsItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- EJBRelation child = EjbFactory.eINSTANCE.createEJBRelation();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(EjbPackage.eINSTANCE.getRelationships_EjbRelations());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "CreateEJBRelation"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return EJBProviderLibrariesResourceHandler.getString("Create_EJBRelation_2"); //$NON-NLS-1$
- }
-
- /**
- * This returns the help text for {@link org.eclipse.jst.j2ee.internal.internal.ejb.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return EJBProviderLibrariesResourceHandler.getString("Create_a_child_of_type_EJBRelation_for_the_selected__3") + refObject.eClass().getName() + EJBProviderLibrariesResourceHandler.getString("_4"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This returns Relationships.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("Relationships"); //$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the Relationships.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Description_6"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_description_property_of_the_relationships_7"), //$NON-NLS-1$
- pkg.getRelationships_Description(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- // This is for the ejbJar feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Ejb_Jar_8"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_ejb_jar_of_the_relationships_9"), //$NON-NLS-1$
- pkg.getRelationships_EjbJar(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Relationships_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Relationships_description_feature", "_UI_Relationships_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getRelationships_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- public String getText(Object object) {
- Relationships relationships = ((Relationships) object);
- return EJBProviderLibrariesResourceHandler.getString("Relationships__10") + relationships.getDescription(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Relationships.class)) {
- case EjbPackage.RELATIONSHIPS__DESCRIPTION :
- case EjbPackage.RELATIONSHIPS__EJB_RELATIONS :
- case EjbPackage.RELATIONSHIPS__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getRelationships_EjbRelations(), EjbFactory.eINSTANCE.createEJBRelation()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getRelationships_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getRelationships_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/RoleSourceItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/RoleSourceItemProvider.java
deleted file mode 100644
index 2a29419..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/RoleSourceItemProvider.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.RoleSource}object.
- */
-public class RoleSourceItemProvider extends EjbItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public RoleSourceItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns RoleSource.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("RoleSource"); //$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the RoleSource.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Description_2"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_description_property_of_the_role_source_3"), //$NON-NLS-1$
- pkg.getRoleSource_Description(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- // This is for the role feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Role_4"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_role_of_the_role_source_5"), //$NON-NLS-1$
- pkg.getRoleSource_Role(), false));
-
- // This is for the entityBean feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("Entity_Bean_6"), //$NON-NLS-1$
- EJBProviderLibrariesResourceHandler.getString("The_entity_bean_of_the_role_source_7"), //$NON-NLS-1$
- pkg.getRoleSource_EntityBean(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_RoleSource_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_RoleSource_description_feature", "_UI_RoleSource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getRoleSource_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Entity Bean feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addEntityBeanPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_RoleSource_entityBean_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_RoleSource_entityBean_feature", "_UI_RoleSource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getRoleSource_EntityBean(), true));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(EjbPackage.eINSTANCE.getRoleSource_Descriptions());
- }
- return childrenReferences;
- }
-
-
- public String getText(Object object) {
- RoleSource roleSource = ((RoleSource) object);
- return EJBProviderLibrariesResourceHandler.getString("RoleSource__8") + roleSource.getDescription(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(RoleSource.class)) {
- case EjbPackage.ROLE_SOURCE__DESCRIPTION :
- case EjbPackage.ROLE_SOURCE__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getRoleSource_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(EjbPackage.eINSTANCE.getRoleSource_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/SessionItemProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/SessionItemProvider.java
deleted file mode 100644
index 75071ee..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/SessionItemProvider.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Session}object.
- */
-public class SessionItemProvider extends EnterpriseBeanItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public SessionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns Session.gif.
- */
- public Object getImage(Object object) {
- // Session sess = null;
- // if (object instanceof Session)
- // sess = (Session) object;
- // if (sess != null && sess.isVersion2_X())
- // return J2EEPlugin.getPlugin().getImage("20_ejb_obj"); //$NON-NLS-1$
- return J2EEPlugin.getPlugin().getImage("sessionBean_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> Don't remove this
- * method or it will be regenerated. <!-- end-user-doc -->
- *
- */
- public String getText(Object object) {
- return super.getText(object);
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Session.class)) {
- case EjbPackage.SESSION__TRANSACTION_TYPE :
- case EjbPackage.SESSION__SERVICE_ENDPOINT :
- case EjbPackage.SESSION__SESSION_TYPE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
- boolean qualify = feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs() || feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs();
- return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
- new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This returns the parent of the Session.
- */
- public Object getParent(Object object) {
- return super.getParent(object);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- EjbPackage pkg = EjbPackage.eINSTANCE;
-
- // This is for the transactionType feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("TransactionType_UI_"), //$NON-NLS-1$ = "TransactionType"
- EJBProviderLibrariesResourceHandler.getString("The_transactionType_proper_UI_"), //$NON-NLS-1$ = "The transactionType property"
- pkg.getSession_TransactionType()));
-
- // This is for the sessionType feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), EJBProviderLibrariesResourceHandler.getString("SessionType_UI_"), //$NON-NLS-1$ = "SessionType"
- EJBProviderLibrariesResourceHandler.getString("The_sessionType_property_UI_"), //$NON-NLS-1$ = "The sessionType property"
- pkg.getSession_SessionType()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Transaction Type feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addTransactionTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Session_transactionType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Session_transactionType_feature", "_UI_Session_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getSession_TransactionType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Session Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSessionTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Session_sessionType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Session_sessionType_feature", "_UI_Session_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getSession_SessionType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Service Endpoint feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addServiceEndpointPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Session_serviceEndpoint_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Session_serviceEndpoint_feature", "_UI_Session_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EjbPackage.eINSTANCE.getSession_ServiceEndpoint(), true));
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/EJBHelper.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/EJBHelper.java
deleted file mode 100644
index 218e42c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/EJBHelper.java
+++ /dev/null
@@ -1,792 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.workbench.validation;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IRegion;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.internal.adapters.jdom.JDOMSearchHelper;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.validation.AWorkbenchMOFHelper;
-import org.eclipse.jst.j2ee.model.internal.validation.EJBValidator;
-import org.eclipse.jst.j2ee.model.internal.validation.EJBValidatorModelEnum;
-import org.eclipse.jst.j2ee.model.internal.validation.IEJBValidatorConstants;
-import org.eclipse.jst.j2ee.model.internal.validation.InvalidInputException;
-import org.eclipse.jst.j2ee.model.internal.validation.MessageUtility;
-import org.eclipse.jst.j2ee.model.internal.validation.ValidationRuleUtility;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Load the EJB MOF model and return resources for the EJB Validator.
- */
-public class EJBHelper extends AWorkbenchMOFHelper {
- //protected EJBProjectResources _projectResources = null;
-// private IJavaProject[] _dependentJavaProjects = null;
- private IJavaProject[] _requiredJavaProjects = null;
-// private IJavaProject _javaProject = null; // this IProject, as an
- // IJavaProject
- private Set _tempSet = null;
- private Map _projectMap = null; // Key is IJavaProject instance, value is
- // either IJavaMOFNature (for non-EJB
- // projects) or an EJBProjectResources. See
- // constructor for more details.
- private static final JavaClass[] EMPTY_ARRAY_JAVACLASS = new JavaClass[0];
- private static LogEntry logEntry;
- private static Logger logger;
- private ArtifactEdit edit = null;
- private EJBJarFile ejbJarFile = null;
- private EJBJar ejbJar = null;
-
- public EJBHelper() {
- super();
- // In the loadChildren method, every time that a JavaClass changes, we
- // need to load the
- // JavaClass which extend/implement it. Because we cannot assume that
- // every JavaClass child
- // is contained in this project, or that every JavaClass child is in an
- // EJB project,
- // maintain a cache of IJavaProject <-> IJavaMOFNature mappings.
- // Whenever we need to load the JavaClass
- // for an IType, if the IType's project is not this project, then
- // return the resource set of
- // the IType's IProject's nature. see the getResourceSet(IType) method.
- //
- // Key = IJavaProject
- // Value = IJavaMOFNature or EJBProjectResources
- // This cache does not contain the current IJavaProject or its nature.
- // Access those through
- // the getProjectResources() method.
- _projectMap = new HashMap();
- registerModel(EJBValidatorModelEnum.EJB, "loadBeans", new Class[]{JavaClass.class}); //$NON-NLS-1$
- registerModel(EJBValidatorModelEnum.CHILDREN, "loadChildren", new Class[]{IReporter.class, Set.class}); //$NON-NLS-1$
- registerModel(EJBValidatorModelEnum.EJB_MODEL, "loadEjbModel"); //$NON-NLS-1$
- registerModel(EJBValidatorModelEnum.EJB_FILE, "loadEjbFile"); //$NON-NLS-1$
- registerModel(EJBValidatorModelEnum.EJB_CLIENTJAR, "loadClientJAR", new Class[]{String.class}); //$NON-NLS-1$
- registerModel(EJBValidatorModelEnum.REMOVE_OLD_MESSAGES, "removeOldMessages", new Class[]{IReporter.class, Map.class}); //$NON-NLS-1$
- }
-
- /**
- * @return
- */
- private static LogEntry getLogEntry() {
- if (logEntry == null) {
- logEntry = new LogEntry(IEJBValidatorConstants.BUNDLE_NAME);
- }
- logEntry.reset(); // reset the values so that we're not logging stale data
- return logEntry;
- }
-
- /**
- * @return
- */
- private static Logger getMsgLogger() {
- if (logger == null)
- logger = EjbPlugin.getPlugin().getMsgLogger();
- return logger;
- }
-
- /**
- * When the validation is complete, this method will be called so that the IWorkbenchContext can
- * clean up any resources it allocated during the validation.
- *
- * If the cleanup is a long-running operation, subtask messages should be sent to the IReporter.
- */
- public void cleanup(WorkbenchReporter reporter) {
-// if (_projectResources != null) {
-// _projectResources.cleanup();
-// _projectResources = null;
-// }
- if (_projectMap != null) {
-// Iterator iterator = _projectMap.values().iterator();
-// while (iterator.hasNext()) {
-// Object value = iterator.next();
-// if (value instanceof EJBProjectResources) {
-// ((EJBProjectResources) value).cleanup();
-// }
-// }
- _projectMap.clear();
- }
-// _dependentJavaProjects = null;
-// _javaProject = null;
- ejbJar = null;
- if (edit != null) {
- edit.dispose();
- edit = null;
- }
- if(null != ejbJarFile){
- ejbJarFile.close();
- ejbJarFile = null;
- }
-
- }
-
- /**
- * Given an IMessage's target object, return a string which identifies the object, so that the
- * user can locate it. This method is called only if getLineNo() doesn't return a line number.
- */
- public String getDescription(Object object) {
- if (object == null) {
- return ""; //$NON-NLS-1$
- }
- if (object instanceof JavaClass) {
- return ResourceHandler.getExternalizedMessage(EJBHelperConstants.LOC_CLASS, new String[]{((JavaClass) object).getQualifiedName()});
- } else if (object instanceof Method) {
- Method method = (Method) object;
- JavaClass clazz = method.getContainingJavaClass();
- return ResourceHandler.getExternalizedMessage(EJBHelperConstants.LOC_METHOD, new String[]{method.getMethodElementSignature(), clazz.getQualifiedName()});
- } else if (object instanceof Field) {
- Field field = (Field) object;
- JavaClass clazz = field.getContainingJavaClass();
- return ResourceHandler.getExternalizedMessage(EJBHelperConstants.LOC_FIELD, new String[]{field.getName(), clazz.getQualifiedName()});
- } else if (object instanceof EnterpriseBean) {
- return ResourceHandler.getExternalizedMessage(EJBHelperConstants.LOC_BEAN, new String[]{((EnterpriseBean) object).getName()});
- } else if (object instanceof EJBJar) {
- return ((EJBJar) object).getDisplayName();
- } else if (object instanceof EJBJarFile) {
- return ((EJBJarFile) object).getName();
- } else if (object instanceof EARFile) {
- return ((EARFile) object).getName();
- } else if (object instanceof CommonRelationshipRole) {
- // EJB 1.1 relationship role
- CommonRelationshipRole role = (CommonRelationshipRole) object;
- EnterpriseBean bean = role.getSourceEntity();
- return ResourceHandler.getExternalizedMessage(EJBHelperConstants.LOC_ROLE, new String[]{role.getName(), ((bean == null) ? "?" : bean.getName())}); //$NON-NLS-1$
- } else if (object instanceof EJBRelation) {
- // EJB 2.0 <ejb-relation>
- EJBRelation relation = (EJBRelation) object;
- return ResourceHandler.getExternalizedMessage(EJBHelperConstants.LOC_EJBRELATION, new String[]{relation.getName()});
- } else if (object instanceof EJBRelationshipRole) {
- // EJB 2.0 <ejb-relationship-role>
- EJBRelationshipRole role = (EJBRelationshipRole) object;
- EJBRelation relation = role.getRelationship();
- return ResourceHandler.getExternalizedMessage(EJBHelperConstants.LOC_EJBRELATIONSHIPROLE, new String[]{role.getName(), ((relation == null) ? "?" : relation.getName())}); //$NON-NLS-1$
- } else if (object instanceof MethodElement) {
- MethodElement element = (MethodElement) object;
- EnterpriseBean bean = element.getEnterpriseBean();
- return ResourceHandler.getExternalizedMessage(EJBHelperConstants.LOC_METHODELEMENT, new String[]{element.getName(), ((bean == null) ? "?" : bean.getName())}); //$NON-NLS-1$
- } else if (object instanceof MethodPermission) {
- MethodPermission element = (MethodPermission) object;
- String description = (element.eIsSet(EjbPackage.eINSTANCE.getMethodPermission_Description())) ? element.getDescription() : ((XMIResource) element.eResource()).getID(element);
- return ResourceHandler.getExternalizedMessage(EJBHelperConstants.LOC_METHODPERMISSION, new String[]{description});
- } else if (object instanceof MethodTransaction) {
- MethodTransaction element = (MethodTransaction) object;
- String description = (element.eIsSet(EjbPackage.eINSTANCE.getMethodTransaction_Description())) ? element.getDescription() : ((XMIResource) element.eResource()).getID(element);
- return ResourceHandler.getExternalizedMessage(EJBHelperConstants.LOC_METHODTRANSACTION, new String[]{description});
- } else if (object instanceof SecurityRoleRef) {
- SecurityRoleRef ref = (SecurityRoleRef) object;
- return ResourceHandler.getExternalizedMessage(EJBHelperConstants.LOC_ROLEREF, new String[]{ref.getName()});
- }
- return super.getDescription(object);
- }
-
- public IResource getResource(Object object) {
- IResource result = super.getResource(object);
- if ((result != null) && (result.exists())) {
- return result;
- }
- if (object == null) {
- return null;
- }
- if (object instanceof Method) {
- return getFile(((Method) object).getContainingJavaClass());
- } else if (object instanceof Field) {
- return getFile(((Field) object).getContainingJavaClass());
- } else if (object instanceof JavaClass) {
- return getFile((JavaClass) object);
- } else if (object instanceof EObject) {
- return WorkbenchResourceHelper.getFile(((EObject) object).eResource());
- }
- return null;
- }
-
- /**
- * When an IValidator associates a target object with an IMessage, the WorkbenchReporter
- * eventually resolves that target object with an IResource. Sometimes more than one target
- * object resolves to the same IResource (usually the IProject, which is the default IResource
- * when an IFile cannot be found). This method is called, by the WorkbenchReporter, so that the
- * WorkbenchReporter can distinguish between the IMessages which are on the same IResource, but
- * refer to different target objects. This is needed for the removeAllMessages(IValidator,
- * Object) method, so that when one target object removes all of its messages, that it doesn't
- * remove another target object's messages.
- *
- * This method may return null only if object is null. Otherwise, an id which can uniquely
- * identify a particular object must be returned. The id needs to be unique only within one
- * particular IValidator.
- */
- public String getTargetObjectName(Object obj) {
- if (obj == null) {
- return null;
- } else if (obj instanceof Method) {
- return ((Method) obj).getJavaClass().getQualifiedName();
- } else if (obj instanceof Field) {
- return ((Field) obj).getJavaClass().getQualifiedName();
- } else if (obj instanceof JavaClass) {
- return ((JavaClass) obj).getQualifiedName();
- } else if (obj instanceof EnterpriseBean) {
- return "META-INF/ejb-jar.xml"; // Should resolve to ejb-jar.xml. //$NON-NLS-1$
- } else if (obj instanceof EJBJar) {
- return "META-INF/ejb-jar.xml"; // Should resolve to ejb-jar.xml. //$NON-NLS-1$
- } else if (obj instanceof ModuleFile) {
- return "META-INF/ejb-jar.xml"; // Should resolve to ejb-jar.xml. //$NON-NLS-1$
- } else {
- return ""; //$NON-NLS-1$
- }
- }
-
- public Object loadModel(String symbolicName, Object[] parms) {
- if (isRegistered(symbolicName)) {
- // one of the constants listed in the constructor
- return super.loadModel(symbolicName, parms);
- }
- // else, it's a URI as calculated by getPortableName(IResource)
- Object[] result = new Object[2];
- JavaClass clazz = load(symbolicName); // symbolic name is really the
- // name of a java class
- //D247561 if(clazz == null) {
- // return null;
- // }
- // Fix this problem in a later release.
- result[0] = clazz;
- result[1] = loadBeans((JavaClass) result[0]);
- return result;
- }
-
- public JavaClass load(String uri) {
- if (uri == null) {
- return null;
- }
- //ToDo:revisit this
- IFile file = null;
- //IFile file = getProjectResources().getEJBNature().getFile(uri);
- if ((file == null) || (!file.exists())) {
- return null;
- }
- return JemProjectUtilities.getJavaClass(file);
- }
-
- /**
- * Return a List of the EnterpriseBeans which use this JavaClass as a remote, home, bean class
- * or key. This method takes an Object[] parameter so that it can be called by the
- * WorkbenchContext's load mechanism. It is expected that this parameter has one entry, and that
- * entry is an instance of a JavaClass.
- */
- public List loadBeans(JavaClass clazz) {
- if (clazz == null) {
- return Collections.EMPTY_LIST;
- }
- // First check this project for beans
- Set tempSet = getTempSet();
-
-// ToDO: fix this
-// addBeans(clazz, getProjectResources(), tempSet);
-// // And then check all projects which depend on this one
-// for (int i = 0; i < _dependentJavaProjects.length; i++) {
-// Object value = _projectMap.get(_dependentJavaProjects[i]);
-// if (value instanceof EJBProjectResources) {
-// addBeans(clazz, (EJBProjectResources) value, tempSet);
-// }
-// }
- List list = new ArrayList();
- list.addAll(tempSet);
- return list;
- }
-
- /**
- * Given a list of all of the java types, return a list of all JavaClass types that extend or
- * implement these types.
- */
- public JavaClass[] loadChildren(IReporter reporter, Set classes) {
- long start = System.currentTimeMillis(), end = 0;
- JavaClass[] children = EMPTY_ARRAY_JAVACLASS;
- int executionMap = 0;
- Set tempSet = getTempSet();
- Logger aLogger = getMsgLogger();
- try {
- if ((classes == null) || (classes.size() == 0)) {
- executionMap |= 0x00000001;
- return children;
- }
- IProgressMonitor monitor = ((WorkbenchReporter) reporter).getProgressMonitor();
- if (classes.size() == 1) {
- JavaClass clazz = (JavaClass) classes.toArray()[0];
- IType type = getType(clazz);
- if (type != null) {
- ITypeHierarchy hierarchy = type.newTypeHierarchy(monitor);
- IType[] subtypes = hierarchy.getAllSubtypes(type);
- if ((subtypes != null) && (subtypes.length > 0)) {
- for (int j = 0; j < subtypes.length; j++) {
- tempSet.add(subtypes[j]);
- }
- }
- }
- } else {
- // Create a region so that only the top (root) types are used
- // as input to the newTypeHierarchy method. The
- // newTypeHierarchyMethod
- // is a heavy method, so the less it's called, the better.
- IRegion region = JavaCore.newRegion();
- Iterator iterator = classes.iterator();
- while (iterator.hasNext()) {
- if (reporter.isCancelled()) {
- executionMap |= 0x00000002;
- return children;
- }
- JavaClass clazz = (JavaClass) iterator.next();
- IType type = getType(clazz);
- if (type == null) {
- if (aLogger.isLoggingLevel(Level.FINER)) {
- LogEntry entry = getLogEntry();
- entry.setSourceID("EJBHelper::loadChildren(JavaClass[])::region"); //$NON-NLS-1$
- entry.setText((clazz != null) ? clazz.getJavaName() : "null JavaClass"); //$NON-NLS-1$
- aLogger.write(Level.FINER, entry);
- }
- } else {
- region.add(type);
- }
- }
- // Now that we know what the top types are, calculate the
- // hierarchies
- // for all of these types in the workspace.
- IJavaElement[] rootTypes = region.getElements();
- ITypeHierarchy[] rootHierarchies = new ITypeHierarchy[rootTypes.length];
- for (int i = 0; i < rootTypes.length; i++) {
- if (reporter.isCancelled()) {
- executionMap |= 0x00000004;
- return children;
- }
- IType type = (IType) rootTypes[i];
- long hStart = System.currentTimeMillis();
- ITypeHierarchy hierarchy = type.newTypeHierarchy(monitor);
- long hEnd = System.currentTimeMillis();
- if (aLogger.isLoggingLevel(Level.FINER)) {
- LogEntry entry = getLogEntry();
- entry.setSourceID("EJBHelper::loadChildren(JavaClass[])::newTypeHierarchy"); //$NON-NLS-1$
- entry.setElapsedTime(hEnd - hStart);
- entry.setText(type.getElementName());
- aLogger.write(Level.FINER, entry);
- }
- rootHierarchies[i] = hierarchy;
- }
- // For each of the changed types, find its subtypes. Add each
- // subtype to a set so that there are no duplicates.
- iterator = classes.iterator();
- while (iterator.hasNext()) {
- if (reporter.isCancelled()) {
- return children;
- }
- JavaClass clazz = (JavaClass) iterator.next();
- IType type = getType(clazz);
- if (type == null) {
- continue;
- }
- for (int i = 0; i < rootHierarchies.length; i++) {
- ITypeHierarchy hierarchy = rootHierarchies[i];
- if (hierarchy.contains(type)) {
- IType[] subtypes = hierarchy.getAllSubtypes(type);
- if ((subtypes == null) || (subtypes.length == 0)) {
- continue;
- }
- for (int j = 0; j < subtypes.length; j++) {
- tempSet.add(subtypes[j]);
- }
- break; // don't need to check the rest of the
- // hierarchies, because each hierarchy is
- // distinct
- }
- }
- }
- }
- int count = 0;
- JavaClass[] tempChildren = new JavaClass[tempSet.size()];
- Iterator iterator = tempSet.iterator();
- while (iterator.hasNext()) {
- IType type = (IType) iterator.next();
- if (type == null) {
- if (aLogger.isLoggingLevel(Level.FINER)) {
- LogEntry entry = getLogEntry();
- entry.setSourceID("EJBHelper::loadChildren(JavaClass[])"); //$NON-NLS-1$
- entry.setText("null type used in project " + getProject().getName()); //$NON-NLS-1$
- aLogger.write(Level.FINER, entry);
- }
- continue;
- }
- JavaHelpers child = getJavaClass(type);
- if ((child != null) && (child.getWrapper() != null)) {
- tempChildren[count++] = child.getWrapper();
- } else {
- if (aLogger.isLoggingLevel(Level.FINER)) {
- LogEntry entry = getLogEntry();
- entry.setSourceID("EJBHelper::loadChildren(JavaClass[])"); //$NON-NLS-1$
- entry.setText(type.getElementName() + " was found in project " + type.getJavaProject().getProject().getName() + ", but either the JavaHelpers is null or its wrapper is null."); //$NON-NLS-1$ //$NON-NLS-2$
- aLogger.write(Level.FINER, entry);
- }
- }
- }
- if (count != tempChildren.length) {
- executionMap |= 0x00000008;
- children = new JavaClass[count];
- System.arraycopy(tempChildren, 0, children, 0, count);
- tempChildren = null;
- } else {
- executionMap |= 0x00000010;
- children = tempChildren;
- }
- } catch (JavaModelException exc) {
- executionMap |= 0x00000020;
- aLogger = getMsgLogger();
- if (aLogger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = getLogEntry();
- entry.setSourceID("EJBHelper::loadChildren(JavaClass[])"); //$NON-NLS-1$
- entry.setTargetException(exc);
- aLogger.write(Level.SEVERE, entry);
- }
- } catch (Throwable exc) {
- executionMap |= 0x00000040;
- aLogger = getMsgLogger();
- if (aLogger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = getLogEntry();
- entry.setSourceID("EJBHelper::loadChildren(JavaClass[])"); //$NON-NLS-1$
- entry.setTargetException(exc);
- aLogger.write(Level.SEVERE, entry);
- }
- } finally {
- getTempSet().clear();
- end = System.currentTimeMillis();
- aLogger = getMsgLogger();
- if (aLogger.isLoggingLevel(Level.FINER)) {
- StringBuffer buffer = new StringBuffer("Children found in project "); //$NON-NLS-1$
- buffer.append(getProject().getName());
- buffer.append(": IType["); //$NON-NLS-1$
- buffer.append(children.length);
- buffer.append("] = {"); //$NON-NLS-1$
- for (int i = 0; i < children.length; i++) {
- JavaClass clazz = children[i];
- buffer.append(clazz.getJavaName());
- buffer.append(", "); //$NON-NLS-1$
- }
- buffer.append("}"); //$NON-NLS-1$
- LogEntry entry = getLogEntry();
- entry.setSourceID("EJBHelper::loadChildren(JavaClass[])"); //$NON-NLS-1$
- entry.setText(buffer.toString());
- entry.setElapsedTime(end - start);
- entry.setExecutionMap(executionMap);
- aLogger.write(Level.FINER, entry);
- }
- }
- return children;
- }
-
- /**
- * Load the EJB MOF model.
- */
- public EObject loadEjbFile() {
-
- IVirtualComponent comp = ComponentCore.createComponent(getProject());
- edit = ComponentUtilities.getArtifactEditForRead(comp);
-
- try {
- return ((EnterpriseArtifactEdit) edit).asArchive(false);
- } catch (OpenFailureException e1) {
- Logger.getLogger().log(e1);
- }
- return null;
- }
-
- /**
- * Load the EJB MOF model.
- */
- public EObject loadEjbModel() {
- if( ejbJar == null){
- IVirtualComponent comp = ComponentCore.createComponent(getProject());
- edit = ComponentUtilities.getArtifactEditForRead(comp);
-
- try {
- ejbJarFile = (EJBJarFile)((EnterpriseArtifactEdit) edit).asArchive(false);
- ejbJar = ejbJarFile.getDeploymentDescriptor();
- } catch (OpenFailureException e1) {
- Logger.getLogger().log(e1);
- }
- }
- return ejbJar;
- }
-
-
-
- /**
- * Return a Boolean.TRUE if at least one of the EARs that contain this EJB module also contains
- * the named client JAR, and the IProject that is the EJB client is accessible. If the project
- * cannot be found, or is not accessible, return Boolean.FALSE. A null from this method means
- * that the helper does not support this symbolic model.
- */
- public Boolean loadClientJAR(String clientJARName) {
- //ToDO: fix this
-
-// EJBProjectResources res = getProjectResources();
-// EJBNatureRuntime nature = res.getEJBNature();
-// if (nature != null) {
-// IProject project = nature.getDefinedEJBClientJARProject();
-// if (project == null) {
-// EARNatureRuntime[] earNatures = nature.getReferencingEARProjects();
-// for (int i = 0; i < earNatures.length; i++) {
-// EARNatureRuntime earNature = earNatures[i];
-// IFile file = earNature.getFile(clientJARName);
-// if (file == null)
-// return Boolean.FALSE;
-// }
-// } else if (!project.isAccessible())
-// return Boolean.FALSE;
-// }
-// return Boolean.TRUE;
- return Boolean.TRUE;
- }
-
- /**
- * This method can be overriden by AWorkbenchHelpers, if they wish to perform some
- * initialization once the IProject is set. Default is to do nothing.
- *
- * For example, if this IWorkbenchContext delegates to another IWorkbenchContext, then that
- * IWorkbenchContext's setProject() method should be called here.
- */
- public void initialize() {
- super.initialize();
- // Always new up the project resources, because the project's model
- // needs to be reloaded every time the project is reset. (i.e., when
- // setProject(IProject) is called, this helper is working on a new
- // project, and its underlying model may have changed since the last
- // time this helper saw it.
- //
- // Since the setProject can be called multiple times by the
- // framework, always make sure that the currently loaded
- // projectResources is cleaned up before it's removed.
- // That is, if _projectResources is not null, then this
- // helper has been initialized with an IProject before. The
- // initialization occurs every time this IValidationContext is retrieved
- // from the ValidationRegistryReader.
- //
- // After this IValidationContext is retrieved, validation may or may not be
- // performed with it. For example, if the properties page is brought
- // up by the user, this helper will be retrieved in order to enable,
- // or disable, the EJB Validator. If validation has not run with this
- // helper, _projectResources may be initialized with the wrong
- // IProject.
- // If _projectResources has not been used for validation, it will have
- // loaded nothing, and the cost of cleaning is minimal. If validation
- // was run with this project, then _projectResources will be null,
- // because cleanup(WorkbenchReporter) is called after validation
- // completes.
-// if (_projectResources != null) {
-// cleanup(null);
-// }
-// _projectResources = new EJBProjectResources(getProject());
- // Now build the cache of IJavaProjects which depend on this IProject.
-// _javaProject = JavaCore.create(getProject());
-// _dependentJavaProjects = DependencyUtil.getDependentJavaProjects(_javaProject);
- }
-
-// protected EJBProjectResources getProjectResources() {
-// return _projectResources;
-// }
-
- // Can't assume that the JavaClass is in this project, so load its IType,
- // and retrieve the IJavaProject
- // from the IType, and then look in that projct.
- protected IFile getFile(JavaClass clazz) {
- // Not in the current project, so check the IType's project
- IType type = getType(clazz);
- if (type == null) {
- return null;
- }
- IResource resource = type.getResource();
- if (resource != null && resource.getType() == IResource.FILE && resource.isAccessible())
- return (IFile) resource;
- return null;
- }
-
- protected JavaHelpers getJavaClass(IType type) {
- try {
- ResourceSet resourceSet = getJEMResourceSet();
- if (resourceSet == null) {
- return null;
- }
- return ValidationRuleUtility.getType(type.getFullyQualifiedName(), resourceSet);
- } catch (InvalidInputException e) {
- // this exception has already been logged by ValidationRuleUtility
- return null;
- }
- }
-
- private IType getType(JavaClass clazz) {
- if (clazz == null) {
- return null;
- }
- IProject project = ProjectUtilities.getProject(clazz);
- IJavaProject javaProj = JemProjectUtilities.getJavaProject(project);
- return JDOMSearchHelper.findType(clazz.getJavaPackage().getName(), clazz.getName(), javaProj);
- }
-
-// private void addBeans(JavaClass clazz, Set tempSet) {
-//
-//
-// IVirtualComponent comp = ComponentCore.createComponent(getProject());
-// ArtifactEdit edit = ComponentUtilities.getArtifactEditForRead(comp);
-// try {
-// EJBJar ejbJar = ((EJBArtifactEdit) edit).getEJBJar();
-// if (ejbJar == null) {
-// return;
-// }
-// tempSet.addAll(ejbJar.getEnterpriseBeansWithReference(clazz));
-// }finally {
-// if (edit != null) {
-// edit.dispose();
-// }
-// }
-// }
-
- // Can't assume that the IType is in the same project as the parent class
- // (loadChildren).
- // So keep a cache of referenced IProjects. If a project is in this
- // project's
- // classpath,
- // then it is likely that more than one type is used from the other
- // project, so
- // it's worth
- // the overhead to keep a cache.
- protected ResourceSet getJEMResourceSet() {
- JavaEMFNature nature = JavaEMFNature.getRuntime(getProject());
- if (nature == null) {
- return null;
- }
- return nature.getResourceSet();
- }
-
- // To reduce object creation, create this hash set once. It's only used in
- // the
- // getSubTypes and loadBeans methods,
- // so this technique is safe.
- private Set getTempSet() {
- if (_tempSet == null) {
- _tempSet = new HashSet();
- } else {
- _tempSet.clear();
- }
- return _tempSet;
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.IWorkbenchContext#getPortableName(IResource)
- */
- public String getPortableName(IResource resource) {
- // Return the URI of the object.
- if (!(resource instanceof IFile)) {
- return super.getPortableName(resource);
- }
- IFile file = (IFile) resource;
- if ((resource.getFileExtension() != null) && (resource.getFileExtension().equals("java"))) { //$NON-NLS-1$
- JavaClass clazz = JemProjectUtilities.getJavaClass(file);
- if (clazz == null) {
- return super.getPortableName(resource);
- }
- return ArchiveUtil.classNameToJavaUri(clazz.getQualifiedName());
- } else if ((resource.getFileExtension() != null) && (resource.getFileExtension().equals("class"))) { //$NON-NLS-1$
- JavaClass clazz = JemProjectUtilities.getJavaClass(file);
- if (clazz == null) {
- return super.getPortableName(resource);
- }
- return ArchiveUtil.classNameToUri(clazz.getQualifiedName());
- } else if (resource.getName().equals("ejb-jar.xml")) //$NON-NLS-1$
- return J2EEConstants.EJBJAR_DD_URI;
- return null;
- }
-
- public void removeOldMessages(IReporter reporter, Map targets) {
- if (targets == null) {
- // Full validation. Remove messages from all prerequisite (e.g.
- // EJB
- // client JAR) projects.
- if (_requiredJavaProjects != null) {
- for (int i = 0; i < _requiredJavaProjects.length; i++) {
- IJavaProject jp = _requiredJavaProjects[i];
- WorkbenchReporter.removeAllMessages(jp.getProject(), EJBValidator.getValidator());
- }
- }
- } else if (targets.size() > 0) {
- Iterator iterator = targets.keySet().iterator();
- Set targetObjects = new HashSet();
- while (iterator.hasNext()) {
- Set ruleTargetObjects = (Set) targets.get(iterator.next());
- targetObjects.addAll(ruleTargetObjects);
- }
- iterator = targetObjects.iterator();
- while (iterator.hasNext()) {
- EJBValidator.TargetObject to = (EJBValidator.TargetObject) iterator.next();
- Object targetParent = to.getTargetParent();
- Object target = to.getTarget();
- String groupName = MessageUtility.getGroupName(targetParent);
- reporter.removeMessageSubset(EJBValidator.getValidator(), target, groupName);
- }
- }
- // else there's nothing to remove, so just return without doing
- // anything
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/EJBHelperConstants.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/EJBHelperConstants.java
deleted file mode 100644
index 7a34dbd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/EJBHelperConstants.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.workbench.validation;
-
-
-/**
- * This class declares the string constants which are used only in WSAD.
- *
- */
-public interface EJBHelperConstants {
- //
- // Location constants
- //
- // Used when a line number cannot be calculated, and thus the target of the message
- // has to be described in words.
- /* package */static final String LOC_CLASS = "LOC_CLASS"; //$NON-NLS-1$
- /* package */static final String LOC_FIELD = "LOC_FIELD"; //$NON-NLS-1$
- /* package */static final String LOC_METHOD = "LOC_METHOD"; //$NON-NLS-1$
- /* package */static final String LOC_BEAN = "LOC_BEAN"; //$NON-NLS-1$
- /* package */static final String LOC_ROLE = "LOC_ROLE"; //$NON-NLS-1$
- /* package */static final String LOC_ROLEREF = "LOC_ROLEREF"; //$NON-NLS-1$
- /* package */static final String LOC_METHODELEMENT = "LOC_METHODELEMENT"; //$NON-NLS-1$
- /* package */static final String LOC_METHODPERMISSION = "LOC_METHODPERMISSION"; //$NON-NLS-1$
- /* package */static final String LOC_METHODTRANSACTION = "LOC_METHODTRANSACTION"; //$NON-NLS-1$
- /* package */static final String LOC_EJBRELATION = "LOC_EJBRELATION"; //$NON-NLS-1$
- /* package */static final String LOC_EJBRELATIONSHIPROLE = "LOC_EJBRELATIONSHIPROLE"; //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/EjbValidatorSchedulingRule.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/EjbValidatorSchedulingRule.java
deleted file mode 100644
index ce09946..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/EjbValidatorSchedulingRule.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.workbench.validation;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-public class EjbValidatorSchedulingRule implements ISchedulingRule {
-
- private IPath path;
-
- public EjbValidatorSchedulingRule(IPath path){
- this.path = path;
- }
- public boolean contains(ISchedulingRule rule) {
-
- if( this == rule )
- return true;
-
- if( rule instanceof EjbValidatorSchedulingRule ){
- String otherPath = ((EjbValidatorSchedulingRule)rule).path.toString();
- return path.toString().equals( otherPath );
- }
- return false;
- }
-
- public boolean isConflicting(ISchedulingRule rule) {
- if (!(rule instanceof EjbValidatorSchedulingRule))
- return false;
- String otherPath = ((EjbValidatorSchedulingRule)rule).path.toString();
- return path.toString().equals( otherPath );
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/ResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/ResourceHandler.java
deleted file mode 100644
index d4d0d01..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/ResourceHandler.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.workbench.validation;
-
-import java.util.MissingResourceException;
-import java.util.logging.Level;
-
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
-import org.eclipse.jst.j2ee.model.internal.validation.IEJBValidatorConstants;
-import org.eclipse.jst.j2ee.model.internal.validation.J2EEValidationResourceHandler;
-
-/**
- * Insert the type's description here. Creation date: (1/22/01 4:13:13 PM)
- *
- * @author: Administrator
- */
-public final class ResourceHandler {
- public final static String VALIDATION_PROP_FILE_NAME = IEJBValidatorConstants.BUNDLE_NAME;
- private static ResourceHandler _handler = null;
- private static LogEntry logEntry;
- private static Logger logger;
-
- /**
- * ResourceHandler constructor comment.
- */
- private ResourceHandler() {
- super();
- }
-
- /**
- * @return
- */
- private static LogEntry getLogEntry() {
- if (logEntry == null) {
- logEntry = new LogEntry(IEJBValidatorConstants.BUNDLE_NAME);
- }
- logEntry.reset(); // reset the values so that we're not logging stale data
- return logEntry;
- }
-
- /**
- * @return
- */
- private static Logger getMsgLogger() {
- if (logger == null)
- logger = EjbPlugin.getPlugin().getMsgLogger();
- return logger;
- }
-
- public static String getExternalizedMessage(String key) {
- try {
- return J2EEValidationResourceHandler.getExternalizedMessage(VALIDATION_PROP_FILE_NAME, key, getHandler().getClass());
- } catch (NullPointerException exc) {
-
- if (getMsgLogger().isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = getLogEntry();
- entry.setSourceID("ResourceHandler.getExternalizedMessage(String)"); //$NON-NLS-1$
- entry.setText(key);
- entry.setTargetException(exc);
- getMsgLogger().write(Level.SEVERE, entry);
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- public static String getExternalizedMessage(String key, String[] parms) {
- String res = ""; //$NON-NLS-1$
- try {
- res = java.text.MessageFormat.format(getExternalizedMessage(key), parms);
- } catch (MissingResourceException exc) {
-
- if (getMsgLogger().isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = getLogEntry();
- entry.setSourceID("ResourceHandler.getExternalizedMessage(String, String[])"); //$NON-NLS-1$
- entry.setTargetException(exc);
- entry.setText(key);
- getMsgLogger().write(Level.SEVERE, entry);
- }
- } catch (NullPointerException exc) {
- if (getMsgLogger().isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = getLogEntry();
- entry.setSourceID("ResourceHandler.getExternalizedMessage(String, String[])"); //$NON-NLS-1$
- entry.setTargetException(exc);
- entry.setText(key);
- getMsgLogger().write(Level.SEVERE, entry);
- }
- }
- return res;
- }
-
- public static ResourceHandler getHandler() {
- if (_handler == null) {
- _handler = new ResourceHandler();
- }
- return _handler;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/UIEjbValidator.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/UIEjbValidator.java
deleted file mode 100644
index 8ef51aa..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/UIEjbValidator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.workbench.validation;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.EJBValidator;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-
-
-public class UIEjbValidator extends EJBValidator {
-
- /**
- * UIEjbValidator constructor comment.
- */
- public UIEjbValidator() {
- super();
- }
-
- public IStatus validateInJob(IValidationContext inHelper, IReporter inReporter) throws
- org.eclipse.wst.validation.internal.core.ValidationException {
-
-
- IProject proj = ((IWorkbenchContext) inHelper).getProject();
- if (J2EEProjectUtilities.isEJBProject(proj)) {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(proj);
- if(edit != null && edit.getDeploymentDescriptorResource() != null)
- return super.validateInJob(inHelper, inReporter);
- } finally {
- if (edit != null)
- edit.dispose();
- }
- }
- return IValidatorJob.OK_STATUS;
-
- }
-
- public ISchedulingRule getSchedulingRule(IValidationContext helper) {
-
- IProject project = ((IWorkbenchContext) helper).getProject();
- IVirtualComponent comp = ComponentCore.createComponent( project );
- IFile ejbJarFile = null;
- if( comp != null ){
- IVirtualFile vf = comp.getRootFolder().getFile(new Path(J2EEConstants.EJBJAR_DD_URI));
- if( vf!= null ){
- ejbJarFile = vf.getUnderlyingFile();
- }
- }
- return ejbJarFile;
- }
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/icons/EJBJar.gif b/plugins/org.eclipse.jst.j2ee.ejb/icons/EJBJar.gif
deleted file mode 100644
index f8b5c0a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/icons/EJBJar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/icons/full/obj16/11_ejbjar_deploy.gif b/plugins/org.eclipse.jst.j2ee.ejb/icons/full/obj16/11_ejbjar_deploy.gif
deleted file mode 100644
index e9ddc0d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/icons/full/obj16/11_ejbjar_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/icons/full/obj16/20_ejbjar_deploy.gif b/plugins/org.eclipse.jst.j2ee.ejb/icons/full/obj16/20_ejbjar_deploy.gif
deleted file mode 100644
index af02e41..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/icons/full/obj16/20_ejbjar_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/plugin.properties b/plugins/org.eclipse.jst.j2ee.ejb/plugin.properties
deleted file mode 100644
index 1b2ace5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/plugin.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# This string is the name of one of the validators.
-# The name is displayed in the validation properties page
-# and also in subtask messages (e.g. "Invoking Map Validator on <file name>")
-#
-#
-# Version 1.6
-#
-EJB_VALIDATOR=EJB Validator
-validation_UI_=Validation
-
-DEPLOY_TASK_UI_=EJB Deployment Message
-EJB_VALIDATION_PROBLEMMARKER_NAME=EJB Validator Message
-EJB_FACET_LABEL=EJB Module
-EJB_FACET_DESCRIPTION=Enables the project to be deployed as an EJB module.
-EJB_FACET_TEMPLATE=EJB Project
-
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = EJB component Plug-in
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml b/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
deleted file mode 100644
index f313fcc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-
- <extension
- id="EJBModuleExtension"
- name="EJBModuleExtension"
- point="org.eclipse.jst.j2ee.EARModuleExtension">
- <earModuleExtension
- extensionClass="org.eclipse.jst.j2ee.ejb.internal.plugin.EjbModuleExtensionImpl">
- </earModuleExtension>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.ejb.provider.EjbItemProviderAdapterFactory"
- packageURI="ejb.xmi"
- id="org.eclipse.jst.j2ee.ejb.provider.EjbItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
-<!-- ====================================================== -->
-<!-- EJB Validator Extension -->
-<!-- ====================================================== -->
- <extension
- id="EJBValidator"
- name="%EJB_VALIDATOR"
- point="org.eclipse.wst.validation.validator">
-
- <validator>
- <enablement>
- <and>
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.java"/>
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.ejb:2.1]"/>
- </and>
- </enablement>
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.j2ee.ejbDD">
- </contentTypeBinding>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.class">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.java">
- </filter>
- <helper
- class="org.eclipse.jst.j2ee.internal.ejb.workbench.validation.EJBHelper">
- </helper>
- <dependentValidator
- depValValue="true">
- </dependentValidator>
- <markerId
- markerIdValue="EJBValidatorMarker">
- </markerId>
- <run
- class="org.eclipse.jst.j2ee.internal.ejb.workbench.validation.UIEjbValidator">
- </run>
-
- </validator>
- </extension>
- <extension
- id="EJBValidatorMarker"
- name="%EJB_VALIDATION_PROBLEMMARKER_NAME"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.wst.validation.problemmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="owner">
- </attribute>
- <attribute
- name="validationSeverity">
- </attribute>
- <attribute
- name="targetObject">
- </attribute>
- <attribute
- name="groupName">
- </attribute>
- <attribute
- name="messageId">
- </attribute>
- </extension>
-
-
-
-
- <extension
- point="org.eclipse.wst.common.modulecore.artifactedit">
- <artifactedit
- typeID="jst.ejb"
- class="org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit">
- </artifactedit>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModel">
- <editModel
- editModelID="jst.ejb"
- factoryClass="org.eclipse.jst.common.jdt.internal.integration.JavaArtifactEditModelFactory">
- <editModelResource
- autoload="false"
- URI="META-INF/ejb-jar.xml"/>
- </editModel>
- </extension>
-
- <!--============================-->
- <!-- Builder Provider registrations-->
- <!--============================-->
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <ProviderDefinesType
- providerType="jst.ejb.builder"
- providerID="org.eclipse.jst.j2ee.internal.deployables.JavaComponentBuilderDataModelProvider"/>
- </extension>
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <DataModelProvider
- class="org.eclipse.jst.j2ee.ejb.internal.operations.NewSessionBeanClassDataModelProvider"
- id="org.eclipse.jst.j2ee.ejb.internal.operations.NewSessionBeanClassDataModelProvider">
- </DataModelProvider>
- </extension>
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <DataModelProvider
- class="org.eclipse.jst.j2ee.ejb.internal.operations.NewMessageDrivenBeanClassDataModelProvider"
- id="org.eclipse.jst.j2ee.ejb.internal.operations.NewMessageDrivenBeanClassDataModelProvider">
- </DataModelProvider>
- </extension>
-
-
- <!-- Project Facets -->
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="jst.ejb">
- <label>%EJB_FACET_LABEL</label>
- <description>%EJB_FACET_DESCRIPTION</description>
- <icon>icons/EJBJar.gif</icon>
- <default-version version="2.1"/>
- </project-facet>
-
- <project-facet-version facet="jst.ejb" version="1.1">
- <constraint>
- <and>
- <requires facet="jst.java" version="[1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.ejb" version="2.0">
- <constraint>
- <and>
- <requires facet="jst.java" version="[1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.ejb" version="2.1">
- <constraint>
- <and>
- <requires facet="jst.java" version="[1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.ejb" version="3.0">
- <constraint>
- <and>
- <requires facet="jst.java" version="[5.0"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <action facet="jst.ejb" version="[1.1-3.0]" type="INSTALL" id="jst.ejb.install">
- <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider"/>
- </action>
-
- <event-handler facet="jst.ejb" version="[1.1-3.0]" type="POST_INSTALL">
- <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetPostInstallDelegate"/>
- </event-handler>
-
- <event-handler facet="jst.ejb" version="[1.1-3.0]" type="RUNTIME_CHANGED">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </event-handler>
-
- <template id="template.jst.ejb">
- <label>%EJB_FACET_TEMPLATE</label>
- <fixed facet="jst.java"/>
- <fixed facet="jst.ejb"/>
- </template>
- </extension>
-
- <!--
- Operation extension that updates the ejb client reference in the ejb-jar.xml
- -->
- <extension
- point="org.eclipse.wst.common.frameworks.OperationExtension"
- id="org.eclipse.jst.j2ee.ejb.refactor.operations">
- <operationExtension
- id="org.eclipse.jst.j2ee.refactor.operations.UpdateDependentModuleonDeleteOp"
- postOperationClass="org.eclipse.jst.j2ee.internal.ejb.refactor.UpdateEJBClientRefOnDeleteOp"/>
- <operationExtension
- id="org.eclipse.jst.j2ee.refactor.operations.UpdateDependentModuleonRenameOp"
- postOperationClass="org.eclipse.jst.j2ee.internal.ejb.refactor.UpdateEJBClientRefOnRenameOp"/>
- </extension>
-
- <extension
- point="org.eclipse.jst.j2ee.J2EEModelProvider">
- <provider>
- <modelProvider factoryClass="org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit"/>
- <facet id="jst.ejb" versions="1.1,2.0,2.1"/>
- </provider>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.ejb/prepareforpii.xml
deleted file mode 100644
index 84b84cb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.ejb"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbarchiveops.properties b/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbarchiveops.properties
deleted file mode 100644
index 7b8e60f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbarchiveops.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#This properties file contains string for Archive operations of EARs,EJBs and Application Clients.
-
-ARCHIVE_OPERATION_SaveMofResources=Error occured saving the metadata file.
-ARCHIVE_OPERATION_SaveFile=Error occured saving the File..
-ARCHIVE_OPERATION_ProjectNature=Error getting project nature runtime..
-ARCHIVE_OPERATION_SaveManifest=Error occured saving the manifest..
-ARCHIVE_OPERATION_FileNotFound=Error: File not found
-ARCHIVE_OPERATION_FileContents=Core exception caught in gettting file contents..
-ARCHIVE_OPERATION_ErroOccured=Error occured...
-ARCHIVE_OPERATION_FilesFromProject=Unable to get files from the project..
-ARCHIVE_OPERATION_OpeningArchive=Error opening archive for export..
-ARCHIVE_OPERATION_InvalidEJBJar=The JAR file is not a valid EJB JAR
-ARCHIVE_OPERATION_InvalidImportEJBJar=The import file is not a valid EJB JAR
-ARCHIVE_OPERATION_ImportOperation=Import Operation Failed!
-EJB_IMPORT_OPERATION_STRING=Importing EJB JAR..
-EJB_IMPORT_FILE_STRING=Importing file..
-IMPORT_MOFRESOURCE_STRING=Importing meta-data..
-IMPORT_OPERATION_STRING=Importing JAR..
-ERROR_COPYING_FILES_FROM_ORIGINAL_JAR=An error occurred copying files from the original EJB JAR file
-ERROR_IMPORTING_MODULE_FILE=Error importing Module File
-Yes_UI=Yes
-No_UI=No
-Yes_To_All_UI=Yes to All
-Cancel_UI_=Cancel
-Error_exporting__UI_=Error exporting
-EJB_Jar_File_UI_=EJB JAR File
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbcodegen.properties b/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbcodegen.properties
deleted file mode 100644
index 8e53a5d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbcodegen.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-New_key_attribute_added_wi_ERROR_=IWAE0001E New key attribute added without attribute helper.
-IWAJ0129E_The_Java_type_na_ERROR_=IWAE0002E The Java type named {0} could not be set for the {1} because its EJB is null.
-IWAJ0128E_Cannot_reflect_J_ERROR_=IWAE0003E Cannot reflect JavaClass because its name is not set within the command: {0}.
-IWAJ0130I_Cannot_perform_t_ERROR_=IWAE0004E IWAJ0130I Cannot perform the command request because the EJB is null for the command:
-IWAJ0131I_Cannot_add_the_f_ERROR_=IWAE0005E IWAJ0131I Cannot add the feature to the key because the feature is null for the command:
-IWAJ0132I_Cannot_remove_th_ERROR_=IWAE0006E IWAJ0132I Cannot remove the feature from the key because the feature is null for the command:
-Can_not_get_to_a_valid_EJB_ERROR_=IWAE0007E Can not get to a valid EJB extension
-Empty_Attribute_name_ERROR_=IWAE0008E Empty Attribute name
---_Java_Generation____Init_UI_=-- Java Generation :: Initializing...
---_Java_Generation____Anal_UI_=-- Java Generation :: Analyzing...
---_Java_Generation____Gene_UI_=-- Java Generation :: Generating...
---_Java_Generation____Fini_UI_=-- Java Generation :: Finishing...
---_Updating_Metadata..._UI_=-- Updating Metadata...
-The_command_failed_to_exec_ERROR_=IWAE0009E The command failed to execute code generation for the following reason:
-Cancelled_ERROR_=IWAE0010E Cancelled
-Add-On_Command_UI_=Add-On Command
-The_command_failed_to_upda_ERROR_=IWAE0011E The command failed to update the meta-data for the following reason:
-The_command_failed_to_undo_ERROR_=IWAE0012E The command failed to undo the meta-data change for the following reason:
-Multiple_EnterpriseBean_Up_UI_=Multiple EnterpriseBean Updates
-Creating_bean_named___{0}__UI_=Creating bean named "{0}"
-Updating_bean_named___{0}__UI_=Updating bean named "{0}"
-Deleting_bean_named___{0}__UI_=Deleting bean named "{0}"
-The_key_shape_has_changed__UI_=The key shape has changed for the CMP Entity named {0} and there are relationship roles pointing to this entity, would you like to propagate these key changes?
-MofObject_UI_=MofObject
-Enumeration_UI_=Enumeration
-Double_UI_=Double
-Float_UI_=Float
-Long_UI_=Long
-Short_UI_=Short
-Boolean_UI_=Boolean
-Integer_UI_=Integer
-Character_UI_=Character
-Byte_UI_=Byte
-Role(__{0}__)_opposite_is__INFO_=IWAE0013I Role("{0}") opposite is empty
-Failed_to_convert_{0}_to_{_ERROR_=IWAE0014E Failed to convert {0} to {1}.
-Error_in_Client_View_Creation_1=Error in Client View Creation.
-Creating_source_folder__1=Creating source folder {0}
-Failed_to_create_the_EnterpriseBean=Failed to create the enterprise bean.\nSee the log for more details.
-Error_has_occurred_ERROR_=IWAE0002E Error has occurred
-DeleteEnterpriseBeanDataModel_UI_1=Delete Bean(s)
-EJBCodegenHandlerExtensionReader_ERROR_0=IWAE0015E "Extensions must be of the type \"{0}\".
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbcreation.properties b/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbcreation.properties
deleted file mode 100644
index cb81d13..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbcreation.properties
+++ /dev/null
@@ -1,149 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Error_occured_getting_ejb__ERROR_=IWAE0001E Error occurred getting ejb-jar.xml:
-Loading_examples_____UI_=Loading examples ...
-Traversing_file_system____UI_=Traversing file system...
-Importing_files____UI_=Importing files...
-Creating_EJB_Project____UI_=Creating EJB Project...
-Not_an_ejb_project_UI_=Not an EJB project.
-An_ejb_project_must_be_open_and_must_exist_for_properties_to_be_edited_UI_=An EJB project must be open and must exist for properties to be edited.
-CANCEL_UI_=CANCEL
-NO_UI_=NO
-YES_UI_=YES
-ALL_UI_=ALL
-None_UI_=None
-Enter_bean_name_UI_=Enter bean name.
-Message_invalid_bean_name_UI_=Invalid bean name.
-Bean_name_is_already_used_UI_=Bean name is already used.
-Bean_name_UI_=Bean name:
-Default_pack_not_be_null_UI_=The default package cannot be empty.
-The_project_does_not_conta_UI_=The project does not contain the class path for JDK (rt.jar or JRE library).
-Select_a_source_folder__UI_=Select a source folder.
-The_selected_source_folder_UI_=The selected source folder is not defined as a classpath source folder.
-The_selected_source_folder1_UI_=The selected source folder cannot be the output folder.
-Package_root_must_be_direc_UI_=Package root must be directly under Project folder.
-Bean_class_UI_=Bean class:
-Bean_superclass_UI_=Bean superclass:
-Message_Enter_bean_class_name_UI_=Enter bean class name.
-Bean_Class_Cannot_Be_In_UI_=Bean class cannot be in a default package.
-Class_implements=The class "{0}" must implement the "{1}" interface."
-Message_Enter_home_interface_name_UI_=Enter remote home interface name.
-Message_Home_Interface_UI_=Remote home interface:
-Message_Enter_remote_interface_name_UI_=Enter remote interface name.
-Message_Remote_Interface_UI_=Remote interface:
-Remote_interface_cannot_be_i_UI_=Remote interface cannot be in a default package.
-Home_interface_cannot_be_i_UI_=Remote home interface cannot be in a default package.
-Interface_extends="The interface "{0}" must extend the "{1}" interface."
-Local_Home_not_in_a_default_pkg_UI_=The local home interface cannot be in a default package.
-Enter_local_home_name_UI_=Enter local home interface name.
-Enter_local_int_name_UI_=Enter local interface name.
-Local_home_interface_UI_=Local home interface:
-Local_interface_UI_=Local interface:
-Local_not_in_a_default_pkg_UI_=The local interface cannot be in a default package.
-Enter_service_endpoint_name_UI_=Enter service endpoint interface name.
-Service_endpoint_interface_UI_=Service endpoint interface:
-Service_endpoint_not_in_a_default_pkg_UI_=The service endpoint interface cannot be in a default package.
-Atleast_one_client=At least one client interface view (local or remote) should be selected.
-Atleast_one_client_with_service=At least one client interface view (local, remote or service) should be selected.
-Name_collision_pattern=More than one class or interface has the same name "{0}".
-Creating_source_folder__1=Creating source folder {0}
-Select_valid_EJB_project=Select or create an EJB project.
-BEAN_SUPERCLASS_NOT_EXIST=The bean super class must exist.
-Super_EJB_has_no_local_interface=Super EJB does not have a Local Interface
-Super_EJB_has_no_remote_interface=Super EJB does not have a Remote Interface
-Key_class_UI_=Key class:
-Entity_enter_primary_key=Enter a key class name.
-Entyty_primary_key_not_default=Key class can not be in a default package.
-Entity_primary_key_duplicate=Duplicate name {0} between the key class and either the bean class or one of the interfaces.
-EJB_CLIENT_JAR_CREATION_ERROR_=IWAE0001E EJB client JAR Project Creation Error
-EJB_CLIENT_JAR_CREATION_MESSAGE_=Unable to complete the operation. Please check the log files for more info.
-CREATING_CLIENT_JAR_UI_=Creating the EJB client JAR project...
-FILES_OUT_OF_SYNC_UI_=The files in project {0} are not synchronized with the file system. Do you want to refresh the project?
-EJB_Client_JAR_name_exists_=EJB client JAR name already exists in referencing EAR
-EJB_JAR_already_has_client_Jar_=EJB JAR already has an EJB client JAR
-CLIENT_JAR_URI_NOT_RESOLVE_UI_=The specified relative URI will not resolve to a path in the EAR
-ClientJAR_8=Removing EJB client JAR...
-ClientJAR_9=The file {0} already exists in folder {1}. Overwrite?
-ClientJAR_10=Remove EJB Client JAR Project
-ClientJAR_11=Are you sure you want to combine the contents of the EJB client JAR project "{0}" with the EJB JAR project, replace all references, and delete the EJB client JAR project?
-ClientJAR_12=No EJB client JAR defined
-ClientJAR_13=An EJB client JAR project is not currently defined for the selected EJB project
-ClientJAR_14=Remove EJB Client JAR Error
-ClientJAR_15=An internal error occurred removing EJB client JAR. Check the log files for more info.
-remove_client_jar_binary=Cannot remove EJB client JAR because the EJB project is binary.
-CANNOT_RESOLVE_INTERFACE_UI_=Cannot resolve the selected message listener interface.
-_1=The EJB and EJB Client project names can not be the same.
-_2=The EAR and EJB Client project names can not be the same.
-Neither_Bean_A_nor_Bean_B_have_a_local_client_view_UI_=Neither Bean A nor Bean B have a local client view.
-Relationship_name_cannot_be_empty_UI_=Relationship name cannot be empty.
-Relationship_name_already_exist_198_UI_=Relationship name already exists.
-Role_name_for_Bean_A_cannot_be_empty_UI_=Role name for Bean A cannot be empty.
-Role_name_for_Bean_A_must_be_java_valid_field_UI_=Role name for Bean A must be a valid Java field name.
-Role_name_for_Bean_B_cannot_be_empty_UI_=Role name for Bean B cannot be empty.
-Role_name_for_Bean_B_must_be_java_valid_field_UI_=Role name for Bean B must be a valid Java field name.
-Multiplicity_for_Bean_A_cannot_be_empty_UI_=Multiplicity for Bean A cannot be empty.
-Multiplicity_for_Bean_B_cannot_be_empty_UI_=Multiplicity for Bean B cannot be empty.
-CMR_field_name_for_Bean_A_cannot_be_empty_UI_=CMR field name for Bean A cannot be empty.
-CMR_field_name_for_Bean_B_cannot_be_empty_UI_=CMR field name for Bean B cannot be empty.
-CMR_field_type_for_Bean_A_cannot_be_empty_UI_=CMR field type for Bean A cannot be empty.
-CMR_field_type_for_Bean_B_cannot_be_empty_UI_=CMR field type for Bean B cannot be empty.
-Relationship_must_be_navigable_atleast_in_one_direction_UI_=Relationship must be navigable in at least one direction.
-Role_name_cannot_be_the_same_UI_=Role name cannot be the same.
-Cannot_create_many_to_many_relationship_UI_=Cannot create a many-to-many relationship.
-is_not_an_unique_CMR_=is not an unique CMR.
-is_not_an_unique_role_name_=is not an unique Role Name.
-CMR_fields_must_be_unique_=CMR Fields must be unique.
-Bean_A_does_not_match_Bean_B_client_view_=Selected Beans do not have matching interfaces.
-Bean_A_CMR_field_name_is_not_valid_java_field_UI_=CMR field name for Bean A must be a valid Java field name.
-Bean_B_CMR_field_name_is_not_valid_java_field_UI_=CMR field name for Bean B must be a valid Java field name.
-Bean_empty_=Two beans must be selected to create a relationship.
-Selected_bean_a_must_be_a_cmp_=Bean A must be a CMP bean.
-Selected_bean_b_must_be_a_cmp_=Bean B must be a CMP bean.
-Selected_bean_a_must_be_2_x_cmp_=Bean A must be a 2.x CMP.
-Selected_bean_b_must_be_2_x_cmp_=Bean B must be a 2.x CMP.
-FIELD_CANNOT_BE_EMPTY=Field cannot be empty.
-AN_OPERATION_MUST_BE_SELECTED=An operation must be selected.
-CLIENT_VIEW_ERR_DELETE_SUPERCLASS=Cannot delete an interface with subtypes UI.
-CANNOT_REMOVE_BOTH_LOCAL_AND_REMOTE=Cannot remove both local and remote interface.
-SELECT_ONE_OR_MORE_VIEWS=Select one or more views to delete.
-ONLY_ONE_VIEW_CREATE=Only one view can be created at a time.
-ERR_CMP_FIELD_LIST_EMPTY=CMP field list cannot be empty.
-ERR_CMP_FIELD_LIST_KEY_FIELD_EMPTY=CMP Bean should have at least one key field attribute.
-ERR_PLEASE_SELECT_A_FOREIGN_KEY = Please select a foreign key.
-ERR_FOREIGN_KEY_SELECTED = In a one to one relationship you can only select one foreign key
-ServiceEndpoint_interface_cannot_be_UI_=ServiceEndpoint interface cannot be in a default package.
-NON_INTERFACE_NAME_CANNOT_BE_NULL_UI_=Non JMS listener type name cannot be null
-ONE_END_MUST_BE_NAV=One end must be navigable, please change navigablity.
-CANT_BE_BINARY_PROJECT_UI_=Cannot create new enterprise bean in a binary project.
-EJB_EXPORT_PROJECT_CONTAINS_CLEINT_WARNING=The selected EJB project has an EJB client project. Exporting via the EAR Export Wizard is suggested.
-remove_client_jar_client_binary=
-EJB_Client_JAR_Creation_Error_=EJB client JAR Creation Error
-Cannot_Be_Binary_Project_For_Client_=Cannot create a new EJB client JAR for a binary project.
-Cannot_Be_StandAlone_Project_For_Client_=Cannont create a new EJB client JAR for a stand-alone project.
-TRANSACTION_TYPE_CONTAINER=Container
-TRANSACTION_TYPE_BEAN=Bean
-STATE_TYPE_STATELESS=Stateless
-STATE_TYPE_STATEFUL=Stateful
-DESTINATION_TYPE_QUEUE=Queue
-DESTINATION_TYPE_TOPIC=Topic
-
-ERR_NO_MESSAGE_LISTENER_INTERFACE=You must specify a message listener interface.
-ERR_COULD_NOT_RESOLVE_INTERFACE=Could not resolve interface. {0}
-ERR_LOCAL_HOME_MISSING_CREATE_METHOD=The specified Local Home interface has not valid create() method.
-ERR_REMOTE_HOME_MISSING_CREATE_METHOD=The specified Remote Home interface has not valid create() method.
-ERR_LOCAL_HOME_CREATE_METHOD_RETURN_TYPE_INVALID=The create() method of the specified Local Home interface must return the Local Component interface.
-ERR_REMOTE_HOME_CREATE_METHOD_RETURN_TYPE_INVALID=The create() method of the specified Remote Home interface must return the Remote Component interface.
-ERR_LOCAL_COMPONENT_NOT_INTERFACE=The specified Local Component interface is not valid.
-ERR_LOCAL_HOME_NOT_INTERFACE=The specified Local Home interface is not valid.
-ERR_REMOTE_COMPONENT_NOT_INTERFACE=The specified Remote Component interface is not valid.
-ERR_REMOTE_HOME_NOT_INTERFACE=The specified Remote Home interface is not valid.
-ERR_BEAN_ALREADY_EXISTS=Enterprise bean with the same Ejb Name already exists.
-WRN_BEAN_NAME_IS_EMPTY=Bean name is empty, the containter will use the name of the bean class.
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbproviderlibraries.properties b/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbproviderlibraries.properties
deleted file mode 100644
index 4ccc839..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbproviderlibraries.properties
+++ /dev/null
@@ -1,392 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-_UI_EJBJar_description_feature=Description
-_UI_EJBJar_description_feature_desc=
-_UI_EJBJar_displayName_feature=Display name
-_UI_EJBJar_displayName_feature_desc=
-_UI_EJBJar_smallIcon_feature=Small icon
-_UI_EJBJar_smallIcon_feature_desc=
-_UI_EJBJar_largeIcon_feature=Large icon
-_UI_EJBJar_largeIcon_feature_desc=
-_UI_EJBJar_ejbClientJar_feature=Client jar
-_UI_EJBJar_ejbClientJar_feature_desc=
-_UI_EJBJar_version_feature=Version
-_UI_EJBJar_version_feature_desc=
-_UI_ContainerManagedEntity_abstractSchemaName_feature=Abstract Schema Name
-_UI_ContainerManagedEntity_abstractSchemaName_feature_desc=
-_UI_ContainerManagedEntity_keyAttributes_feature=Key attributes
-_UI_ContainerManagedEntity_keyAttributes_feature_desc=
-_UI_ContainerManagedEntity_CMPAttribute_feature=CMP attributes
-_UI_ContainerManagedEntity_CMPAttribute_feature_desc=
-_UI_ContainerManagedEntity_primKeyField_feature=Primary key field
-_UI_ContainerManagedEntity_primKeyField_feature_desc=
-_UI_EnterpriseBean_name_feature=Name
-_UI_EnterpriseBean_name_feature_desc=The name feature.
-_UI_ActivationConfig_type=Activation config
-_UI_ActivationConfigProperty_type=Activation config property
-
-
-
-An_error_has_occurred_crea_ERROR_=IWAE0001E An error has occurred creating a new relationship.
-Create_a_new_child_for_the_UI_=Create a new child for the selected
-Create_Child_UI_=Create Child
-EjbJar_UI_=EjbJar
-The_ejbJar_property_UI_=The ejbJar property
-DefaultDatasource_UI_=DefaultDatasource
-The_defaultDatasource_prop_UI_=The defaultDatasource property
-Create_a_child_of_type_Ent_UI_=Create a child of type EnterpriseBeanBinding for the selected
-Create_EnterpriseBeanBindi_UI_=Create EnterpriseBeanBinding
-EJBJarBinding_UI_=EJBJarBinding
-JndiName_UI_=JndiName
-The_jndiName_property_UI_=The jndiName property
-ModuleBinding_UI_=ModuleBinding
-The_moduleBinding_property_UI_=The moduleBinding property
-EnterpriseBean_UI_=EnterpriseBean
-The_enterpriseBean_propert_UI_=The enterpriseBean property
-Datasource_UI_=Datasource
-The_datasource_property_UI_=The datasource property
-Create_a_child_of_type_#CH_UI_=Create a child of type #CHILD_CLASS_NAME# for the selected
-Create_#CHILD_CLASS_NAME#_UI_=Create #CHILD_CLASS_NAME#
-EnterpriseBeanBinding__UI_=EnterpriseBeanBinding
-Error_has_occurred_ERROR_=IWAE0002E Error has occurred
-Create_a_child_of_type_Met_UI_=Create a child of type MethodPermission for the selected
-Create_MethodPermission_UI_=Create MethodPermission
-AssemblyDescriptor_UI_=AssemblyDescriptor
-Value_UI_=Value
-The_value_property_UI_=The value property
-IsTransient_UI_=IsTransient
-The_isTransient_property_UI_=The isTransient property
-IsVolatile_UI_=IsVolatile
-The_isVolatile_property_UI_=The isVolatile property
-IsChangeable_UI_=IsChangeable
-The_isChangeable_property_UI_=The isChangeable property
-Name_UI_=Name
-The_name_property_UI_=The name property
-ETypeClassifier_UI_=ETypeClassifier
-The_eTypeClassifier_proper_UI_=The eTypeClassifier property
-Create_a_child_of_type_Con_UI_=Create a child of type ContainerManagedEntity for the selected
-Create_ContainerManagedEnt_UI_=Create ContainerManagedEntity
-Description_UI_=Description
-The_description_property_UI_=The description property
-DisplayName_UI_=DisplayName
-The_displayName_property_UI_=The displayName property
-SmallIcon_UI_=SmallIcon
-The_smallIcon_property_UI_=The smallIcon property
-LargeIcon_UI_=LargeIcon
-The_largeIcon_property_UI_=The largeIcon property
-EjbClientJar_UI_=EjbClientJar
-The_ejbClientJar_property_UI_=The ejbClientJar property
-The_assemblyDescriptor_pro_UI_=The assemblyDescriptor property
-EJBJar_UI_=EJBJar
-EJBMethodCategory_UI_=EJBMethodCategory
-EjbClass_UI_=EjbClass
-The_ejbClass_property_UI_=The ejbClass property
-HomeInterface_UI_=HomeInterface
-The_homeInterface_property_UI_=The homeInterface property
-RemoteInterface_UI_=RemoteInterface
-The_remoteInterface_proper_UI_=The remoteInterface property
-IsReentrant_UI_=IsReentrant
-The_isReentrant_property_UI_=The isReentrant property
-PrimaryKey_UI_=PrimaryKey
-The_primaryKey_property_UI_=The primaryKey property
-TransactionType_UI_=TransactionType
-The_transactionType_proper_UI_=The transactionType property
-SessionType_UI_=SessionType
-The_sessionType_property_UI_=The sessionType property
-Parms_UI_=Parms
-The_parms_property_UI_=The parms property
-Type_UI_=Type
-The_type_property_UI_=The type property
-MethodPermission_UI_=MethodPermission
-The_methodPermission_prope_UI_=The methodPermission property
-MethodTransaction_UI_=MethodTransaction
-The_methodTransaction_prop_UI_=The methodTransaction property
-Create_a_child_of_type_Met1_UI_=Create a child of type MethodElement for the selected
-Create_MethodElement_UI_=Create MethodElement
-TransactionAttribute_UI_=TransactionAttribute
-The_transactionAttribute_p_UI_=The transactionAttribute property
-MethodTransaction__UI_=MethodTransaction
-MethodPermission__UI_=MethodPermission
-IntentType_UI_=IntentType
-The_intentType_property_UI_=The intentType property
-AccessIntent__UI_=AccessIntent
-ActivateAt_UI_=ActivateAt
-The_activateAt_property_UI_=The activateAt property
-LoadAt_UI_=LoadAt
-The_loadAt_property_UI_=The loadAt property
-PinnedFor_UI_=PinnedFor
-The_pinnedFor_property_UI_=The pinnedFor property
-BeanCache__UI_=BeanCache
-InvocationLocale_UI_=InvocationLocale
-The_invocationLocale_prope_UI_=The invocationLocale property
-BeanInternationalization__UI_=BeanInternationalization
-InheritenceRoot_UI_=InheritenceRoot
-The_inheritenceRoot_proper_UI_=The inheritenceRoot property
-BeanStructure__UI_=BeanStructure
-SessionAttribute_UI_=SessionAttribute
-The_sessionAttribute_prope_UI_=The sessionAttribute property
-ContainerActivitySession__UI_=ContainerActivitySession
-EjbJarExtension_UI_=EjbJarExtension
-The_ejbJarExtension_proper_UI_=The ejbJarExtension property
-Subtype_UI_=Subtype
-The_subtype_property_UI_=The subtype property
-Supertype_UI_=Supertype
-The_supertype_property_UI_=The supertype property
-EjbGeneralization_UI_=EjbGeneralization
-Create_a_child_of_type_Ejb_UI_=Create a child of type EjbGeneralization for the selected
-Create_EjbGeneralization_UI_=Create EjbGeneralization
-EJBJarExtension_UI_=EJBJarExtension
-EjbRelationship__UI_=EjbRelationship
-Multiplicity_UI_=Multiplicity
-The_multiplicity_property_UI_=The multiplicity property
-SourceEjbName_UI_=SourceEjbName
-The_sourceEjbName_property_UI_=The sourceEjbName property
-Forward_UI_=Forward
-The_forward_property_UI_=The forward property
-Navigable_UI_=Navigable
-The_navigable_property_UI_=The navigable property
-Relationship_UI_=Relationship
-The_relationship_property_UI_=The relationship property
-BeanExtension_UI_=BeanExtension
-The_beanExtension_property_UI_=The beanExtension property
-Structure_UI_=Structure
-The_structure_property_UI_=The structure property
-BeanCache_UI_=BeanCache
-The_beanCache_property_UI_=The beanCache property
-Internationalization_UI_=Internationalization
-The_internationalization_p_UI_=The internationalization property
-LocalTran_UI_=LocalTran
-The_localTran_property_UI_=The localTran property
-Create_a_child_of_type_Sec_UI_=Create a child of type SecurityIdentity for the selected
-Create_SecurityIdentity_UI_=Create SecurityIdentity
-EnterpriseBeanExtension__UI_=EnterpriseBeanExtension
-EntityExtension__UI_=EntityExtension
-PersistenceSecurityIdentit_UI_=PersistenceSecurityIdentity
-The_persistenceSecurityIde_UI_=The persistenceSecurityIdentity property
-Create_a_child_of_type_Ejb1_UI_=Create a child of type EjbRelationshipRole for the selected
-Create_EjbRelationshipRole_UI_=Create EjbRelationshipRole
-ContainerManagedEntityExte1_UI_=ContainerManagedEntityExtension
-Timeout_UI_=Timeout
-The_timeout_property_UI_=The timeout property
-SessionExtension__UI_=SessionExtension
-FinderDescriptor_UI_=FinderDescriptor
-EjbqlQueryString_UI_=EjbqlQueryString
-The_ejbqlQueryString_prope_UI_=The ejbqlQueryString property
-EjbqlFinderDescriptor__UI_=EjbqlFinderDescriptor
-SelectStatement_UI_=SelectStatement
-The_selectStatement_proper_UI_=The selectStatement property
-FullSelectFinderDescriptor1_UI_=FullSelectFinderDescriptor
-UserFinderDescriptor_UI_=UserFinderDescriptor
-WhereClause_UI_=WhereClause
-The_whereClause_property_UI_=The whereClause property
-WhereClauseFinderDescripto1_UI_=WhereClauseFinderDescriptor
-RoleName_UI_=RoleName
-The_roleName_property_UI_=The roleName property
-Identity__UI_=Identity
-IsolationLevel_UI_=IsolationLevel
-The_isolationLevel_propert_UI_=The isolationLevel property
-IsolationLevelAttributes__UI_=IsolationLevelAttributes
-Boundary_UI_=Boundary
-The_boundary_property_UI_=The boundary property
-Resolver_UI_=Resolver
-The_resolver_property_UI_=The resolver property
-UnresolvedAction_UI_=UnresolvedAction
-The_unresolvedAction_prope_UI_=The unresolvedAction property
-LocalTran__UI_=LocalTran
-RunAsMode_UI_=RunAsMode
-The_runAsMode_property_UI_=The runAsMode property
-PersistenceSecurityIdentit1_UI_=PersistenceSecurityIdentity
-RunAsSpecifiedIdentity_UI_=RunAsSpecifiedIdentity
-The_runAsSpecifiedIdentity_UI_=The runAsSpecifiedIdentity property
-UseCallerIdentity_UI_=UseCallerIdentity
-UseSystemIdentity_UI_=UseSystemIdentity
-SecurityIdentity__UI_=SecurityIdentity
-Related_Role_UI_=Related Role
-The_opposite_role_in_the_r_UI_=The opposite role in the relationship of this role.
-Direction_UI_=Direction
-The_direction_of_the_role._UI_=The direction of the role.
-forward_UI_=forward
-reverse_UI_=reverse
-Resource_Path_UI_=Resource Path
-The_resource_containing_th_UI_=The resource containing the EJB JAR model.
-No_Resource_UI_=No Resource
-Failed_To_Delete_EJB_UI_=Failed to delete {0} Enterprise Bean.
-Unchecked_UI_=<Unchecked>
-Role_2=Role
-The_role_of_the_cmr_field_3=The role of the cmr field
-Collection_Type_4=Collection Type
-The_collection_type_of_the_cmr_field_5=The collection type of the cmr field
-CMRField__6=CMRField
-CreateEJBRelationshipRole_1=CreateEJBRelationshipRole
-Create_EJBRelationshipRole_2=Create EJBRelationshipRole
-Create_a_child_of_type_EJBRelationshipRole_for_the_selected__3=Create a child of type EJBRelationshipRole for the selected
-_4=
-Description_6=Description
-The_description_property_of_the_ejb_relation_7=The description property of the EJB relation
-Name_8=Name
-The_name_property_of_the_ejb_relation_9=The name property of the EJB relation
-Relationship_List_10=Relationship List
-The_relationship_list_of_the_ejb_relation_11=The relationship list of the EJB relation
-EJBRelation__12=EJBRelation
-Description_5=Description
-The_description_property_of_the_ejb_relationship_role_6=The description property of the EJB relationship role
-Name_7=Name
-The_roleName_property_of_the_ejb_relationship_role_8=The roleName property of the EJB relationship role
-Multiplicity_9=Multiplicity
-The_multiplicity_property_of_the_ejb_relationship_role_10=The multiplicity property of the EJB relationship role
-Cascade_Delete_11=Cascade Delete
-The_cascade_delete_property_of_the_ejb_relationship_role_12=The cascade delete property of the EJB relationship role
-Cmr_Field_13=Cmr Field
-The_cmr_field_of_the_ejb_relationship_role_14=The cmr field of the EJB relationship role
-Relationship_15=Relationship
-The_relationship_of_the_ejb_relationship_role_16=The relationship of the EJB relationship role
-Source_17=Source
-The_source_of_the_ejb_relationship_role_18=The source of the EJB relationship role
-CreateMethodElement_1=CreateMethodElement
-Create_MethodElement_2=Create MethodElement
-Create_a_child_of_type_MethodElement_for_the_selected__3=Create a child of type MethodElement for the selected
-The_description_property_of_the_exclude_list_7=The description property of the exclude list
-ExcludeList__8=Excludes List
-Type_2=Type
-The_type_property_of_the_message_driven_destination_3=The type property of the message-driven destination
-Subscription_Durability_4=Subscription Durability
-The_subscription_durability_property_of_the_message_driven_destination_5=The subscription durability property of the message-driven destination
-Bean_6=Bean
-The_bean_of_the_message_driven_destination_7=The bean of the message-driven destination
-MessageDrivenDestination__8=MessageDrivenDestination
-Create_CMPAttribute_2=Create CMPAttribute
-Create_a_child_of_type_CMPAttribute_for_the_selected__3=Create a child of type CMPAttribute for the selected
-Transaction_Type_6=Transaction Type
-The_transaction_type_property_of_the_message_driven_7=The transaction type property of the message-driven
-Message_Selector_8=Message Selector
-The_message_selector_property_of_the_message_driven_9=The message selector property of the message-driven
-Acknowledge_Mode_10=Acknowledge Mode
-The_acknowledge_mode_property_of_the_message_driven_11=The acknowledge mode property of the message-driven
-Destination_12=Destination
-The_destination_of_the_message_driven_13=The destination of the message-driven
-MessageDriven__14=MessageDriven
-The_description_property_of_the_query_7=The description property of the query
-Ejb_QL_8=Ejb QL
-The_ejb_ql_property_of_the_query_9=The EJB ql property of the query
-Return_Type_Mapping_10=Return Type Mapping
-The_return_type_mapping_property_of_the_query_11=The return type mapping property of the query
-Entity_12=Entity
-The_entity_of_the_query_13=The entity of the query
-Query_Method_14=Query Method
-The_query_method_of_the_query_15=The query method of the query
-Query__16=Query
-Query_2=Query
-The_query_of_the_query_method_3=The query of the query method
-QueryMethod__4=QueryMethod
-Create_EJBRelation_2=Create EJBRelation
-Create_a_child_of_type_EJBRelation_for_the_selected__3=Create a child of type EJBRelation for the selected
-The_description_property_of_the_relationships_7=The description property of the relationships
-Ejb_Jar_8=EJB JAR
-The_ejb_jar_of_the_relationships_9=The EJB JAR of the relationships
-Relationships__10=Relationships
-Description_2=Description
-The_description_property_of_the_role_source_3=The description property of the role source
-Role_4=Role
-The_role_of_the_role_source_5=The role of the role source
-Entity_Bean_6=Entity Bean
-The_entity_bean_of_the_role_source_7=The entity bean of the role source
-RoleSource__8=RoleSource
-EModelElement_2=EModelElement
-Name_2=Name
-The_name_property_of_the_e_namespace_3=The name property of the e namespace
-ENamespace__4=ENamespace
-Create_EDataType_2=Create EDataType
-Create_a_child_of_type_EDataType_for_the_selected__3=Create a child of type EDataType for the selected
-Is_Transient_6=Is Transient
-The_is_transient_property_of_the_e_structural_feature_7=The is transient property of the e structural feature
-Is_Volatile_8=Is Volatile
-The_is_volatile_property_of_the_e_structural_feature_9=The is volatile property of the e structural feature
-Is_Changeable_10=Is Changeable
-The_is_changeable_property_of_the_e_structural_feature_11=The is changeable property of the e structural feature
-E_Default_Value_12=E Default Value
-The_e_default_value_property_of_the_e_structural_feature_13=The e default value property of the e structural feature
-Is_Unique_14=Is Unique
-The_is_unique_property_of_the_e_structural_feature_15=The is unique property of the e structural feature
-E_Multiplicity_16=E Multiplicity
-The_e_multiplicity_of_the_e_structural_feature_17=The e multiplicity of the e structural feature
-E_Type_Classifier_18=E Type Classifier
-EStructuralFeature__20=EStructuralFeature
-Create_Child_2=Create Child
-Create_a_new_child_for_the_selected__3=Create a new child for the selected
-Many_1=Many
-Many_2=Many
-Description_7=Description
-The_description_property_of_the_query_8=The description property of the query
-Ejb_QL_9=Ejb QL
-The_ejb_ql_property_of_the_query_10=The EJB ql property of the query
-Return_Type_Mapping_11=Return Type Mapping
-The_return_type_mapping_property_of_the_query_12=The return type mapping property of the query
-Entity_13=Entity
-The_entity_of_the_query_14=The entity of the query
-Query_Method_15=Query Method
-The_query_method_of_the_query_16=The query method of the query
-Query__17=Query
-QueryMethod__2=QueryMethod
-Concurrency_Control_UI_=Concurrency Control
-The_concurrency_control_property_of_the_container_managed_entity_extension_UI_=The concurrency control property of the container-managed entity extension
-Persistence_Security_Identity_UI_=Persistence Security Identity
-The_persistence_security_identity_of_the_container_managed_entity_extension_UI_=The persistence security identity of the container-managed entity extension
-Data_Cache_UI_=Data Cache
-The_data_cache_of_the_container_managed_entity_extension_UI_=The data cache of the container-managed entity extension
-Failed_deleting_access_beans_UI_=Failed deleting access beans.
-TransactionScope_UI_=TransactionScope
-Finder_Duration_UI_=Finder Duration
-The_finder_duration_property_of_the_timeout_scope_UI_=The finder duration property of the timeout scope
-TimeoutScope__UI_=TimeoutScope
-SessionScope_UI_=SessionScope
-Timeout1_UI_=Timeout
-The_timeout_property_of_the_session_extension_UI_=The timeout property of the session extension
-Activity_Session_Type_UI_=Activity Session Type
-The_activity_session_type_property_of_the_session_extension_UI_=The activity session type property of the session extension
-Read_Ahead_Hint_UI_=Read Ahead Hint
-The_read_ahead_hint_property_of_the_read_ahead_hint_UI_=The read ahead hint property of the read ahead hint
-ReadAheadHint__UI_=ReadAheadHint
-Hint_UI_=Hint
-The_hint_of_the_pessimistic_update_UI_=The hint of the pessimistic update
-PessimisticUpdate_UI_=PessimisticUpdate
-No_Collision_UI_=No Collision
-The_no_collision_property_of_the_pessimistic_update_hint_UI_=The no collision property of the pessimistic update hint
-Exclusive_UI_=Exclusive
-The_exclusive_property_of_the_pessimistic_update_hint_UI_=The exclusive property of the pessimistic update hint
-Greedy_UI_=Greedy
-The_greedy_property_of_the_pessimistic_update_hint_UI_=The greedy property of the pessimistic update hint
-Promote_UI_=Promote
-The_promote_property_of_the_pessimistic_update_hint_UI_=The promote property of the pessimistic update hint
-PessimisticUpdateHint_UI_=PessimisticUpdateHint
-PessimisticRead_UI_=PessimisticRead
-OptimisticUpdate_UI_=OptimisticUpdate
-OptimisticRead_UI_=OptimisticRead
-Ejb_Jar_UI_=EJB JAR
-The_ejb_jar_of_the_ejb_jar_extension_UI_=The EJB JAR of the EJB JAR extension
-EJBJarExtension1_UI_=EJBJarExtension
-Lifetime_In_Cache_UI_=Lifetime In Cache
-The_lifetime_in_cache_property_of_the_data_cache_UI_=The lifetime in cache property of the data cache
-Lifetime_In_Cache_Usage_UI_=Lifetime In Cache Usage
-The_lifetime_in_cache_usage_property_of_the_data_cache_UI_=The lifetime in cache usage property of the data cache
-DataCache__UI_=DataCache
-CollectionScope_UI_=CollectionScope
-Collection_Increment_UI_=Collection Increment
-The_collection_increment_property_of_the_collection_increment_UI_=The collection increment property of the collection increment
-CollectionIncrement__UI_=CollectionIncrement
-Access_Pattern_UI_=Access Pattern
-The_access_pattern_property_of_the_collection_access_pattern_UI_=The access pattern property of the collection access pattern
-CollectionAccessPattern__UI_=CollectionAccessPattern
-AccessType_UI_=AccessType
-AccessIntentEntry_UI_=AccessIntentEntry
-AppliedAccessIntent_UI_=AppliedAccessIntent
-MessageDrivenExtension_UI_=MessageDrivenExtension
-Unknown_Role_Type_UI_=<Unknown Type>
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbvalidator.properties b/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbvalidator.properties
deleted file mode 100644
index e158214..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbvalidator.properties
+++ /dev/null
@@ -1,1531 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# *************************************************************************
-# * Code oriented instructions:
-# *
-# * In the string, you may see the following special sequences:
-# * a) {n} where n is a number. These are replaceable parameters.
-# * b) '' In .properties files, in order to see one apostrophe (') in the final
-# * string, sometimes two apostrophes must be entered in the string. In the translated
-# * string, if there is at least one {n} in the string, then to show one apostrophe
-# * to the user, put two apostrophes in the string. If there are no {n} in the string,
-# * then put one apostrophe.
-# * For example, say that you want the user to read "George's file".
-# * GEORGE=George's file was on the desk.
-# * GEORGE2=George''s file and {0} were on the desk.
-# * GEORGE uses one apostrophe because there are no {n} and GEORGE2
-# * uses two apostrophes because there is a {n}.
-# * c) '' text '' where text can be any word(s). The text between the double
-# * apostrophes should not be translated.
-# * d) <text> where text can be any word(s). The text between the angle
-# * brackets should NOT be translated.
-# * e) "text" where text can be any word(s). The text between the quotation
-# * marks should NOT be translated.
-# *
-# *************************************************************************
-# * Other instructions
-# * a) Do not translate any text that is on a line which begins with a comment
-# * symbol (#).
-# * b) Do not translate these words:
-# * schema, EJB, RDB, JAR, RMI, BMP, CMP, OOSQL
-# * c) Please return the .properties files using the same directory structure.
-# * This is necessary because two of the files have the same name.
-# *
-# *************************************************************************
-# Any other comments to the translators are on lines which start like this: # 2TC:
-#
-# Version 1.42
-#
-
-#
-# Begin EJB Validator strings.
-#
-# The purpose of
-# IDs:
-# STATUS=Status message
-# LOC=Text description of a location (identifies the source of the problem when no line number is available)
-# CHKJ=EJB validation message
-#
-
-#
-# Start of status messages
-#
-STATUS_VALIDATING=Validating {0}.
-
-LOC_CLASS=Class: {0}
-LOC_FIELD=Field: {0}, Class: {1}
-LOC_METHOD=Method: {0}, Class: {1}
-LOC_BEAN=Enterprise bean: {0}
-LOC_ROLE=<localRelationshipRoles>: {0}, Enterprise bean: {1}
-LOC_ROLEREF=<security-role-ref>: {0}
-LOC_METHODELEMENT=<method> element: {0}
-LOC_METHODPERMISSION=<method-permission> element: {0}
-LOC_METHODTRANSACTION=<container-transaction> element: {0}
-LOC_EJBRELATION=<ejb-relation>: {0}
-LOC_EJBRELATIONSHIPROLE=<ejb-relationship-role>: {0}, <ejb-relation>: {1}
-#
-# end of status messages
-#
-
-#
-# Start of validation messages
-#
-# All unique error ids follow this format:
-#
-# CHKJnnnn[s]
-#
-# where
-# - CHKJ is the four character unique component prefix
-# - nnnn is the numerical id, unique within EJB Validator
-# - [s] is the severity indicator: E (error), W (warning), or I (information).
-#
-# nnnn ranges from 2000 - 2999
-# 2000 - 2099 Messages on a class
-# 2100 - 2199 Messages which are specific to Websphere or WSA (i.e., not mentioned in EJB specification, such as associations & finders)
-# 2200 - 2399 Messages on a field
-# 2400 - 2799 Messages on a method
-# 2800 - 2899 Messages on the deployment descriptor
-# 2900 - 2999 Miscellaneous
-#
-
-#
-# Messages common across EJB specifications
-#
-CHKJ2900=CHKJ2900I: Internal error when running EJB validator. Read the log for details.
-CHKJ2852=CHKJ2852W: Internal error while validating {0}. The bean being validated was {1}.
-CHKJ2433=CHKJ2433W: Cannot validate {0} because {1} cannot be reflected. Check the classpath.
-CHKJ2907=CHKJ2907E: Type {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2905=CHKJ2905W: The EJB Validator did not run because ejb-jar.xml could not be loaded or found. Run the XML validator for more information.
-CHKJ2041=CHKJ2041I: Permanent classes and interfaces should be in a named package. (JLS 2.0: 7.4.2).
-
-CHKJ2456.i=CHKJ2456W: {0} should throw {1} for {2} or there may be compile errors in the deployment code.
-CHKJ2456.m=CHKJ2456W: This method should throw {0} for {1} or there may be compile errors in the deployment code.
-
-#
-# end of common messages
-#
-
-#
-# Messages for the EJB 1.1 specification
-#
-CHKJ2001.eb.ejb11=CHKJ2001W: The {0} key class must implement the {1} method. (EJB 1.1: 9.2.9)
-CHKJ2002.eb.i.ejb11=CHKJ2002W: This class should implement a matching ejbPostCreate method for {0}. (EJB 1.1: 9.2.4)
-CHKJ2002.eb.m.ejb11=CHKJ2002W: This class should implement a matching ejbPostCreate method for this method. (EJB 1.1: 9.2.4)
-CHKJ2003E.ejb11=CHKJ2003E: This class must not implement javax.ejb.SessionSynchronization. (EJB 1.1: 6.5.3).
-CHKJ2003I.ejb11=CHKJ2003I: Bean-managed transaction stateful session beans do not need to implement javax.ejb.SessionSynchronization. (EJB 1.1: 6.5.3).
-CHKJ2004.eb.i.ejb11=CHKJ2004W: The {1} bean class should not implement the {0} ejbFind method. (EJB 1.1: 9.4.6)
-CHKJ2004.eb.m.ejb11=CHKJ2004W: The {0} bean class should not implement an ejbFind method. (EJB 1.1: 9.4.6)
-CHKJ2005.eh.i.ejb11=CHKJ2005E: {0} must be either a create method or a find method. (EJB 1.1: 9.2.8)
-CHKJ2005.eh.m.ejb11=CHKJ2005E: The method must be either a create method or a find method. (EJB 1.1: 9.2.8)
-CHKJ2006.sb.ejb11=CHKJ2006E: The {0} bean class must have a public constructor that takes no arguments. (EJB 1.1: 6.10.2)
-CHKJ2006.eb.ejb11=CHKJ2006E: The {0} bean class must have a public constructor that takes no arguments. (EJB 1.1: 9.2.2)
-CHKJ2007.sb.ejb11=CHKJ2007W: {0} should not declare the finalize() method. (EJB 1.1: 6.10.2)
-CHKJ2007.eb.ejb11=CHKJ2007W: {0} should not declare the finalize() method. (EJB 1.1: 9.2.2)
-CHKJ2008.sb.ejb11=CHKJ2008E: The {0} bean class must contain at least one ejbCreate method. (EJB 1.1: 6.5.5, 6.10.3)
-CHKJ2009.eb.ejb11=CHKJ2009E: The {0} bean class must contain at least one ejbFindByPrimaryKey method. (EJB 1.1: 9.2.5)
-CHKJ2010.sh.ejb11=CHKJ2010E: The {0} home interface must contain at least one create method. (EJB 1.1: 6.10.6)
-CHKJ2011.eh.ejb11=CHKJ2011E: The {0} home interface must contain one findByPrimaryKey method. (EJB 1.1: 9.2.8)
-CHKJ2012.sr.ejb11=CHKJ2012E: This type must be an interface. (EJB 1.1: 6.10.5).
-CHKJ2012.sh.ejb11=CHKJ2012E: This type must be an interface. (EJB 1.1: 6.10.6).
-CHKJ2012.er.ejb11=CHKJ2012E: This type must be an interface. (EJB 1.1: 9.2.7).
-CHKJ2012.eh.ejb11=CHKJ2012E: This type must be an interface. (EJB 1.1: 9.2.8).
-CHKJ2013.sb.ejb11=CHKJ2013E: The {0} bean class must implement {1}. (EJB 1.1: 6.10.2).
-CHKJ2013.eb.ejb11=CHKJ2013E: The {0} bean class must implement {1}. (EJB 1.1: 9.2.2).
-CHKJ2014.sb.ejb11=CHKJ2014E: The {0} bean class cannot be abstract. (EJB 1.1: 6.10.2)
-CHKJ2014.eb.ejb11=CHKJ2014E: The {0} bean class cannot be abstract. (EJB 1.1: 9.2.2)
-CHKJ2015.sb.ejb11=CHKJ2015E: The {0} bean class cannot be final. (EJB 1.1: 6.10.2)
-CHKJ2015.eb.ejb11=CHKJ2015E: The {0} bean class cannot be final. (EJB 1.1: 9.2.2)
-CHKJ2017.sr.ejb11=CHKJ2017E: Interface must extend {0}. (EJB 1.1: 6.10.5)
-CHKJ2017.sh.ejb11=CHKJ2017E: Interface must extend {0}. (EJB 1.1: 6.10.6)
-CHKJ2017.er.ejb11=CHKJ2017E: Interface must extend {0}. (EJB 1.1: 9.2.7)
-CHKJ2017.eh.ejb11=CHKJ2017E: Interface must extend {0}. (EJB 1.1: 9.2.8)
-CHKJ2019.eb.ejb11=CHKJ2019I: The {0} key class must be serializable at runtime. (EJB 1.1: 9.2.9) (RMI 1.3: 2.6).
-
-
-CHKJ2020.eb.ejb11=CHKJ2020E: The {0} key class must be public. (EJB 1.1: 9.4.7.2)
-CHKJ2021.eb.ejb11=CHKJ2021E: The {0} key class must define a public default constructor. (EJB 1.1: 9.4.7.2)
-CHKJ2022.sb.ejb11=CHKJ2022E: {0} bean class must be public. (EJB 1.1: 6.10.2)
-CHKJ2022.eb.ejb11=CHKJ2022E: {0} bean class must be public. (EJB 1.1: 9.2.2)
-CHKJ2023.sr.i.ejb11=CHKJ2023E: {0} must have a matching method in the {1} bean class. (EJB 1.1: 6.10.5)
-CHKJ2023.sr.m.ejb11=CHKJ2023E: This method must have a matching method in the {0} bean class. (EJB 1.1: 6.10.5)
-CHKJ2023.er.i.ejb11=CHKJ2023E: {0} must have a matching method in the {1} bean class. (EJB 1.1: 9.2.7)
-CHKJ2023.er.m.ejb11=CHKJ2023E: This method must have a matching method in the {0} bean class. (EJB 1.1: 9.2.7)
-CHKJ2024.sh.i.ejb11=CHKJ2024E: {0} must not exist. Only create() may exist (EJB 1.1: 6.8).
-CHKJ2024.sh.m.ejb11=CHKJ2024E: This method must not exist. Only create() may exist (EJB 1.1: 6.8).
-CHKJ2025.sb.i.ejb11=CHKJ2025E: {0} must not exist. Only ejbCreate() may exist (EJB 1.1: 6.8).
-CHKJ2025.sb.m.ejb11=CHKJ2025E: This method must not exist. Only ejbCreate() may exist (EJB 1.1: 6.8).
-CHKJ2026.sh.i.ejb11=CHKJ2026E: Bean class {1} must implement a matching ejbCreate method for {0}. (EJB 1.1: 6.10.6)
-CHKJ2026.sh.m.ejb11=CHKJ2026E: Bean class {0} must implement a matching ejbCreate method for this method. (EJB 1.1: 6.10.6)
-CHKJ2026.eh.i.ejb11=CHKJ2026E: Bean class {1} must implement a matching ejbCreate method for {0}. (EJB 1.1: 9.2.8)
-CHKJ2026.eh.m.ejb11=CHKJ2026E: Bean class {0} must implement a matching ejbCreate method for this method. (EJB 1.1: 9.2.8)
-CHKJ2028.eb.i.ejb11=CHKJ2028W: {0} will not be called unless a matching ejbCreate method is defined. (EJB 1.1: 9.1.5.1)
-CHKJ2028.eb.m.ejb11=CHKJ2028W: This method will not be called unless a matching ejbCreate method is defined. (EJB 1.1: 9.1.5.1)
-CHKJ2029.eb.i.ejb11=CHKJ2029W: {0} cannot be called without the matching create method on the home interface {1}. (EJB 1.1: 9.2.3)
-CHKJ2029.eb.m.ejb11=CHKJ2029W: This method cannot be called without the matching create method on the home interface {0}. (EJB 1.1: 9.2.3)
-CHKJ2030.eh.i.ejb11=CHKJ2030E: {0} must have a matching ejbFind method in the {1} bean class. (EJB 1.1: 9.2.8)
-CHKJ2030.eh.m.ejb11=CHKJ2030E: This method must have a matching ejbFind method in the {0} bean class. (EJB 1.1: 9.2.8)
-CHKJ2032.eb.ejb11=CHKJ2032W: Bean class {0} must declare at least one container managed field. (EJB 1.1: 9.4.7)
-CHKJ2033.eb.ejb11=CHKJ2033W: The setEntityContext(EntityContext ic) method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2034.eb.ejb11=CHKJ2034W: The unsetEntityContext() method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2035.eb.ejb11=CHKJ2035W: The ejbActivate() method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2036.eb.ejb11=CHKJ2036W: The ejbPassivate() method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2037.eb.ejb11=CHKJ2037W: The ejbRemove() method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2038.eb.ejb11=CHKJ2038W: The ejbLoad() method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2039.eb.ejb11=CHKJ2039W: The ejbStore() method must exist. (EJB 1.1: 9.1.5.1)
-
-CHKJ2040.sb.ejb11=CHKJ2040I: "this" must not be passed as a method argument or result. (EJB 1.1: 6.10.2)
-
-CHKJ2100.ejb11=CHKJ2100E: Both ends of the role must use the same number of attributes.
-CHKJ2101.ejb11=CHKJ2101E: Both ends of the role must use the same type.
-CHKJ2102.eh.ejb11=CHKJ2102E: Either a finder descriptor, or a matching custom finder method on the {0} class, must be defined.
-CHKJ2103.ejb11=CHKJ2103E: In component inheritance, the {0} bean class must inherit {1}. (EJB 1.1: B.2)
-CHKJ2104.ejb11=CHKJ2104E: In component inheritance, the {0} home interface must not inherit {1}. (EJB 1.1: B.2)
-CHKJ2105.ejb11=CHKJ2105E: In component inheritance, the {0} remote interface must inherit {1}. (EJB 1.1: B.2)
-CHKJ2106.ejb11=CHKJ2106E: Bean {0} must use {1} as its <prim-key-class> (EJB 1.1: B.2).
-
-CHKJ2200.i.ejb11=CHKJ2200W: The {0} static field should be final. (EJB 1.1: 18.1.2)
-CHKJ2200.m.ejb11=CHKJ2200W: This static field should be final. (EJB 1.1: 18.1.2)
-CHKJ2201.eb.i.ejb11=CHKJ2201E: {0} must not be transient. (EJB 1.1: 9.4.1)
-CHKJ2201.eb.m.ejb11=CHKJ2201E: The field must not be transient. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.i.ejb11=CHKJ2202W: The field type of field {0} is invalid for a CMP bean. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.m.ejb11=CHKJ2202W: The field type is invalid for a CMP bean. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.i.ejb11=CHKJ2203E: {0} must be public. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.m.ejb11=CHKJ2203E: The field must be public. (EJB 1.1: 9.4.1)
-CHKJ2205.eb.i.ejb11=CHKJ2205W: The primary key field named {0} must be public. (EJB 1.1: 9.4.7.2)
-CHKJ2205.eb.m.ejb11=CHKJ2205W: The primary key field must be public. (EJB 1.1: 9.4.7.2)
-CHKJ2206.eb.i.ejb11=CHKJ2206W: {0} must be a <cmp-field> of {1} and a field of bean class {2}. (EJB 1.1: 9.4.7.2).
-CHKJ2206.eb.m.ejb11=CHKJ2206W: This field must be a <cmp-field> of {0} and a field of bean class {1}. (EJB 1.1: 9.4.7.2).
-CHKJ2207.eb.ejb11=CHKJ2207E: Key field {0} must be the same type as the primary key, {1}. (EJB 1.1: 9.4.7.1).
-
-CHKJ2400.ejbCreate.sb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on method {0}. (EJB 1.1: 6.10.3).
-CHKJ2400.ejbCreate.sb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 6.10.3).
-CHKJ2400.bus.sb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on method {0}. (EJB 1.1: 6.10.4).
-CHKJ2400.bus.sb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 6.10.4).
-CHKJ2400.ejbCreate.eb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on {0}. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbCreate.eb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbPostCreate.eb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on {0}. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbPostCreate.eb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbFind.eb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on {0}. (EJB 1.1: 9.2.5).
-CHKJ2400.ejbFind.eb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 9.2.5).
-CHKJ2400.bus.eb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on {0}. (EJB 1.1: 9.2.6).
-CHKJ2400.bus.eb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 9.2.6).
-
-CHKJ2401.sb.i.ejb11=CHKJ2401E: {0} must return void. (EJB 1.1: 6.10.3)
-CHKJ2401.sb.m.ejb11=CHKJ2401E: This method must return void. (EJB 1.1: 6.10.3)
-CHKJ2402.sh.i.ejb11=CHKJ2402W: {0} must return the {1} remote interface type. (EJB 1.1: 6.10.6).
-CHKJ2402.sh.m.ejb11=CHKJ2402W: This create method must return the {0} remote interface type. (EJB 1.1: 6.10.6).
-CHKJ2402.eh.i.ejb11=CHKJ2402W: {0} must return the {1} remote interface type. (EJB 1.1: 9.2.8).
-CHKJ2402.eh.m.ejb11=CHKJ2402W: This create method must return the {0} remote interface type. (EJB 1.1: 9.2.8).
-CHKJ2403.eh.i.ejb11=CHKJ2403W: {0} must return {1} or a collection thereof. (EJB 1.1: 9.2.8)
-CHKJ2403.eh.m.ejb11=CHKJ2403W: The method must return {0} or a collection thereof. (EJB 1.1: 9.2.8)
-CHKJ2405.eh.i.ejb11=CHKJ2405W: The order and types of the arguments in {0} must match the order and types of the fields in the {1} key class. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2405.eh.m.ejb11=CHKJ2405W: The order and types of the arguments must match the order and types of the fields in the {0} key class. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2406.eb.i.ejb11=CHKJ2406W: {0} should return the primary key type {1}. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2406.eb.m.ejb11=CHKJ2406W: The method should return the primary key type {0}. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2407.eb.i.ejb11=CHKJ2407W: {0} should return either {1} or a collection thereof. (EJB 1.1: 9.2.5)
-CHKJ2407.eb.m.ejb11=CHKJ2407W: This method should return either {0} or a collection thereof. (EJB 1.1: 9.2.5)
-
-CHKJ2408.ejbCreate.sb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 6.10.3).
-CHKJ2408.ejbCreate.sb.m.ejb11=CHKJ2408E: The method must be public. (EJB 1.1: 6.10.3).
-CHKJ2408.bus.sb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 6.10.4).
-CHKJ2408.bus.sb.m.ejb11=CHKJ2408E: This method must be public. (EJB 1.1: 6.10.4).
-CHKJ2408.ejbCreate.eb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbCreate.eb.m.ejb11=CHKJ2408E: This method must be public. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbPostCreate.eb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbPostCreate.eb.m.ejb11=CHKJ2408E: This method must be public. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbFind.eb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 9.2.5).
-CHKJ2408.ejbFind.eb.m.ejb11=CHKJ2408E: This method must be public. (EJB 1.1: 9.2.5).
-CHKJ2408.bus.eb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 9.2.6).
-CHKJ2408.bus.eb.m.ejb11=CHKJ2408E: This method must be public. (EJB 1.1: 9.2.6).
-
-CHKJ2409.ejbCreate.sb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 6.10.3).
-CHKJ2409.ejbCreate.sb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 6.10.3).
-CHKJ2409.bus.sb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 6.10.4).
-CHKJ2409.bus.sb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 6.10.4).
-CHKJ2409.ejbCreate.eb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbCreate.eb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbPostCreate.eb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbPostCreate.eb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbFind.eb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 9.2.5).
-CHKJ2409.ejbFind.eb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 9.2.5).
-CHKJ2409.bus.eb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 9.2.6).
-CHKJ2409.bus.eb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 9.2.6).
-
-CHKJ2410.ejbCreate.sb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 6.10.3).
-CHKJ2410.ejbCreate.sb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 6.10.3).
-CHKJ2410.bus.sb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 6.10.4).
-CHKJ2410.bus.sb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 6.10.4).
-CHKJ2410.ejbCreate.eb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbCreate.eb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbPostCreate.eb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbPostCreate.eb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbFind.eb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 9.2.5).
-CHKJ2410.ejbFind.eb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 9.2.5).
-CHKJ2410.bus.eb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 9.2.6).
-CHKJ2410.bus.eb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 9.2.6).
-
-CHKJ2411.sb.i.ejb11=CHKJ2411E: The name of {0} must not start with "ejb". (EJB 1.1: 6.10.4)
-CHKJ2411.sb.m.ejb11=CHKJ2411E: The name of the method must not start with "ejb". (EJB 1.1: 6.10.4)
-CHKJ2411.eb.i.ejb11=CHKJ2411E: The name of {0} must not start with "ejb". (EJB 1.1: 9.2.6)
-CHKJ2411.eb.m.ejb11=CHKJ2411E: The name of the method must not start with "ejb". (EJB 1.1: 9.2.6)
-
-CHKJ2412.sb.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.sb.m.ejb11=CHKJ2412I: The return type must be serializable at runtime. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.eb.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.eb.m.ejb11=CHKJ2412I: The return type must be serializable at runtime. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.sr.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.sr.m.ejb11=CHKJ2412I: The return type must be serializable at runtime. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.er.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.er.m.ejb11=CHKJ2412I: The return type must be serializable at runtime. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.sh.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.sh.m.ejb11=CHKJ2412I: The return type must be serializable at runtime. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.eh.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2412.eh.m.ejb11=CHKJ2412I: The return type must be serializable at runtime. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2413.sb.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.sb.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.eb.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.eb.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.sr.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.sr.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.er.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.er.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.sh.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.sh.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.eh.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2413.eh.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2414.sh.i.ejb11=CHKJ2414E: {0} must throw {1}. (EJB 1.1: 6.10.6)
-CHKJ2414.sh.m.ejb11=CHKJ2414E: The method must throw {0}. (EJB 1.1: 6.10.6)
-CHKJ2414.eh.i.ejb11=CHKJ2414E: {0} must throw {1}. (EJB 1.1: 9.2.8)
-CHKJ2414.eh.m.ejb11=CHKJ2414E: The method must throw {0}. (EJB 1.1: 9.2.8)
-CHKJ2414.sr.i.ejb11=CHKJ2414E: {0} must throw {1}. (EJB 1.1: 6.10.5)
-CHKJ2414.sr.m.ejb11=CHKJ2414E: The method must throw {0}. (EJB 1.1: 6.10.5)
-CHKJ2414.er.i.ejb11=CHKJ2414E: {0} must throw {1}. (EJB 1.1: 9.2.7)
-CHKJ2414.er.m.ejb11=CHKJ2414E: The method must throw {0}. (EJB 1.1: 9.2.7)
-
-CHKJ2415.sr.i.ejb11=CHKJ2415E: The return type of {0} must match the return type, {1}, of the matching method in the {2} bean class. (EJB 1.1: 6.10.5)
-CHKJ2415.sr.m.ejb11=CHKJ2415E: The return type must match the return type, {0}, of the matching method in the {1} bean class. (EJB 1.1: 6.10.5)
-CHKJ2415.er.i.ejb11=CHKJ2415E: The return type of {0} must match the return type, {1}, of the matching method in the {2} bean class. (EJB 1.1: 9.2.7)
-CHKJ2415.er.m.ejb11=CHKJ2415E: The return type must match the return type, {0}, of the matching method in the {1} bean class. (EJB 1.1: 9.2.7)
-CHKJ2415.sh.i.ejb11=CHKJ2415E: The return type of {0} must match the return type, {1}, of the matching method in the {2} bean class. (EJB 1.1: 6.10.6)
-CHKJ2415.sh.m.ejb11=CHKJ2415E: The return type must match the return type, {0}, of the matching method in the {1} bean class. (EJB 1.1: 6.10.6)
-CHKJ2415.eh.i.ejb11=CHKJ2415E: The return type of {0} must match the return type, {1}, of the matching method in the {2} bean class. (EJB 1.1: 9.2.8)
-CHKJ2415.eh.m.ejb11=CHKJ2415E: The return type must match the return type, {0}, of the matching method in the {1} bean class. (EJB 1.1: 9.2.8)
-
-CHKJ2418.eb.i.ejb11=CHKJ2418E: {0} must return void. (EJB 1.1: 9.2.4)
-CHKJ2418.eb.m.ejb11=CHKJ2418E: This method must return void. (EJB 1.1: 9.2.4)
-CHKJ2419.sh.i.ejb11=CHKJ2419E: {0} must be a create method. (EJB 1.1: 6.10.6)
-CHKJ2419.sh.m.ejb11=CHKJ2419E: This method must be a create method. (EJB 1.1: 6.10.6)
-
-CHKJ2420.sb.i.ejb11=CHKJ2420E: {1} must be thrown by {0}''s corresponding method on the {2} home interface. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.sb.m.ejb11=CHKJ2420E: {0} must be thrown by the corresponding method on the {1} home interface. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.eb.i.ejb11=CHKJ2420E: {1} must be thrown by {0}''s corresponding method on the {2} home interface. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2420.eb.m.ejb11=CHKJ2420E: {0} must be thrown by the corresponding method on the {1} home interface. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2432.sb.i.ejb11=CHKJ2432E: {0}''s corresponding method on the {1} remote interface must throw {2}. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.sb.m.ejb11=CHKJ2432E: The corresponding method on the {0} remote interface must throw {1}. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.eb.i.ejb11=CHKJ2432E: {0}''s corresponding method on the {1} remote interface must throw {2}. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-CHKJ2432.eb.m.ejb11=CHKJ2432E: The corresponding method on the {0} remote interface must throw {1}. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-
-CHKJ2801.ejb11=CHKJ2801E: The value of the <ejb-name> element must be specified. (EJB 1.1: 16.2, 16.5)
-CHKJ2802.named.ejb11=CHKJ2802E: <ejb-class> class {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2802.unnamed.ejb11=CHKJ2802E: Unknown class specified in the <ejb-class> element. (EJB 1.1: 16.2, 16.5).
-CHKJ2803.named.ejb11=CHKJ2803E: <home> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2803.unnamed.ejb11=CHKJ2803E: Unknown interface specified in the <home> element. (EJB 1.1: 16.2, 16.5).
-CHKJ2804.named.ejb11=CHKJ2804E: <remote> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2804.unnamed.ejb11=CHKJ2804E: Unknown interface specified in the <remote> element. (EJB 1.1: 16.2, 16.5).
-CHKJ2806.ejb11=CHKJ2806E: The value of the <reentrant> element must be either "True" or "False". (EJB 1.1: 16.2, 16.5)
-CHKJ2807.ejb11=CHKJ2807E: The value of the <session-type> element must be either "Stateful" or "Stateless". (EJB 1.1: 16.2, 16.5)
-CHKJ2808.ejb11=CHKJ2808E: The value of the <transaction-type> element must be either "Container" or "Bean". (EJB 1.1: 11.3.5, 16.2,, 16.5)
-CHKJ2809.ejb11=CHKJ2809E: The value of the <persistence-type> element must be either "Container" or "Bean". (EJB 1.1: 16.2, 16.5)
-CHKJ2810.named.ejb11=CHKJ2810E: <prim-key-class> class {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2810.unnamed.ejb11=CHKJ2810E: Unknown class specified in the <prim-key-class> element. (EJB 1.1: 16.2, 16.5).
-CHKJ2811.named.ejb11=CHKJ2811E: <field-name> {0} cannot be located on bean class {1}. (EJB 1.1: 16.5).
-CHKJ2811.unnamed.ejb11=CHKJ2811E: <cmp-field> must specify a <field-name>. (EJB 1.1: 16.5).
-CHKJ2812.ejb11=CHKJ2812E: Bean class {0} must specify at least one of its fields as a <cmp-field>. (EJB 1.1: 16.5)
-CHKJ2814.ejb11=CHKJ2814W: <ejb-name>, in <method>, should specify a known enterprise bean. (EJB 1.1: 11.4.1, 15.3.2, 16.5)
-
-CHKJ2820.ejb11=CHKJ2820W: The security role ref must be defined only once.
-CHKJ2822.ejb11=CHKJ2822W: <security-role-ref> element for bean {0} should define the <role-name> element. (EJB 1.1: 15.2.5.3)
-CHKJ2823.ejb11=CHKJ2823W: <security-role-ref> element should define the <role-link> element. (EJB 1.1: 15.3.3)
-CHKJ2824.ejb11=CHKJ2824W: <security-role-ref> element refers to unknown role {0}. (EJB 1.1: 15.3.3)
-CHKJ2825.ejb11=CHKJ2825W: <security-role> element in ejb-jar.xml should define the <role-name> element. (EJB 1.1: 15.3.1)
-CHKJ2826.ejb11=CHKJ2826W: The security-role name must be unique. (EJB 1.1: 15.3.1)
-CHKJ2827.ejb11=CHKJ2827W: Cannot use a <role-link> element without <security-role> elements. (EJB 1.1: 15.2.5.3, 15.3.1, 15.3.3)
-CHKJ2828.ejb11=CHKJ2828E: Cannot use a <primkey-field> element without a primitive primary key. (EJB 1.1: 9.4.7, 16.5)
-CHKJ2829.ejb11=CHKJ2829E: Key class {0} does not map to any fields in enterprise bean {1}. (EJB 1.1: 9.4.7, 16.5)
-
-CHKJ2830.ejb11=CHKJ2830W: The type of the {0} field cannot be reflected. Check the classpath.
-CHKJ2831.ejb11=CHKJ2831W: {0} must be declared in a <cmp-field> element. (EJB 1.1: 9.4.7.2)
-CHKJ2832.ejb11=CHKJ2832I: Home {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 1.1: 14.3.1.2)
-CHKJ2833.ejb11=CHKJ2833I: Remote {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 1.1: 14.3.1.2)
-CHKJ2834.ejb11=CHKJ2834I: Bean {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 1.1: 14.3.2)
-CHKJ2835.ejb11=CHKJ2835I: Bean {0} is a {1} type. Update the <ejb-ref-type> element of the <ejb-ref> element. (EJB 1.1: 14.3.2)
-CHKJ2836.ejb11=CHKJ2836I: Bean {0} uses home {1}. Update the <ejb-ref> element of the <ejb-ref> element. (EJB 1.1: 14.3.2)
-CHKJ2837.ejb11=CHKJ2837I: Bean {0} uses remote {1}. Update the <ejb-ref> element of the <ejb-ref> element. (EJB 1.1: 14.3.2).
-CHKJ2838.ejb11=CHKJ2838I: It is recommended that all references to enterprise beans be organized in the "ejb" subcontext. (EJB 1.1: 14.3.1.1).
-CHKJ2839.ejb11=CHKJ2839W: The <env-entry-name> element, of the <env-entry> element, is invalid. (EJB 1.1: 14.2.1.2)
-
-CHKJ2840.ejb11=CHKJ2840W: The <env-entry-type> element, of the <env-entry> element, is invalid. (EJB 1.1: 14.2.1.2).
-CHKJ2841.ejb11=CHKJ2841W: The {0} name, in the <env-entry-name> element, can be used only once in the bean. (EJB 1.1: 14.2.1.2).
-CHKJ2842.ejb11=CHKJ2842W: <method-params> is ignored when <method-name> is "*". (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2843.ejb11=CHKJ2843W: No methods, on {0}, match this <method>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2844.ejb11=CHKJ2844W: At least one <method> should be set in a <method-permission>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2845.ejb11=CHKJ2845W: At least one <role-name> should be set in a <method-permission>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2846.ejb11=CHKJ2846W: No methods can be found for this <method-permission>. (EJB 1.1: 15.3.2).
-CHKJ2847.ejb11=CHKJ2847W: No methods can be found for this <container-transaction>. (EJB 1.1: 11.4.1).
-CHKJ2849.ejb11=CHKJ2849W: Cannot validate component inheritance of {0} because {1}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2850.ejb11=CHKJ2850W: Cannot validate <method> because {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2851.ejb11=CHKJ2851W: Cannot validate {0} because {1}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2852.ejb11=CHKJ2852W: Throwable caught while validating the ejb-jar.xml. The bean being validated was {0}.
-CHKJ2853.ejb11=CHKJ2853W: Throwable caught while validating the ibm-ejb-jar-ext.xmi. The bean being validated was {0}.
-
-CHKJ2908.ejb11=CHKJ2908W: An enterprise bean cannot be reflected properly. Run the XML validator for more information.
-
-CHKJ2895.ejb11=CHKJ2895W: <ejb-name> {0} must be unique within the ejb-jar.xml file (EJB 1.1: 16.5).
-CHKJ2875.ejb11=CHKJ2875E: <ejb-client-jar> {0} must exist in every EAR file that contains this EJB module (EJB 1.1: 16.5, 17.4).
-
-
-# EJB_METHOD_BEAN_NULL=CHKJ2434W: Validation of this method was terminated because the bean class cannot be found. Check the spelling of the bean class'' name in the ejb-jar.xml file.
-# EJB_METHOD_HOME_NULL=CHKJ2435W: Validation of this method was terminated because the home interface cannot be found. Check the spelling of the home interface''s name in the ejb-jar.xml file.
-# EJB_METHOD_REMOTE_NULL=CHKJ2436W: Validation of this method was terminated because the remote interface cannot be found. Check the spelling of the remote interface''s name in the ejb-jar.xml file.
-# EJB_METHOD_NULL=CHKJ2437W: Validation of this method was terminated because the enterprise bean cannot be found.
-# EJB_METHOD_KEY_NULL=CHKJ2438W: Validation of this method was terminated because the primary key cannot be found. Check the spelling of the key class'' name in the ejb-jar.xml file.
-# EJB_REMOTE_NULL=CHKJ2904E: Validation of {0} was terminated because the remote interface cannot be found. Check the spelling of its name in the ejb-jar.xml file.
-# EJB_NULL=CHKJ2903E: Validation was terminated because the enterprise bean cannot be found.
-# EJB_NOTREFLECTED_JAVACLASS=CHKJ2907E: Cannot validate because the {0} type cannot be reflected. Ensure that it, and all of its dependencies, are included in the classpath.
-# EJB_FIELD_CANNOT_REFLECT=CHKJ2208W: Type {0} of field {1} cannot be reflected. Ensure that {0}, and all of its dependencies, are included in the classpath.
-# EJB_FIELD_BEAN_NULL=CHKJ2209W: Validation of this field was terminated because the bean class cannot be found. Check the spelling of the bean class'' name in the ejb-jar.xml file.
-# EJB_FIELD_HOME_NULL=CHKJ2210W: Validation of this field was terminated because the home interface cannot be found. Check the spelling of the home interface''s name in the ejb-jar.xml file.
-# EJB_FIELD_REMOTE_NULL=CHKJ2211W: Validation of this field was terminated because the remote interface cannot be found. Check the spelling of the remote interface''s name in the ejb-jar.xml file.
-# EJB_FIELD_NULL=CHKJ2212W: Validation of this field was terminated because the enterprise bean cannot be found.
-# EJB_FIELD_KEY_NULL=CHKJ2213W: Validation of this field was terminated because the primary key cannot be found. Check the spelling of the key class'' name in the ejb-jar.xml file.
-# EJB_HAS_MULTIPLE_PK_METHODS=CHKJ2000W: The {0} home interface must contain only one findByPrimaryKey method. (EJB 1.1: 9.2.8)
-# EJB_HOME_NULL=CHKJ2901E: Validation of {0} was terminated because the home interface cannot be found. Check the spelling of its name in the ejb-jar.xml file.
-# EJB_KEY_NULL=CHKJ2902E: Validation of {0} was terminated because the key class cannot be found. Check the spelling of its name in the ejb-jar.xml file.
-# EJB_BEAN_NULL=CHKJ2900E: Validation of {0} was terminated because the bean class cannot be found. Check the spelling of its name in the ejb-jar.xml file.
-# EJB_BMP_NOFIELDS=CHKJ2042W: To have a primary key, the {0} bean class must declare at least one field. (EJB 1.1: 9.1.5.1)
-# EJB_DD_CANNOT_OPEN_DD=CHKJ2821E: Cannot open the deployment descriptor. Validation cannot complete.
-# EJB_DD_METHTRANSACTION_NO_TRANSACTION=CHKJ2848W: At least one <trans-attribute> must be set in a <container-transaction>. (EJB 1.1: 11.4.1)
-
-#
-# end of messages for the EJB 1.1 specification
-#
-
-#
-# Messages for EJB 2.0 specification
-#
-CHKJ2828.ejb20=CHKJ2828E: Cannot use a <primkey-field> without a primitive primary key (EJB 2.0: 10.8.1, 22.5).
-CHKJ2829.ejb20=CHKJ2829E: Key class {0} does not map to any fields in enterprise bean {1}. (EJB 2.0: 10.8, 22.5).
-CHKJ2839.ejb20=CHKJ2839W: The <env-entry-name> element, of the <env-entry> element, is invalid. (EJB 2.0: 20.2.1.2).
-CHKJ2840.ejb20=CHKJ2840W: The <env-entry-type> element, of the <env-entry> element, is invalid. (EJB 2.0: 20.2.1.2).
-CHKJ2841.ejb20=CHKJ2841W: The {0} name, in the <env-entry-name> element, can be used only once in the bean. (EJB 2.0: 20.2.1.2).
-CHKJ2830.ejb20=CHKJ2830W: The type of the {0} field cannot be reflected. Check the classpath.
-CHKJ2831.ejb20=CHKJ2831W: {0} must be declared in a <cmp-field> element. (EJB 2.0: 10.8.2).
-CHKJ2801.ejb20=CHKJ2801E: The value of the <ejb-name> element must be specified. (EJB 2.0 22.2, 22.5).
-CHKJ2809.ejb20=CHKJ2809E: The value of the <persistence-type> element must be either "Container" or "Bean". (EJB 2.0: 22.2, 22.5).
-CHKJ2806.ejb20=CHKJ2806E: The value of the <reentrant> element must be either "True" or "False". (EJB 2.0: 22.2, 22.5).
-CHKJ2807.ejb20=CHKJ2807E: The value of the <session-type> element must be either "Stateful" or "Stateless". (EJB 2.0: 22.2, 22.5).
-CHKJ2808.ejb20=CHKJ2808E: The value of the <transaction-type> element must be either "Container" or "Bean". (EJB 2.0: 17.3.6, 22.2, 22.5).
-CHKJ2814.ejb20=CHKJ2814W: <ejb-name>, in <method>, should specify a known enterprise bean. (EJB 2.0: 17.4.1, 21.3.2, 22.5).
-CHKJ2842.ejb20=CHKJ2842W: <method-params> is ignored when <method-name> is "*". (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2843.ejb20=CHKJ2843W: No methods, on {0}, match this <method>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2844.ejb20=CHKJ2844W: At least one <method> should be set in a <method-permission>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2845.ejb20=CHKJ2845W: A <role-name> or an <unchecked> element should be set in a <method-permission>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2846.ejb20=CHKJ2846W: No methods can be found for this <method-permission>. (EJB 2.0: 21.3.2).
-CHKJ2847.ejb20=CHKJ2847W: No methods can be found for this <container-transaction>. (EJB 2.0: 17.4.1).
-CHKJ2812.ejb20=CHKJ2812E: Bean class {0} must specify at least one of its fields as a <cmp-field>. (EJB 2.0: 22.5).
-CHKJ2832.ejb20=CHKJ2832I: Home {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 2.0: 20.3.1.2).
-CHKJ2833.ejb20=CHKJ2833I: Remote {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 2.0: 20.3.1.2).
-CHKJ2834.ejb20=CHKJ2834I: Bean {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 2.0: 20.3.2).
-CHKJ2835.ejb20=CHKJ2835I: Bean {0} is a {1} type. Update the <ejb-ref-type> element of the <ejb-ref> element. (EJB 2.0: 20.3.2).
-CHKJ2836.ejb20=CHKJ2836I: Bean {0} uses home {1}. Update the <ejb-ref> element of the <ejb-ref> element. (EJB 2.0: 20.3.2).
-CHKJ2837.ejb20=CHKJ2837I: Bean {0} uses remote {1}. Update the <ejb-ref> element of the <ejb-ref> element. (EJB 2.0: 20.3.2).
-CHKJ2838.ejb20=CHKJ2838I: It is recommended that all references to enterprise beans be organized in the "ejb" subcontext. (EJB 2.0: 20.3.1.1).
-CHKJ2820.ejb20=CHKJ2820W: The security role ref is defined more than once.
-CHKJ2822.ejb20=CHKJ2822W: <security-role-ref> element for bean {0} should define the <role-name> element. (EJB 2.0: 21.2.5.3).
-CHKJ2823.ejb20=CHKJ2823W: <security-role-ref> element should define the <role-link> element. (EJB 2.0: 21.3.3).
-CHKJ2824.ejb20=CHKJ2824W: <security-role-ref> element refers to unknown role {0}. (EJB 2.0: 21.3.3).
-CHKJ2825.ejb20=CHKJ2825W: <security-role> element in ejb-jar.xml should define the <role-name> element. (EJB 2.0: 21.3.1).
-CHKJ2826.ejb20=CHKJ2826W: The security-role name must be unique. (EJB 2.0: 21.3.1).
-CHKJ2827.ejb20=CHKJ2827W: Cannot use a <role-link> element without <security-role> elements. (EJB 2.0: 21.2.5.3, 21.3.1, 21.3.3).
-CHKJ2850.ejb20=CHKJ2850W: Cannot validate <method> because the {0} type cannot be reflected. Check the classpath.
-CHKJ2851.ejb20=CHKJ2851W: Cannot validate {0} because type {1} cannot be reflected. Check the classpath.
-CHKJ2875.ejb20=CHKJ2875E: <ejb-client-jar> {0} must exist in every EAR file that contains this EJB module (EJB 2.0: 22.5, 23.4, 23.6).
-
-CHKJ2003E.ejb20=CHKJ2003E: This class must not implement javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2003I.ejb20=CHKJ2003I: Bean-managed transaction stateful session beans need not implement javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2802.named.ejb20=CHKJ2802E: <ejb-class> class {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2802.unnamed.ejb20=CHKJ2802E: The bean class, identified by the <ejb-class> element, cannot be found. (EJB 2.0: 22.2, 22.5).
-CHKJ2803.named.ejb20=CHKJ2803E: <home> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2803.unnamed.ejb20=CHKJ2803E: Unknown interface specified in the <home> element. (EJB 2.0: 22.2, 22.5).
-CHKJ2804.named.ejb20=CHKJ2804E: <remote> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2804.unnamed.ejb20=CHKJ2804E: Unknown interface specified in the <remote> element. (EJB 2.0: 22.2, 22.5).
-CHKJ2805.named.ejb20=CHKJ2805E: <local-home> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2805.unnamed.ejb20=CHKJ2805E: Unknown interface specified in the <local-home> element. (EJB 2.0: 22.2, 22.5).
-CHKJ2800.named.ejb20=CHKJ2800E: <local> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2800.unnamed.ejb20=CHKJ2800E: Unknown interface specified in the <local> element. (EJB 2.0: 22.2, 22.5).
-CHKJ2810.named.ejb20=CHKJ2810E: <prim-key-class> class {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2810.unnamed.ejb20=CHKJ2810E: Unknown class specified in the <prim-key-class> element. (EJB 2.0: 22.2, 22.5).
-CHKJ2811.ejb20=CHKJ2811E: <field-name> {0} cannot be located on bean class {1}. (EJB 2.0: 22.5).
-
-CHKJ2103.ejb20=CHKJ2103E: In component inheritance, the {0} bean class must inherit {1} (EJB 2.0: D.2)
-CHKJ2104.ejb20=CHKJ2104E: In component inheritance, the {0} home interface must not inherit {1}. (EJB 2.0: D.2).
-CHKJ2105.ejb20=CHKJ2105E: In component inheritance, the {0} component interface must inherit {1}. (EJB 2.0: D.2).
-CHKJ2106.ejb20=CHKJ2106E: Bean {0} must use {1} as its <prim-key-class> (EJB 2.0: D.2).
-CHKJ2849.ejb20=CHKJ2849W: Cannot validate component inheritance of {0} because the {1} type, or one of its dependencies, cannot be reflected. Check the classpath.
-
-CHKJ2895.ejb20=CHKJ2895W: <ejb-name> {0} must be unique within the ejb-jar.xml file (EJB 2.0: 22.5).
-
-##################################################
-# class/interface checks
-##################################################
-# implement SessionBean/EntityBean/MessageDrivenBean/MessageListener
-CHKJ2017.sb.ejb20=CHKJ2017E: This class must implement {0} (EJB 2.0: 7.5.1, 7.10.2).
-CHKJ2017.mb.ejb20=CHKJ2017E: This class must implement {0} (EJB 2.0: 15.4.1, 15.7.2).
-CHKJ2017.cb.ejb20=CHKJ2017E: This class must implement {0} (EJB 2.0: 10.6.2).
-CHKJ2017.bb.ejb20=CHKJ2017E: This class must implement {0} (EJB 2.0: 12.2.2).
-
-# implement EJBHome
-CHKJ2017.srh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBHome (EJB 2.0: 6.3, 7.10.6).
-CHKJ2017.crh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBHome (EJB 2.0: 9.5, 10.6.10).
-CHKJ2017.brh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBHome (EJB 2.0: 9.5, 12.2.9).
-
-# implement EJBLocalHome
-CHKJ2017.slh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalHome (EJB 2.0: 6.4, 7.10.8).
-CHKJ2017.clh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 10.6.12).
-CHKJ2017.blh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 12.2.11).
-
-# implement EJBObject
-CHKJ2017.src.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBObject (EJB 2.0: 6.5, 7.10.5).
-CHKJ2017.crc.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBObject (EJB 2.0: 9.9, 10.6.9).
-CHKJ2017.brc.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBObject (EJB 2.0: 9.9, 12.2.8).
-
-# implement EJBLocalObject
-CHKJ2017.slc.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalObject (EJB 2.0: 7.10.7).
-CHKJ2017.clc.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 10.6.10).
-CHKJ2017.blc.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 12.2.10).
-
-# impl component interface
-CHKJ2040.cb.ejb20=CHKJ2040I: "this" must not be passed as a method argument or result (EJB 2.0: 10.6.2).
-CHKJ2040.bb.ejb20=CHKJ2040I: "this" must not be passed as a method argument or result (EJB 2.0: 12.2.2).
-CHKJ2040.sb.ejb20=CHKJ2040I: "this" must not be passed as a method argument or result (EJB 2.0: 7.10.2).
-
-# bean class
-CHKJ2014.cb.ejb20=CHKJ2014W: This class must be abstract (EJB 2.0: 10.3.1, 10.4.1, 10.6.2).
-CHKJ2014.mb.ejb20=CHKJ2014W: This class must not be abstract (EJB 2.0: 15.7.2).
-CHKJ2014.bb.ejb20=CHKJ2014W: This class must not be abstract (EJB 2.0: 12.2.2).
-CHKJ2014.sb.ejb20=CHKJ2014W: This class must not be abstract (EJB 2.0: 7.10.1).
-
-CHKJ2022.cb.ejb20=CHKJ2022W: This class must be public (EJB 2.0: 10.6.2).
-CHKJ2022.mb.ejb20=CHKJ2022W: This class must be public (EJB 2.0: 15.7.2).
-CHKJ2022.bb.ejb20=CHKJ2022W: This class must be public (EJB 2.0: 12.2.2).
-CHKJ2022.sb.ejb20=CHKJ2022W: This class must be public (EJB 2.0: 7.10.1).
-CHKJ2022.kc.ejb20=CHKJ2022W: This class must be public (EJB 2.0: 10.8.2).
-
-CHKJ2015.cb.ejb20=CHKJ2015W: This class must not be final (EJB 2.0: 10.6.2).
-CHKJ2015.mb.ejb20=CHKJ2015W: This class must not be final (EJB 2.0: 15.7.2).
-CHKJ2015.bb.ejb20=CHKJ2015W: This class must not be final (EJB 2.0: 12.2.2).
-CHKJ2015.sb.ejb20=CHKJ2015W: This class must not be final (EJB 2.0: 7.10.1).
-
-# dependent value class
-CHKJ2018.ejb20=CHKJ2018W: This class must be serializable (EJB 2.0: 10.3.3, 10.6.3).
-CHKJ2043.ejb20=CHKJ2043W: This class must be public (EJB 2.0: 10.6.3).
-CHKJ2044.ejb20=CHKJ2044W: This class must not be abstract (EJB 2.0: 10.6.3).
-
-# key class
-CHKJ2019.kc.ejb20=CHKJ2019W: This class must be a legal Value Type in RMI-IIOP (EJB 2.0: 9.8, 10.6.13).
-CHKJ2019.kb.ejb20=CHKJ2019W: This class must be a legal Value Type in RMI-IIOP (EJB 2.0: 9.8, 12.2.12).
-
-
-###
-# methods which must exist
-###
-# public default constructor with no parameters
-CHKJ2050.constr.sb.ejb20=CHKJ2050W: public {0} must exist (EJB 2.0: 7.10.2).
-CHKJ2050.constr.cb.ejb20=CHKJ2050W: public {0} must exist (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2050.constr.bb.ejb20=CHKJ2050W: public {0} must exist (EJB 2.0: 12.1.4.1, 12.2.2).
-CHKJ2050.constr.mb.ejb20=CHKJ2050W: public {0} must exist (EJB 2.0: 15.7.2).
-CHKJ2050.constr.kc.ejb20=CHKJ2050W: public {0} must exist (EJB 2.0: 10.8.2).
-
-
-# accessor method
-CHKJ2050.acc.cb.ejb20=CHKJ2050E: This class must define {0} (EJB 2.0: 10.3.1).
-
-CHKJ2050.onMessage.mb.ejb20=CHKJ2050W: onMessage(javax.jms.Message) must exist (EJB 2.0: 15.4.2, 15.7.4).
-
-CHKJ2050.ejbCreate.sfb.ejb20=CHKJ2050W: At least one ejbCreate method must exist (EJB 2.0: 7.5.5).
-CHKJ2050.ejbCreate.ssb.ejb20=CHKJ2050W: The ejbCreate() method must exist (EJB 2.0: 7.8).
-CHKJ2050.ejbCreate.mb.ejb20=CHKJ2050W: The ejbCreate() method must exist (EJB 2.0: 15.4.4, 15.7.2).
-
-CHKJ2050.ejbFindByPrimaryKey.bb.ejb20=CHKJ2050W: The ejbFindByPrimaryKey method must exist (EJB 2.0: 12.2.5).
-
-CHKJ2050.setEntityContext.cb.ejb20=CHKJ2050W: The setEntityContext(EntityContext) method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.setEntityContext.bb.ejb20=CHKJ2050W: The setEntityContext(EntityContext) method must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.unsetEntityContext.cb.ejb20=CHKJ2050W: The unsetEntityContext() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.unsetEntityContext.bb.ejb20=CHKJ2050W: The unsetEntityContext() method must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbActivate.cb.ejb20=CHKJ2050W: The ejbActivate() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbActivate.bb.ejb20=CHKJ2050W: The ejbActivate() method must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPassivate.cb.ejb20=CHKJ2050W: The ejbPassivate() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPassivate.bb.ejb20=CHKJ2050W: The ejbPassivate() method must exist (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbPassivate.sb.ejb20=CHKJ2050W: The ejbPassivate() method must exist (EJB 2.0: 7.5.1).
-
-CHKJ2050.ejbRemove.cb.ejb20=CHKJ2050W: The ejbRemove() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbRemove.bb.ejb20=CHKJ2050W: The ejbRemove() method must exist (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbRemove.mb.ejb20=CHKJ2050W: The ejbRemove() method must exist (EJB 2.0: 15.7.5).
-CHKJ2050.ejbRemove.sb.ejb20=CHKJ2050W: The ejbRemove() method must exist (EJB 2.0: 4.2.2, 7.5.1).
-
-CHKJ2050.ejbLoad.cb.ejb20=CHKJ2050W: The ejbLoad() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbLoad.bb.ejb20=CHKJ2050W: The ejbLoad() method must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbStore.cb.ejb20=CHKJ2050W: The ejbStore() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbStore.bb.ejb20=CHKJ2050W: The ejbStore() method must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.create.ssrh.ejb20=CHKJ2050W: The create() method must exist (EJB 2.0: 7.8, 7.10.6).
-CHKJ2050.create.sslh.ejb20=CHKJ2050W: The create() method must exist (EJB 2.0: 7.8, 7.10.8).
-
-CHKJ2050.create.srh.ejb20=CHKJ2050W: This interface must define at least one create method (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2050.create.slh.ejb20=CHKJ2050W: This interface must define at least one create method (EJB 2.0: 6.4.1, 7.10.8).
-
-CHKJ2050.find.crh.ejb20=CHKJ2050W: At least one finder method must exist (EJB 2.0: 9.5.2).
-CHKJ2050.find.brh.ejb20=CHKJ2050W: At least one finder method must exist (EJB 2.0: 9.5.2).
-CHKJ2050.find.clh.ejb20=CHKJ2050W: At least one finder method must exist (EJB 2.0: 9.6.2).
-CHKJ2050.find.blh.ejb20=CHKJ2050W: At least one finder method must exist (EJB 2.0: 9.6.2).
-
-CHKJ2050.home.crh.ejb20=CHKJ2050W: This interface must define at least one home method (EJB 2.0: 9.5.4).
-CHKJ2050.home.brh.ejb20=CHKJ2050W: This interface must define at least one home method (EJB 2.0: 9.5.4).
-CHKJ2050.home.clh.ejb20=CHKJ2050W: This interface must define at least one home method (EJB 2.0: 9.6.4).
-CHKJ2050.home.blh.ejb20=CHKJ2050W: This interface must define at least one home method (EJB 2.0: 9.6.4).
-
-CHKJ2050.ejbHome.crh.ejb20=CHKJ2050W: This class must define at least one ejbHome method (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.brh.ejb20=CHKJ2050W: This class must define at least one ejbHome method (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.clh.ejb20=CHKJ2050W: This class must define at least one ejbHome method (EJB 2.0: 9.6.4).
-CHKJ2050.ejbHome.blh.ejb20=CHKJ2050W: This class must define at least one ejbHome method (EJB 2.0: 9.6.4).
-
-CHKJ2050.hashCode.kb.ejb20=CHKJ2050W: hashCode() must exist on this class (EJB 2.0: 12.2.12).
-CHKJ2050.hashCode.kc.ejb20=CHKJ2050W: hashCode() must exist on this class (EJB 2.0: 10.6.13).
-
-CHKJ2050.equals.kb.ejb20=CHKJ2050W: equals(Object) must exist on this class (EJB 2.0: 12.2.12).
-CHKJ2050.equals.kc.ejb20=CHKJ2050W: equals(Object) must exist on this class (EJB 2.0: 10.6.13).
-
-# ejbSelect - needed? pl174 says zero or more, p.193 says one or more
-CHKJ2050.ejbSelect.cb.ejb20=CHKJ2050W: An ejbSelect method must exist (EJB 2.0: 10.5.2, 10.6.7).
-
-CHKJ2050.findByPrimaryKey.crh.ejb20=CHKJ2050W: findByPrimaryKey must exist (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2050.findByPrimaryKey.clh.ejb20=CHKJ2050W: findByPrimaryKey must exist (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2050.findByPrimaryKey.blh.ejb20=CHKJ2050W: findByPrimaryKey must exist (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2050.findByPrimaryKey.brh.ejb20=CHKJ2050W: findByPrimaryKey must exist (EJB 2.0: 9.5.2, 12.2.9).
-
-# ejbFind
-CHKJ2050.ejbFind.bb.ejb20=CHKJ2050W: {0} must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPostCreate.cb.ejb20=CHKJ2050E: {0} must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPostCreate.bb.ejb20=CHKJ2050E: {0} must exist (EJB 2.0: 12.1.4.1, 12.2.4).
-
-
-##################################################
-# method checks
-##################################################
-# application exception
-CHKJ2404.i.ejb20=CHKJ2404W: Application exception {1} on {0} must extend java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2404.m.ejb20=CHKJ2404W: Application exception {0} must extend java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.i.ejb20=CHKJ2416W: Application exception {1} on {0} must not extend java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.m.ejb20=CHKJ2416W: Application exception {0} must not extend java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1).
-
-# ejbRemove
-CHKJ2492.mb.i.ejb20=CHKJ2492W: {0} on {1} must be public (EJB 2.0: 15.7.5).
-CHKJ2492.mb.m.ejb20=CHKJ2492W: This method must be public (EJB 2.0: 15.7.5).
-CHKJ2492.cb.i.ejb20=CHKJ2492W: {0} on {1} must be public (EJB 2.0: 10.5.2).
-CHKJ2492.cb.m.ejb20=CHKJ2492W: This method must be public (EJB 2.0: 10.5.2).
-CHKJ2492.bb.i.ejb20=CHKJ2492W: {0} on {1} must be public (EJB 2.0: 12.1.4.1).
-CHKJ2492.bb.m.ejb20=CHKJ2492W: This method must be public (EJB 2.0: 12.1.4.1).
-CHKJ2492.sb.i.ejb20=CHKJ2492W: {0} on {1} must be public (EJB 2.0: 7.6).
-CHKJ2492.sb.m.ejb20=CHKJ2492W: This method must be public (EJB 2.0: 7.6).
-
-CHKJ2493.mb.i.ejb20=CHKJ2493W: {0} must not be final (EJB 2.0: 15.7.5).
-CHKJ2493.mb.m.ejb20=CHKJ2493W: This method must not be final (EJB 2.0: 15.7.5).
-CHKJ2493.cb.i.ejb20=CHKJ2493W: {0} must not be final (EJB 2.0: 10.5.2).
-CHKJ2493.cb.m.ejb20=CHKJ2493W: This method must not be final (EJB 2.0: 10.5.2).
-CHKJ2493.bb.i.ejb20=CHKJ2493W: {0} must not be final (EJB 2.0: 12.1.4.1).
-CHKJ2493.bb.m.ejb20=CHKJ2493W: This method must not be final (EJB 2.0: 12.1.4.1).
-CHKJ2493.sb.i.ejb20=CHKJ2493W: {0} must not be final (EJB 2.0: 7.6).
-CHKJ2493.sb.m.ejb20=CHKJ2493W: This method must not be final (EJB 2.0: 7.6).
-
-CHKJ2494.mb.i.ejb20=CHKJ2494W: {0} must not be static (EJB 2.0: 15.7.5).
-CHKJ2494.mb.m.ejb20=CHKJ2494W: This method must not be static (EJB 2.0: 15.7.5).
-CHKJ2494.cb.i.ejb20=CHKJ2494W: {0} must not be static (EJB 2.0: 10.5.2).
-CHKJ2494.cb.m.ejb20=CHKJ2494W: This method must not be static (EJB 2.0: 10.5.2).
-CHKJ2494.bb.i.ejb20=CHKJ2494W: {0} must not be static (EJB 2.0: 12.1.4.1).
-CHKJ2494.bb.m.ejb20=CHKJ2494W: This method must not be static (EJB 2.0: 12.1.4.1).
-CHKJ2494.sb.i.ejb20=CHKJ2494W: {0} must not be static (EJB 2.0: 7.6).
-CHKJ2494.sb.m.ejb20=CHKJ2494W: This method must not be static (EJB 2.0: 7.6).
-
-CHKJ2505.ejbRemove.mb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.mb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.cb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.cb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.bb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.bb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.sb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 7.6).
-CHKJ2505.ejbRemove.sb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 7.6).
-
-# ejbCreate
-CHKJ2421.mb.i.ejb20=CHKJ2421W: {0} must be public (EJB 2.0: 15.7.3).
-CHKJ2421.cb.i.ejb20=CHKJ2421W: {0} must be public (EJB 2.0: 10.6.4).
-CHKJ2421.bb.i.ejb20=CHKJ2421W: {0} must be public (EJB 2.0: 12.2.3).
-CHKJ2421.sb.i.ejb20=CHKJ2421W: {0} must be public (EJB 2.0: 7.10.3).
-CHKJ2421.mb.m.ejb20=CHKJ2421W: This method must be public (EJB 2.0: 15.7.3).
-CHKJ2421.cb.m.ejb20=CHKJ2421W: This method must be public (EJB 2.0: 10.6.4).
-CHKJ2421.bb.m.ejb20=CHKJ2421W: This method must be public (EJB 2.0: 12.2.3).
-CHKJ2421.sb.m.ejb20=CHKJ2421W: This method must be public (EJB 2.0: 7.10.3).
-
-CHKJ2422.sb.i.ejb20=CHKJ2422W: {0} must not be final (EJB 2.0: 7.10.3).
-CHKJ2422.cb.i.ejb20=CHKJ2422W: {0} must not be final (EJB 2.0: 10.6.4).
-CHKJ2422.bb.i.ejb20=CHKJ2422W: {0} must not be final (EJB 2.0: 12.2.3).
-CHKJ2422.mb.i.ejb20=CHKJ2422W: {0} must not be final (EJB 2.0: 15.7.3).
-CHKJ2422.sb.m.ejb20=CHKJ2422W: This method must not be final (EJB 2.0: 7.10.3).
-CHKJ2422.cb.m.ejb20=CHKJ2422W: This method must not be final (EJB 2.0: 10.6.4).
-CHKJ2422.bb.m.ejb20=CHKJ2422W: This method must not be final (EJB 2.0: 12.2.3).
-CHKJ2422.mb.m.ejb20=CHKJ2422W: This method must not be final (EJB 2.0: 15.7.3).
-
-CHKJ2423.sb.i.ejb20=CHKJ2423W: {0} must not be static (EJB 2.0: 7.10.3).
-CHKJ2423.cb.i.ejb20=CHKJ2423W: {0} must not be static (EJB 2.0: 10.6.4).
-CHKJ2423.bb.i.ejb20=CHKJ2423W: {0} must not be static (EJB 2.0: 12.2.3).
-CHKJ2423.mb.i.ejb20=CHKJ2423W: {0} must not be static (EJB 2.0: 15.7.3).
-CHKJ2423.sb.m.ejb20=CHKJ2423W: This method must not be static (EJB 2.0: 7.10.3).
-CHKJ2423.cb.m.ejb20=CHKJ2423W: This method must not be static (EJB 2.0: 10.6.4).
-CHKJ2423.bb.m.ejb20=CHKJ2423W: This method must not be static (EJB 2.0: 12.2.3).
-CHKJ2423.mb.m.ejb20=CHKJ2423W: This method must not be static (EJB 2.0: 15.7.3).
-
-CHKJ2424.cb.i.ejb20=CHKJ2424W: {0} must return {1} (EJB 2.0: 10.6.4).
-CHKJ2424.bb.i.ejb20=CHKJ2424W: {0} must return {1} (EJB 2.0: 12.2.3).
-CHKJ2424.sb.i.ejb20=CHKJ2424W: {0} must return void (EJB 2.0: 7.10.3).
-CHKJ2424.mb.i.ejb20=CHKJ2424W: {0} must return void (EJB 2.0: 15.7.3).
-CHKJ2424.cb.m.ejb20=CHKJ2424W: This method must return {0} (EJB 2.0: 10.6.4).
-CHKJ2424.bb.m.ejb20=CHKJ2424W: This method must return {0} (EJB 2.0: 12.2.3).
-CHKJ2424.sb.m.ejb20=CHKJ2424W: This method must return void (EJB 2.0: 7.10.3).
-CHKJ2424.mb.m.ejb20=CHKJ2424W: This method must return void (EJB 2.0: 15.7.3).
-
-
-
-# ejbCreate's method parameters and return type
-CHKJ2500.ejbCreate.sb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 12.2.3).
-CHKJ2500.ejbCreate.sb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 12.2.3).
-
-CHKJ2497.cb.i.ejb20=CHKJ2497W: {0} must throw javax.ejb.CreateException (EJB 2.0: 10.6.4).
-CHKJ2497.cb.m.ejb20=CHKJ2497W: This method must throw javax.ejb.CreateException (EJB 2.0: 10.6.4).
-
-CHKJ2501.ejbCreate.mb.i.ejb20=CHKJ2501I: {0} must not throw application exceptions (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbCreate.mb.m.ejb20=CHKJ2501I: This method must not throw application exceptions (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.i.ejb20=CHKJ2501I: {0} must not throw application exceptions (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.m.ejb20=CHKJ2501I: This method must not throw application exceptions (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.i.ejb20=CHKJ2501I: {0} must not throw application exceptions (EJB 2.0: 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.m.ejb20=CHKJ2501I: This method must not throw application exceptions (EJB 2.0: 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2).
-
-
-CHKJ2503.ejbCreate.sb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.sb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-
-# ejbPostCreate
-CHKJ2426.cb.i.ejb20=CHKJ2426W: {0} must be public (EJB 2.0: 10.6.5).
-CHKJ2426.bb.i.ejb20=CHKJ2426W: {0} must be public (EJB 2.0: 12.2.4).
-CHKJ2426.cb.m.ejb20=CHKJ2426W: This method must be public (EJB 2.0: 10.6.5).
-CHKJ2426.bb.m.ejb20=CHKJ2426W: This method must be public (EJB 2.0: 12.2.4).
-
-CHKJ2427.cb.i.ejb20=CHKJ2427W: {0} must not be final (EJB 2.0: 10.6.5).
-CHKJ2427.bb.i.ejb20=CHKJ2427W: {0} must not be final (EJB 2.0: 12.2.4).
-CHKJ2427.cb.m.ejb20=CHKJ2427W: This method must not be final (EJB 2.0: 10.6.5).
-CHKJ2427.bb.m.ejb20=CHKJ2427W: This method must not be final (EJB 2.0: 12.2.4).
-
-CHKJ2428.cb.i.ejb20=CHKJ2428W: {0} must not be static (EJB 2.0: 10.6.5).
-CHKJ2428.bb.i.ejb20=CHKJ2428W: {0} must not be static (EJB 2.0: 12.2.4).
-CHKJ2428.cb.m.ejb20=CHKJ2428W: This method must not be static (EJB 2.0: 10.6.5).
-CHKJ2428.bb.m.ejb20=CHKJ2428W: This method must not be static (EJB 2.0: 12.2.4).
-
-CHKJ2505.ejbPostCreate.cb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 12.2.4).
-CHKJ2505.ejbPostCreate.cb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 12.2.4).
-
-CHKJ2503.ejbPostCreate.cb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.cb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-
-
-# ejbHome
-CHKJ2430.cb.i.ejb20=CHKJ2430I: {1} must exist for {0} to be called (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.i.ejb20=CHKJ2430I: {1} must exist for {0} to be called (EJB 2.0: 12.1.4.1).
-CHKJ2430.cb.m.ejb20=CHKJ2430I: {0} must exist for this method to be called (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.m.ejb20=CHKJ2430I: {0} must exist for this method to be called (EJB 2.0: 12.1.4.1).
-
-CHKJ2431.cb.i.ejb20=CHKJ2431W: {0} must be public (EJB 2.0: 10.6.6).
-CHKJ2431.bb.i.ejb20=CHKJ2431W: {0} must be public. (EJB 2.0: 12.2.6).
-CHKJ2431.cb.m.ejb20=CHKJ2431W: This method must be public (EJB 2.0: 10.6.6).
-CHKJ2431.bb.m.ejb20=CHKJ2431W: This method must be public. (EJB 2.0: 12.2.6).
-
-CHKJ2439.cb.i.ejb20=CHKJ2439W: {0} must not be static (EJB 2.0: 10.6.6).
-CHKJ2439.bb.i.ejb20=CHKJ2439W: {0} must not be static (EJB 2.0: 12.2.6).
-CHKJ2439.cb.m.ejb20=CHKJ2439W: This method must not be static (EJB 2.0: 10.6.6).
-CHKJ2439.bb.m.ejb20=CHKJ2439W: This method must not be static (EJB 2.0: 12.2.6).
-
-CHKJ2500.ejbHome.cb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 12.2.6).
-CHKJ2500.ejbHome.cb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 12.2.6).
-
-CHKJ2503.ejbHome.cb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.cb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-
-# ejbFind
-CHKJ2457.bb.i.ejb20=CHKJ2457W: {0} must be public (EJB 2.0: 12.2.5).
-CHKJ2457.bb.m.ejb20=CHKJ2457W: This method must be public (EJB 2.0: 12.2.5).
-
-CHKJ2458.bb.i.ejb20=CHKJ2458W: {0} must not be final (EJB 2.0: 12.2.5).
-CHKJ2458.bb.m.ejb20=CHKJ2458W: This method must not be final (EJB 2.0: 12.2.5).
-
-CHKJ2459.bb.i.ejb20=CHKJ2459W: {0} must not be static (EJB 2.0: 12.2.5).
-CHKJ2459.bb.m.ejb20=CHKJ2459W: This method must not be static (EJB 2.0: 12.2.5).
-
-CHKJ2500.ejbFind.bb.i.ejb20=CHKJ2500I: {0} on method {1} must be serializable at runtime (EJB 2.0: 12.2.5).
-CHKJ2500.ejbFind.bb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 12.2.5).
-
-CHKJ2407.bb.i.ejb20=CHKJ2407W: {0} must return {1} or a collection thereof (EJB 2.0: 12.2.5).
-CHKJ2407.bb.m.ejb20=CHKJ2407W: This method must return {0} or a collection thereof (EJB 2.0: 12.2.5).
-
-CHKJ2503.ejbFind.bb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-CHKJ2503.ejbFind.bb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-
-CHKJ2498.bb.i.ejb20=CHKJ2498W: {0} must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2498.bb.m.ejb20=CHKJ2498W: This method must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-
-
-#
-# methods which must not exist
-#
-CHKJ2502.ejbFind.cb.i.ejb20=CHKJ2502I: {0} must not exist. The container provides this method implementation (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2502.ejbFind.cb.m.ejb20=CHKJ2502I: This method must not exist. The container provides this method implementation (EJB 2.0: 10.5.2, 10.6.2).
-
-CHKJ2502.ejbSelect.bb.i.ejb20=CHKJ2502I: {0} must not exist. Only CMP beans may have ejbSelect methods (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.bb.m.ejb20=CHKJ2502I: This method must not exist. Only CMP beans may have ejbSelect methods (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.sfb.i.ejb20=CHKJ2502I: {0} must not exist. Only CMP beans may have ejbSelect methods (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.sfb.m.ejb20=CHKJ2502I: This method must not exist. Only CMP beans may have ejbSelect methods (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.ssb.i.ejb20=CHKJ2502I: {0} must not exist. Only CMP beans may have ejbSelect methods (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.ssb.m.ejb20=CHKJ2502I: This method must not exist. Only CMP beans may have ejbSelect methods (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.crh.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crh.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 10.5.2, 10.5.7).
-
-# finalize
-CHKJ2502.finalize.cb.i.ejb20=CHKJ2502I: finalize() must not exist (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.cb.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.mb.i.ejb20=CHKJ2502I: finalize() must not exist (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.mb.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.bb.i.ejb20=CHKJ2502I: finalize() must not exist (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.bb.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.sb.i.ejb20=CHKJ2502I: finalize() must not exist (EJB 2.0: 7.10.2).
-CHKJ2502.finalize.sb.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 7.10.2).
-
-CHKJ2502.slh.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 7.10.8).
-CHKJ2502.slh.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 7.10.8).
-CHKJ2502.srh.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 7.10.6).
-CHKJ2502.srh.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 7.10.6).
-
-
-# business
-CHKJ2411.sb.i.ejb20=CHKJ2411W: The name of method {0} must not start with "ejb" (EJB 2.0: 7.10.4).
-CHKJ2411.cb.i.ejb20=CHKJ2411W: The name of method {0} must not start with "ejb" (EJB 2.0: 10.6.8).
-CHKJ2411.bb.i.ejb20=CHKJ2411W: The name of method {0} must not start with "ejb" (EJB 2.0: 12.2.7).
-CHKJ2411.sb.m.ejb20=CHKJ2411W: This method name must not start with "ejb" (EJB 2.0: 7.10.4).
-CHKJ2411.cb.m.ejb20=CHKJ2411W: This method name must not start with "ejb" (EJB 2.0: 10.6.8).
-CHKJ2411.bb.m.ejb20=CHKJ2411W: This method name must not start with "ejb" (EJB 2.0: 12.2.7).
-
-CHKJ2441.sb.i.ejb20=CHKJ2441W: {0} must be public (EJB 2.0: 7.10.4).
-CHKJ2441.cb.i.ejb20=CHKJ2441W: {0} must be public (EJB 2.0: 10.6.8).
-CHKJ2441.bb.i.ejb20=CHKJ2441W: {0} must be public (EJB 2.0: 12.2.7).
-CHKJ2441.sb.m.ejb20=CHKJ2441W: This method must be public (EJB 2.0: 7.10.4).
-CHKJ2441.cb.m.ejb20=CHKJ2441W: This method must be public (EJB 2.0: 10.6.8).
-CHKJ2441.bb.m.ejb20=CHKJ2441W: This method must be public (EJB 2.0: 12.2.7).
-
-CHKJ2442.sb.i.ejb20=CHKJ2442W: {0} must not be final (EJB 2.0: 7.10.4).
-CHKJ2442.cb.i.ejb20=CHKJ2442W: {0} must not be final (EJB 2.0: 10.6.8).
-CHKJ2442.bb.i.ejb20=CHKJ2442W: {0} must not be final (EJB 2.0: 12.2.7).
-CHKJ2442.sb.m.ejb20=CHKJ2442W: This method must not be final (EJB 2.0: 7.10.4).
-CHKJ2442.cb.m.ejb20=CHKJ2442W: This method must not be final (EJB 2.0: 10.6.8).
-CHKJ2442.bb.m.ejb20=CHKJ2442W: This method must not be final (EJB 2.0: 12.2.7).
-
-CHKJ2443.sb.i.ejb20=CHKJ2443W: {0} must not be static (EJB 2.0: 7.10.4).
-CHKJ2443.cb.i.ejb20=CHKJ2443W: {0} must not be static (EJB 2.0: 10.6.8).
-CHKJ2443.bb.i.ejb20=CHKJ2443W: {0} must not be static (EJB 2.0: 12.2.7).
-CHKJ2443.sb.m.ejb20=CHKJ2443W: This method must not be static (EJB 2.0: 7.10.4).
-CHKJ2443.cb.m.ejb20=CHKJ2443W: This method must not be static (EJB 2.0: 10.6.8).
-CHKJ2443.bb.m.ejb20=CHKJ2443W: This method must not be static (EJB 2.0: 12.2.7).
-
-CHKJ2500.bus.sb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 12.2.7).
-CHKJ2500.bus.sb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 12.2.7).
-
-CHKJ2503.bus.sb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-CHKJ2503.bus.sb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-
-# onMessage
-CHKJ2503.onMessage.mb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-CHKJ2503.onMessage.mb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-
-CHKJ2445.mb.i.ejb20=CHKJ2445W: {0} must be public (EJB 2.0: 15.7.4).
-CHKJ2445.mb.m.ejb20=CHKJ2445W: This method must be public (EJB 2.0: 15.7.4).
-
-CHKJ2446.mb.i.ejb20=CHKJ2446W: {0} must not be final (EJB 2.0: 15.7.4).
-CHKJ2446.mb.m.ejb20=CHKJ2446W: This method must not be final (EJB 2.0: 15.7.4).
-
-CHKJ2447.mb.i.ejb20=CHKJ2447W: {0} must not be static (EJB 2.0: 15.7.4).
-CHKJ2447.mb.m.ejb20=CHKJ2447W: This method must not be static (EJB 2.0: 15.7.4).
-
-CHKJ2505.onMessage.mb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 15.7.4).
-CHKJ2505.onMessage.mb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 15.7.4).
-
-# accessor method
-CHKJ2449.cb.i.ejb20=CHKJ2449W: {0} must be public (EJB 2.0: 10.3.1).
-CHKJ2449.cb.m.ejb20=CHKJ2449W: This method must be public (EJB 2.0: 10.3.1).
-
-CHKJ2450.cb.i.ejb20=CHKJ2450W: {0} must be abstract (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2450.cb.m.ejb20=CHKJ2450W: This method must be abstract (EJB 2.0: 10.3.1, 10.6.2).
-
-# get & set methods of cmr fields
-CHKJ2473.crc.i.ejb20=CHKJ2473W: {0} must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crc.m.ejb20=CHKJ2473W: This method must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.i.ejb20=CHKJ2473W: {0} must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.m.ejb20=CHKJ2473W: This method must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# home
-CHKJ2461.home.brh.ejb20=CHKJ2461W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 12.2.9).
-CHKJ2461.home.crh.ejb20=CHKJ2461W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 10.6.10).
-CHKJ2461.home.srh.ejb20=CHKJ2461W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 7.10.6).
-
-CHKJ2462.clh.i.ejb20=CHKJ2462I: The name of method {0} must not start with "create" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.i.ejb20=CHKJ2462I: The name of method {0} must not start with "create" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.i.ejb20=CHKJ2462I: The name of method {0} must not start with "create" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.i.ejb20=CHKJ2462I: The name of method {0} must not start with "create" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2462.clh.m.ejb20=CHKJ2462I: This method name must not start with "create" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.m.ejb20=CHKJ2462I: This method name must not start with "create" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.m.ejb20=CHKJ2462I: This method name must not start with "create" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.m.ejb20=CHKJ2462I: This method name must not start with "create" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2463.clh.i.ejb20=CHKJ2463I: The name of method {0} must not start with "find" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.i.ejb20=CHKJ2463I: The name of method {0} must not start with "find" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.i.ejb20=CHKJ2463I: The name of method {0} must not start with "find" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.i.ejb20=CHKJ2463I: The name of method {0} must not start with "find" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2463.clh.m.ejb20=CHKJ2463I: This method name must not start with "find" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.m.ejb20=CHKJ2463I: This method name must not start with "find" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.m.ejb20=CHKJ2463I: This method name must not start with "find" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.m.ejb20=CHKJ2463I: This method name must not start with "find" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2464.clh.i.ejb20=CHKJ2464I: The name of method {0} must not start with "remove" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.i.ejb20=CHKJ2464I: The name of method {0} must not start with "remove" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.i.ejb20=CHKJ2464I: The name of method {0} must not start with "remove" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.i.ejb20=CHKJ2464I: The name of method {0} must not start with "remove" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2464.clh.m.ejb20=CHKJ2464I: This method name must not start with "remove" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.m.ejb20=CHKJ2464I: This method name must not start with "remove" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.m.ejb20=CHKJ2464I: This method name must not start with "remove" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.m.ejb20=CHKJ2464I: This method name must not start with "remove" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2503.home.brh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.home.brh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-
-# create
-CHKJ2503.create.brh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.create.brh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2467.srh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 7.10.6).
-CHKJ2467.slh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 7.10.8).
-CHKJ2467.crh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2467.srh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 7.10.6).
-CHKJ2467.slh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 7.10.8).
-CHKJ2467.crh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2402.sfrh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2402.sfrh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2476.srh.i.ejb20=CHKJ2476E: {0} must be the create() method (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.i.ejb20=CHKJ2476E: {0} must be the create() method (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.srh.m.ejb20=CHKJ2476E: This method must be the create() method (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.m.ejb20=CHKJ2476E: This method must be the create() method (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.ssb.i.ejb20=CHKJ2476E: {0} must be the ejbCreate() method (EJB 2.0: 7.8).
-CHKJ2476.ssb.m.ejb20=CHKJ2476E: This method must be the ejbCreate() method (EJB 2.0: 7.8).
-
-
-# remote create
-CHKJ2504.create.srh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 12.2.11).
-CHKJ2504.create.srh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 12.2.11).
-
-CHKJ2500.create.srh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.create.srh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-
-# home method
-CHKJ2504.home.crh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 12.2.11).
-CHKJ2504.home.crh.m.ejb20=CHKJ2504W: The {0} method must exist on {1} (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.m.ejb20=CHKJ2504W: The {0} method must exist on {1} (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.m.ejb20=CHKJ2504W: The {0} method must exist on {1} (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.m.ejb20=CHKJ2504W: The {0} method must exist on {1} (EJB 2.0: 12.2.11).
-
-
-# find method
-CHKJ2503.find.brh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.find.brh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2477.crh.i.ejb20=CHKJ2477W: {0} must throw javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.i.ejb20=CHKJ2477W: {0} must throw javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.i.ejb20=CHKJ2477W: {0} must throw javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.i.ejb20=CHKJ2477W: {0} must throw javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2477.crh.m.ejb20=CHKJ2477W: This method must throw javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.m.ejb20=CHKJ2477W: This method must throw javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.m.ejb20=CHKJ2477W: This method must throw javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.m.ejb20=CHKJ2477W: This method must throw javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12).
-
-CHKJ2478.crh.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.crh.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.brh.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.brh.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.cb.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.cb.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.bb.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.bb.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-
-CHKJ2403.brh.i.ejb20=CHKJ2403W: {0} must return {1} or a collection thereof (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.i.ejb20=CHKJ2403W: {0} must return {1} or a collection thereof (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.i.ejb20=CHKJ2403W: {0} must return {1} or a collection thereof (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.i.ejb20=CHKJ2403W: {0} must return {1} or a collection thereof (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-CHKJ2403.brh.m.ejb20=CHKJ2403W: This method must return {0} or a collection thereof (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.m.ejb20=CHKJ2403W: This method must return {0} or a collection thereof (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.m.ejb20=CHKJ2403W: This method must return {0} or a collection thereof (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.m.ejb20=CHKJ2403W: This method must return {0} or a collection thereof (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-
-# remote find
-CHKJ2504.find.brh.i.ejb20=CHKJ2504W: {1} must exist on {2} for {0} (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.i.ejb20=CHKJ2504W: {1} must exist on {2} for {0} (EJB 2.0: 10.6.10).
-CHKJ2504.find.brh.m.ejb20=CHKJ2504W: {0} must exist on {1} (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.m.ejb20=CHKJ2504W: {0} must exist on {1} (EJB 2.0: 10.6.10).
-
-# local find
-CHKJ2504.find.blh.i.ejb20=CHKJ2504W: {1} must exist on {2} for {0} (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.i.ejb20=CHKJ2504W: {1} must exist on {2} for {0} (EJB 2.0: 10.6.2).
-CHKJ2504.find.blh.m.ejb20=CHKJ2504W: {0} must exist on {1} (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.m.ejb20=CHKJ2504W: {0} must exist on {1} (EJB 2.0: 10.6.2).
-
-
-CHKJ2500.find.srh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.find.srh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2495.clh.i.ejb20=CHKJ2495I: {0} must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.clh.m.ejb20=CHKJ2495I: This method must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.i.ejb20=CHKJ2495I: {0} must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.m.ejb20=CHKJ2495I: This method must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-
-
-# method on a component interface
-CHKJ2503.bus.src.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6).
-CHKJ2503.bus.src.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6).
-
-# method on a home interface
-CHKJ2465.brh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 12.2.9).
-CHKJ2465.blh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 12.2.11).
-CHKJ2465.crh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 10.6.10).
-CHKJ2465.clh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 10.6.12).
-CHKJ2465.srh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 7.10.6).
-CHKJ2465.slh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 7.10.8).
-CHKJ2465.brh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 12.2.9).
-CHKJ2465.blh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 12.2.11).
-CHKJ2465.crh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 10.6.10).
-CHKJ2465.clh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 10.6.12).
-CHKJ2465.srh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 7.10.6).
-CHKJ2465.slh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 7.10.8).
-
-# method on a remote home
-CHKJ2500.home.srh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.home.srh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2466.src.i.ejb20=CHKJ2466I: {0} must not expose the {1} type (EJB 2.0: 7.10.5).
-CHKJ2466.crh.i.ejb20=CHKJ2466I: {0} must not expose the {1} type (EJB 2.0: 10.6.10).
-CHKJ2466.brh.i.ejb20=CHKJ2466I: {0} must not expose the {1} type (EJB 2.0: 12.2.9).
-CHKJ2466.crh.m.ejb20=CHKJ2466I: This method must not expose the {0} type (EJB 2.0: 10.6.10).
-CHKJ2466.brh.m.ejb20=CHKJ2466I: This method must not expose the {0} type (EJB 2.0: 12.2.9).
-CHKJ2466.src.m.ejb20=CHKJ2466I: This method must not expose the {0} type (EJB 2.0: 7.10.5).
-
-# method on a remote component
-CHKJ2468.src.ejb20=CHKJ2468W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 7.10.5).
-CHKJ2468.crc.ejb20=CHKJ2468W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 10.6.9).
-CHKJ2468.brc.ejb20=CHKJ2468W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 12.2.8).
-
-CHKJ2500.bus.src.i.ejb20=CHKJ2500I: {0} in method {1} must be serializable at runtime (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.i.ejb20=CHKJ2500I: {0} in method {1} must be serializable at runtime (EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.i.ejb20=CHKJ2500I: {0} in method {1} must be serializable at runtime (EJB 2.0: 12.2.8).
-CHKJ2500.bus.src.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 12.2.8).
-
-CHKJ2472.srh.i.ejb20=CHKJ2472W: {1} in method {0} cannot be an argument or result type (EJB 2.0: 6.7.2).
-CHKJ2472.brc.i.ejb20=CHKJ2472W: {0} must not pass {1} as an argument or result (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.i.ejb20=CHKJ2472W: {0} must not pass {1} as an argument or result (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.brc.m.ejb20=CHKJ2472W: This method must not pass {0} as an argument or result (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.m.ejb20=CHKJ2472W: This method must not pass {0} as an argument or result (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.srh.m.ejb20=CHKJ2472W: {0} cannot be an argument or result type (EJB 2.0: 6.7.2).
-
-# method on a remote component CMP
-CHKJ2474.crc.i.ejb20=CHKJ2474W: {0} must not expose {1} (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2474.crc.m.ejb20=CHKJ2474W: This method must not expose {0} (EJB 2.0: 10.3.1, 10.3.10.1).
-
-CHKJ2490.crc.i.ejb20=CHKJ2490W: {0} must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-CJKJ2490.crc.m.ejb20=CHKJ2490W: This method must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# ejbSelect method
-CHKJ2485.cb.i.ejb20=CHKJ2485W: {0} must be abstract (EJB 2.0: 10.5.7, 10.6.7).
-CHKJ2485.cb.m.ejb20=CHKJ2485W: This method must be abstract (EJB 2.0: 10.5.7, 10.6.7).
-
-CHKJ2487.cb.i.ejb20=CHKJ2487W: {0} must be public (EJB 2.0: 10.6.7).
-CHKJ2487.cb.m.ejb20=CHKJ2487W: This method must be public (EJB 2.0: 10.6.7).
-
-CHKJ2488.cb.i.ejb20=CHKJ2488W: {0} must throw javax.ejb.FinderException (EJB 2.0: 10.6.7).
-CHKJ2488.cb.m.ejb20=CHKJ2488W: This method must throw javax.ejb.FinderException (EJB 2.0: 10.6.7).
-
-CHKJ2486.cb.i.ejb20=CHKJ2486W: {0} must return {1} or a collection thereof (EJB 2.0: 10.5.7, 11.2.2).
-CHKJ2486.cb.m.ejb20=CHKJ2486W: This method must return {0} or a collection thereof (EJB 2.0: 10.5.7, 11.2.2).
-
-CHKJ2496.cb.i.ejb20=CHKJ2496W: {0} must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.7, 10.6.14).
-CHKJ2496.cb.m.ejb20=CHKJ2496W: This method must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.7, 10.6.14).
-
-# component matching method
-CHKJ2023.src.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 7.10.5).
-CHKJ2023.slc.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 7.10.7).
-CHKJ2023.brc.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 12.2.8).
-CHKJ2023.blc.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 12.2.10).
-CHKJ2023.crc.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 10.6.9).
-CHKJ2023.clc.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 10.6.11).
-CHKJ2023.src.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 7.10.5).
-CHKJ2023.slc.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 7.10.7).
-CHKJ2023.brc.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 12.2.8).
-CHKJ2023.blc.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 12.2.10).
-CHKJ2023.crc.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 10.6.9).
-CHKJ2023.clc.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 10.6.11).
-
-CHKJ2470.src.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 7.10.5).
-CHKJ2470.slc.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 7.10.7).
-CHKJ2470.crc.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 10.6.9).
-CHKJ2470.clc.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 10.6.11).
-CHKJ2470.brc.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 12.2.8).
-CHKJ2470.blc.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 12.2.10).
-CHKJ2470.src.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 7.10.5).
-CHKJ2470.slc.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 7.10.7).
-CHKJ2470.crc.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 10.6.9).
-CHKJ2470.clc.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 10.6.11).
-CHKJ2470.brc.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 12.2.8).
-CHKJ2470.blc.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 12.2.10).
-
-CHKJ2471.src.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 7.10.5).
-CHKJ2471.slc.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 7.10.7).
-CHKJ2471.crc.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 10.6.9).
-CHKJ2471.clc.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 10.6.11).
-CHKJ2471.brc.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 12.2.8).
-CHKJ2471.blc.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 12.2.10).
-CHKJ2471.src.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 7.10.5).
-CHKJ2471.slc.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 7.10.7).
-CHKJ2471.crc.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 10.6.9).
-CHKJ2471.clc.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 10.6.11).
-CHKJ2471.brc.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 12.2.8).
-CHKJ2471.blc.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 12.2.10).
-
-# EJBObject, EJBLocalObject methods
-CHKJ2469.src.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 6.5).
-CHKJ2469.slc.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 6.5).
-CHKJ2469.crc.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 9.9).
-CHKJ2469.clc.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 9.10).
-CHKJ2469.brc.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 9.9).
-CHKJ2469.blc.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 9.10).
-CHKJ2469.src.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 6.5).
-CHKJ2469.slc.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 6.5).
-CHKJ2469.crc.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 9.9).
-CHKJ2469.clc.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 9.10).
-CHKJ2469.brc.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 9.9).
-CHKJ2469.blc.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 9.10).
-
-# findByPrimaryKey
-CHKJ2475.crh.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.brh.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2475.crh.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.brh.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 12.2.11).
-
-CHKJ2479.crh.i.ejb20=CHKJ2479E: {0} must return {1} (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.i.ejb20=CHKJ2479E: {0} must return {1} (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.i.ejb20=CHKJ2479E: {0} must return {1} (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.i.ejb20=CHKJ2479E: {0} must return {1} (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2479.crh.m.ejb20=CHKJ2479E: This method must return {0} (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.m.ejb20=CHKJ2479E: This method must return {0} (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.m.ejb20=CHKJ2479E: This method must return {0} (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.m.ejb20=CHKJ2479E: This method must return {0} (EJB 2.0: 9.6.2, 12.2.11).
-
-
-
-##################################################
-# field checks
-##################################################
-CHKJ2452.sb.i.ejb20=CHKJ2452W: Transient field {0} should not be the {1} type (EJB 2.0: 7.4.1).
-CHKJ2452.sb.m.ejb20=CHKJ2452W: A transient field should not be the {0} type (EJB 2.0: 7.4.1).
-
-CHKJ2453.sb.i.ejb20=CHKJ2453W: Transient fields ({0}) are discouraged (EJB 2.0: 7.4.1).
-CHKJ2453.sb.m.ejb20=CHKJ2453W: Transient fields are discouraged (EJB 2.0: 7.4.1).
-
-# CMR and CMP fields must NOT be defined on the bean class.
-CHKJ2454.cb.i.ejb20=CHKJ2454W: {0} must not be defined (EJB 2.0: 10.3.1).
-CHKJ2454.cb.m.ejb20=CHKJ2454W: {0} must not be defined (EJB 2.0: 10.3.1).
-
-CHKJ2480.cb.i.ejb20=CHKJ2480I: {0} must begin with a lowercase letter (EJB 2.0: 10.3.1).
-CHKJ2480.cb.m.ejb20=CHKJ2480I: {0} must begin with a lowercase letter (EJB 2.0: 10.3.1).
-
-CHKJ2481.cb.i.ejb20=CHKJ2481W: {0} must be declared as a <cmp-field> (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2481.cb.m.ejb20=CHKJ2481W: {0} must be declared as a <cmp-field> (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2482.cb.i.ejb20=CHKJ2482W: {0} must be declared as a <cmr-field> (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2482.cb.m.ejb20=CHKJ2482W: {0} must be declared as a <cmr-field> (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2483.cb.i.ejb20=CHKJ2483W: {0} should not be exposed (EJB 2.0: 10.3.1).
-CHKJ2483.cb.m.ejb20=CHKJ2483W: {0} should not be exposed (EJB 2.0: 10.3.1).
-
-CHKJ2484.cb.i.ejb20=CHKJ2484W: {0} must be either a primitive or a serializable type (EJB 2.0: 10.3.1).
-CHKJ2484.cb.m.ejb20=CHKJ2484W: {0} must be either a primitive or a serializable type (EJB 2.0: 10.3.1).
-
-CHKJ2489.cb.i.ejb20=CHKJ2489W: Field {0} must be the {1} type (EJB 2.0: 10.8.1).
-CHKJ2489.cb.m.ejb20=CHKJ2489W: This field must be the {0} type (EJB 2.0: 10.8.1).
-
-CHKJ2205.kc.i.ejb20=CHKJ2205W: Field {0} must be public (EJB 2.0: 10.8.2).
-CHKJ2205.kc.m.ejb20=CHKJ2205W: This field must be public (EJB 2.0: 10.8.2).
-
-CHKJ2206.kc.i.ejb20=CHKJ2206W: Field {0} must be a <cmp-field> (EJB 2.0: 10.8.2).
-CHKJ2206.kc.m.ejb20=CHKJ2206W: This field must be a <cmp-field> (EJB 2.0: 10.8.2).
-
-
-############################################################
-## DD
-############################################################
-CHKJ2880.s.ejb20=CHKJ2880W: This bean must provide a <local-home> (EJB 2.0: 7.10.1).
-CHKJ2881.s.ejb20=CHKJ2881W: This bean must provide a <home> (EJB 2.0: 7.10.1).
-CHKJ2882.s.ejb20=CHKJ2882W: This bean must provide a <local> (EJB 2.0: 7.10.1).
-CHKJ2883.s.ejb20=CHKJ2883W: This bean must provide a <remote> (EJB 2.0: 7.10.1).
-CHKJ2884.s.ejb20=CHKJ2884W: This bean must provide either a <local-home> or a <home> (EJB 2.0: 7.10.1).
-CHKJ2885.s.ejb20=CHKJ2885W: This bean must provide either a <local> or a <remote> (EJB 2.0: 7.10.1).
-CHKJ2880.c.ejb20=CHKJ2880W: This bean must provide a <local-home> (EJB 2.0: 10.6.1).
-CHKJ2881.c.ejb20=CHKJ2881W: This bean must provide a <home> (EJB 2.0: 10.6.1).
-CHKJ2882.c.ejb20=CHKJ2882W: This bean must provide a <local> (EJB 2.0: 10.6.1).
-CHKJ2883.c.ejb20=CHKJ2883W: This bean must provide a <remote> (EJB 2.0: 10.6.1).
-CHKJ2884.c.ejb20=CHKJ2884W: This bean must provide either a <local-home> or a <home> (EJB 2.0: 10.6.1).
-CHKJ2885.c.ejb20=CHKJ2885W: This bean must provide either a <local> or a <remote> (EJB 2.0: 10.6.1).
-CHKJ2880.b.ejb20=CHKJ2880W: This bean must provide a <local-home> (EJB 2.0: 12.2.1).
-CHKJ2881.b.ejb20=CHKJ2881W: This bean must provide a <home> (EJB 2.0: 12.2.1).
-CHKJ2882.b.ejb20=CHKJ2882W: This bean must provide a <local> (EJB 2.0: 12.2.1).
-CHKJ2883.b.ejb20=CHKJ2883W: This bean must provide a <remote> (EJB 2.0: 12.2.1).
-CHKJ2884.b.ejb20=CHKJ2884W: This bean must provide either a <local-home> or a <home> (EJB 2.0: 12.2.1).
-CHKJ2885.b.ejb20=CHKJ2885W: This bean must provide either a <local> or a <remote> (EJB 2.0: 12.2.1).
-
-CHKJ2813.ejb20=CHKJ2813I: <ejb-name> {0} must be a valid Java identifier (EJB 2.0: 10.3.13, 11.2.6.1).
-CHKJ2819.ejb20=CHKJ2819I: <abstract-schema-name> {0} must be a valid Java identifier (EJB 2.0: 10.3.13, 10.6.14, 11.2.6.1).
-CHKJ2854.ejb20=CHKJ2854E: <abstract-schema-name> {0} must be unique within the ejb-jar.xml file (EJB 2.0: 10.3.13, 10.6.14, 11.2.2).
-CHKJ2858.ejb20=CHKJ2858W: <abstract-schema-name> must exist (EJB 2.0: 22.2, 22.5).
-CHKJ2859.ejb20=CHKJ2859W: Reserved identifier {0} cannot be used as an <ejb-name> (EJB 2.0: 10.6.14, 11.2.6.1).
-CHKJ2860.ejb20=CHKJ2860W: Reserved identifier {0} cannot be used as an <abstract-schema-name> (EJB 2.0: 10.6.14, 11.2.6.1).
-
-CHKJ2861.ejb20=CHKJ2861I: <cmp-field> {0} must be a valid Java identifier and begin with a lowercase letter (EJB 2.0: 10.3.1, 11.2.6.1).
-CHKJ2857.ejb20=CHKJ2857I: <cmr-field> {0} must be a valid Java identifier and begin with a lowercase letter (EJB 2.0: 10.3.1, 11.2.6.1).
-
-CHKJ2862.ejb20=CHKJ2862I: <cmp-field> {0} must have a set method (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2863.ejb20=CHKJ2863I: <cmp-field> {0} must have a get method (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2864.ejb20=CHKJ2864I: <cmr-field> {0} must have a set method (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2865.ejb20=CHKJ2865I: <cmr-field> {0} must have a get method (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2855.ejb20=CHKJ2855I: <cmp-field> {0} must be a Java primitive or a Java serializable type (EJB 2.0: 10.3.1).
-CHKJ2856.ejb20=CHKJ2856I: <cmr-field> {0} must be the {1} type or a collection thereof (EJB 2.0: 10.3.1).
-
-CHKJ2815.ejb20=CHKJ2815W: Dependent value class {0} cannot be a <cmr-field> (EJB 2.0: 10.3.3).
-
-CHKJ2816.ejb20=CHKJ2816I: <ejb-relation-name> must be unique in ejb-jar.xml (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2817.ejb20=CHKJ2817I: <ejb-relationship-role-name> must be unique within an <ejb-relation> (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2818.ejb20=CHKJ2818I: The value of the <multiplicity> element must be either "One" or "Many" (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2821.ejb20=CHKJ2821I: <relationship-role-source> in role {0} must refer to an existing CMP bean (EJB 2.0: 10.3.2, 22.5).
-CHKJ2848.ejb20=CHKJ2848I: <cascade-delete> must be used with a <multiplicity> of "One" (EJB 2.0: 10.3.4.2, 22.5).
-CHKJ2866.ejb20=CHKJ2866I: <cmr-field> {0} must be defined on {1} (EJB 2.0: 10.3.2, 22.5).
-CHKJ2867.ejb20=CHKJ2867I: This bean can have only unidirectional relationships to other beans (EJB 2.0: 10.3.2).
-CHKJ2868.ejb20=CHKJ2868I: The value of the <cmr-field-type> element must be either "java.util.Collection" or "java.util.Set" (EJB 2.0: 10.3.13, 22.5).
-CHKJ2869.ejb20=CHKJ2869I: At least one <ejb-relationship-role> must define a <cmr-field> (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2870.ejb20=CHKJ2870I: <ejb-name> {0} must exist (EJB 2.0: 10.3.13).
-CHKJ2871.ejb20=CHKJ2871I: <ejb-name> {0} must refer to a CMP bean (EJB 2.0: 10.3.2, 10.3.13).
-
-CHKJ2872.ejb20=CHKJ2872E: The value of the <cmp-version> element must be either "1.x" or "2.x" (EJB 2.0: 22.5).
-CHKJ2873.ejb20=CHKJ2873W: Migrate this bean's datasource binding to a CMP Connection Factory binding.
-CHKJ2874.ejb20=CHKJ2874W: Migrate this EJB module's default datasource binding to a default CMP Connection Factory binding.
-
-CHKJ2886.ejb21=CHKJ2885E: Duplicate activation config: "{0}" exist in message driven bean: "{1}".
-CHKJ2887.ejb21=The activation config with name: "{0}" has invalid value: "{1}" for message driven bean: "{2}".
-CHKJ2890.ejb21=The message destination type: "{0}" and destination type activation config property value: "{1}" do not match for bean: "{2}".
-###########################################################################
-#
-# 2TC: Do not translate anything in the following section. These strings
-# are reserved for future use.
-#
-###########################################################################
-#
-# Ignore these messages for now; the EJB QL validator may take care of this.
-# If not, add this validation into the EJBJarVRule class.
-#
-#
-# Identification variables
-#
-# IWAD4927.ejb20=IWAD4927W: Identification variable {0} must be declared in the FROM clause (EJB 2.0: 11.2.6.2).
-# IWAD4928.ejb20=IWAD4928W: Reserved identifier {0} cannot be used as an identification variable (EJB 2.0: 11.2.6.2).
-# IWAD4929.ejb20=IWAD4929W: <abstract-schema-name> {0} cannot be used as an identification variable (EJB 2.0: 11.2.6.2).
-# IWAD4930.ejb20=IWAD4930W: <ejb-name> {0} cannot be used as an identification variable (EJB 2.0: 11.2.6.2).
-
-#
-# query statement
-#
-# IWAD4918.ejb20=IWAD4918W: This query must contain a SELECT clause (EJB 2.0: 11.1).
-# IWAD4919.ejb20=IWAD4919W: This query must contain a FROM clause (EJB 2.0: 11.1).
-# IWAD4920.ejb20=IWAD4920W: This query has a syntax error (EJB 2.0: 11.2).
-#
-
-
-# IWAD4808.ejb20=IWAD4808W: This bean must use container-managed transaction demarcation (EJB 2.0: 17.3.1, 17.3.3).
-# IWAD4809.ejb20=IWAD4809W: Specify a transaction attribute for this method (EJB 2.0: 17.4.1).
-# IWAD4810.ejb20=IWAD4810W: A transaction attribute must not exist for this method (EJB 2.0: 17.4.1).
-
-# IWAD4811.ejb20=IWAD4811W: At least one <method> must exist in a <container-transaction> (EJB 2.0: 17.4.1).
-# IWAD4900.ejb20=IWAD4900W: This <container-transaction> must reference only one bean (EJB 2.0: 17.4.1).
-# IWAD4901.ejb20=IWAD4901W: {0} must exist (EJB 2.0: 17.4.1)
-# IWAD4815.ejb20=IWAD4815W: No methods on {0} match this <method> (EJB 2.0: 17.4.1).
-# IWAD4817.ejb20=IWAD4817W: <trans-attribute> is unknown (EJB 2.0: 17.4.1).
-# IWAD4818.ejb20=IWAD4818W: Only one Style 1 <container-transaction> may exist for {0} (EJB 2.0: 17.4.1).
-# IWAD4819.ejb20=IWAD4819W: Only one Style 2 <container-transaction> may exist for {0} (EJB 2.0: 17.4.1).
-# IWAD4820.ejb20=IWAD4820W: At least one <method-param> must exist in a <method-params>.
-
-# IWAD4821.ejb20=IWAD4821W: <env-entry-value> must be a {0} (EJB 2.0: 20.2.1.2, 22.5).
-# IWAD4822.ejb20=IWAD4822W: <env-entry-name> must exist (EJB 2.0: 20.2.1.2, 22.5).
-# IWAD4823.ejb20=IWAD4823W: <env-entry-type> must exist (EJB 2.0: 20.2.1.2, 22.5).
-# IWAD4824.ejb20=IWAD4824W: <env-entry-name> must be unique within {0} (EJB 2.0: 20.2.1.2).
-# IWAD4825.ejb20=IWAD4825W: <env-entry-type> must be a legal type (EJB 2.0: 20.2.1.2, 22.5).
-# IWAD4826.ejb20=IWAD4826W: <env-entry-value> must be a String or a character (EJB 2.0: 20.2.1.2).
-
-# IWAD4828.ejb20=IWAD4828W: Conventionally this reference is located in the "ejb" subcontext (EJB 2.0: 20.3.1.1, 22.5).
-# IWAD4829.ejb20=IWAD4829W: This <env-entry> should be in an <ejb-ref> (EJB 2.0: 20.3.1.2).
-# IWAD4830.ejb20=IWAD4830W: This <env-entry> should be in an <ejb-local-ref> (EJB 2.0: 20.3.1.2).
-# IWAD4831.ejb20=IWAD4831W: <ejb-ref-type> must be {0} (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4832.ejb20=IWAD4832W: <ejb-ref> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4833.ejb20=IWAD4833W: <ejb-local-ref> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4834.ejb20=IWAD4834W: <home> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4835.ejb20=IWAD4835W: <local-home> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4836.ejb20=IWAD4836W: <remote> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4837.ejb20=IWAD4837W: <local-remote> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4838.ejb20=IWAD4838W: <ejb-ref> must be unique within {0} (EJB 2.0: 20.3.1.2).
-# IWAD4839.ejb20=IWAD4839W: <ejb-local-ref> must be unique within {0} (EJB 2.0: 20.3.1.2).
-# IWAD4840.ejb20=IWAD4840W: <home> {0} is not used by bean {1} (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4841.ejb20=IWAD4841W: <remote> {0} is not used by bean {1} (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4842.ejb20=IWAD4842W: <ejb-link> must exist (EJB 2.0: 20.3.1.2).
-
-# IWAD4843.ejb20=IWAD4843W: This <env-entry> must be a <resource-ref> (EJB 2.0: 20.4.1.2).
-# IWAD4844.ejb20=IWAD4844W: <res-ref-name> should not include the "java:com/env/" string (EJB 2.0: 20.4.1.2).
-# IWAD4845.ejb20=IWAD4845W: <res-auth> must be "Application" or "Container" (EJB 2.0: 20.4.1.2).
-# IWAD4846.ejb20=IWAD4846W: <res-sharing-scope> must be "Shareable" or "Unshareable" (EJB 2.0: 20.4.1.2).
-# IWAD4847.ejb20=IWAD4847W: <resource-ref> must be unique in bean {0} (EJB 2.0: 20.4.1.2).
-
-# IWAD4848.ejb20=IWAD4848W: Conventionally this is located in the "java:comp/env/jdbc" subcontext (EJB 2.0: 20.4.1.3, 20.5.1.1).
-# IWAD4849.ejb20=IWAD4849W: Conventionally this is located in the "java:comp/env/jms" subcontext (EJB 2.0: 20.4.1.3, 20.5.1.1).
-# IWAD4850.ejb20=IWAD4850W: Conventionally this is located in the "java:comp/env/mail" subcontext (EJB 2.0: 20.4.1.3, 20.5.1.1).
-# IWAD4851.ejb20=IWAD4851W: Conventionally this is located in the "java:comp/env/url" subcontext (EJB 2.0: 20.4.1.3, 20.5.1.1).
-
-# IWAD4852.ejb20=IWAD4852W: This <env-entry> must be a <resource-env-ref> (EJB 2.0: 20.5.1.2).
-# IWAD4853.ejb20=IWAD4853W: <resource-env-ref-name> should not include the "java:comp/env" string (EJB 2.0: 20.5.1.2).
-# IWAD4854.ejb20=IWAD4854W: A JMS Destination value must be either javax.jms.Queue or javax.jms.Topic (EJB 2.0: 20.5.1.2).
-# IWAD4855.ejb20=IWAD4855W: <resource-env-ref-name> must be unique in bean {0} (EJB 2.0: 20.5.1.2).
-
-# IWAD4856.ejb20=IWAD4856W: A <role-name> must exist (EJB 2.0: 21.2.5.3).
-# IWAD4857.ejb20=IWAD4857W: <role-name> {0} must be unique within bean {1} (EJB 2.0: 21.2.5.3).
-# IWAD4858.ejb20=IWAD4858W: A <role-name> must exist (EJB 2.0: 21.3.1).
-# IWAD4859.ejb20=IWAD4859W: <role-name> {0} must be unique within bean {1} (EJB 2.0: 21.3.1).
-# IWAD4860.ejb20=IWAD4860W: Security roles must exist (EJB 2.0: 21.3.1).
-
-# IWAD4931.ejb20=IWAD4931W: At least one <method> must exist in a <method-permission> (EJB 2.0: 21.3.2).
-# IWAD4932.ejb20=IWAD4932W: {0} must exist (EJB 2.0: 21.3.2) (EJB 2.0: 17.4.1).
-# IWAD4933.ejb20=IWAD4933W: No methods on {0} match this <method> (EJB 2.0: 21.3.2).
-# IWAD4934.ejb20=IWAD4934W: At least one <method-param> must exist in a <method-params>.
-
-# IWAD4866.ejb20=IWAD4866W: A <role-link> must exist (EJB 2.0: 21.3.3).
-# IWAD4867.ejb20=IWAD4867W: This <role-link> must not exist (EJB 2.0: 21.3.3).
-# IWAD4868.ejb20=IWAD4868W: {0} must exist (EJB 2.0: 21.3.3).
-
-# IWAD4869.ejb20=IWAD4869W: <security-identity> must be either "use-caller-identity" or "run-as" (EJB 2.0: 21.3.4).
-# IWAD4870.ejb20=IWAD4870W: <security-identity> must be "run-as" (EJB 2.0: 21.3.4).
-# IWAD4871.ejb20=IWAD4871W: Security role {0} must exist (EJB 2.0: 21.3.4.1).
-
-# IWAD4875.ejb20=IWAD4875W: <session-type> must be either "Stateful" or "Stateless" (EJB 2.0: 22.2, 22.5).
-# IWAD4876.ejb20=IWAD4876W: <transaction-type> must be either "Bean" or "Container" (EJB 2.0: 22.2, 22.5).
-# IWAD4877.ejb20=IWAD4877W: <persistence-type> must be either "Bean" or "Container" (EJB 2.0: 22.2, 22.5).
-# IWAD4879.ejb20=IWAD4879W: At least one <cmp-field> must exist (EJB 2.0: 22.2, 22.5).
-
-# IWAD4880.ejb20=IWAD4880W: <acknowledge-mode> must be either "Auto-acknowledge" or "Dups-ok-acknowledge" (EJB 2.0: 22.5).
-# IWAD4881.ejb20=IWAD4881W: <cascade-delete> must not exist (EJB 2.0: 22.5).
-# IWAD4882.ejb20=IWAD4882W: <cmp-version> must be either "1.x" or "2.x" (EJB 2.0: 22.5).
-# IWAD4883.ejb20=IWAD4883W: <cmr-field-name> must exist on {0} (EJB 2.0: 22.5).
-# IWAD4884.ejb20=IWAD4884W: <cmr-field-type> must be the same type as {0} (EJB 2.0: 22.5).
-# IWAD4885.ejb20=IWAD4885W: <cmr-field-type> must be either java.util.Collection or java.util.Set (EJB 2.0: 22.5).
-
-# IWAD4886.ejb20=IWAD4886W: <cmr-field-name> must begin with a lowercase letter (EJB 2.0: 22.5).
-# IWAD4887.ejb20=IWAD4887W: <destination-type> must be either javax.jms.Queue or javax.jms.Topic (EJB 2.0: 22.5).
-# IWAD4889.ejb20=IWAD4889W: {0} must exist (EJB 2.0: 22.5).
-# IWAD4890.ejb20=IWAD4890W: <ejb-ref-name> must be unique in bean {0} (EJB 2.0: 22.5).
-# IWAD4891.ejb20=IWAD4891W: <ejb-ref-type> must be "Entity" or "Session" (EJB 2.0: 22.5).
-
-# IWAD4862.ejb20=IWAD4862W: <result-type-mapping> must be "Remote" (EJB 2.0: 10.5.7).
-###############################################################################
-#
-# 2TC: end of messages which should not be translated
-#
-###############################################################################
-
-#
-# end of messages for the EJB 2.0 specification
-#
-
-#
-# end of validation messages
-#
-
-#
-# End EJB Validation strings
-#
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/schema/EJBCodegenHandler.exsd b/plugins/org.eclipse.jst.j2ee.ejb/schema/EJBCodegenHandler.exsd
deleted file mode 100644
index de8b3f1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/schema/EJBCodegenHandler.exsd
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.ibm.wtp.ejb">
-<annotation>
- <appInfo>
- <meta.schema plugin="com.ibm.wtp.ejb" id="EJBCodegenHandler" name="EJB Codegen Extension Handler"/>
- </appInfo>
- <documentation>
- This is a temporary extension point. Needs to be factored out more completely. Interface between was extensions, handle like 11 relationships and hierarchies
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="codegenExtensionHandler"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="codegenExtensionHandler">
- <complexType>
- <sequence>
- <element ref="run"/>
- </sequence>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="run">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/_class.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/_class.template
deleted file mode 100644
index 4248810..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/_class.template
+++ /dev/null
@@ -1,40 +0,0 @@
-<%
- if (model.isPublic()) {
-%>
-public
-<%
- }
-
- if (model.isAbstract()) {
-%>abstract
-<%
- }
-
- if (model.isFinal()) {
-%>final
-<%
- }
-%>class <%= model.getClassName() %>
-<%
- String superClass = model.getSuperclassName();
- if (superClass != null && superClass.length() > 0) {
-%> extends <%= superClass %>
-<%
- }
-
- List<String> interfaces = model.getInterfaces();
- if ( interfaces.size() > 0) {
-%> implements
-<%
- }
-
- for (int i = 0; i < interfaces.size(); i++) {
- String INTERFACE = (String) interfaces.get(i);
- if (i > 0) {
-%>,
-<%
- }
-%><%= INTERFACE %>
-<%
- }
-%> {
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/_constructors.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/_constructors.template
deleted file mode 100644
index 1b938b9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/_constructors.template
+++ /dev/null
@@ -1,31 +0,0 @@
-<%
- if (!model.hasEmptySuperclassConstructor()) {
-%>
-
- /**
- * Default constructor.
- */
- public <%= model.getClassName() %>() {
- // TODO Auto-generated constructor stub
- }
-<%
- }
-
- if (model.shouldGenSuperclassConstructors()) {
- List<Constructor> constructors = model.getConstructors();
- for (Constructor constructor : constructors) {
- if (constructor.isPublic() || constructor.isProtected()) {
-%>
-
- /**
- * @see <%= model.getSuperclassName() %>#<%= model.getSuperclassName() %>(<%= constructor.getParamsForJavadoc() %>)
- */
- public <%= model.getClassName() %>(<%= constructor.getParamsForDeclaration() %>) {
- super(<%= constructor.getParamsForCall() %>);
- // TODO Auto-generated constructor stub
- }
-<%
- }
- }
- }
-%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/_flags.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/_flags.template
deleted file mode 100644
index 7e6afd4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/_flags.template
+++ /dev/null
@@ -1,3 +0,0 @@
-<%
- model.removeFlags(CreateJavaEEArtifactTemplateModel.FLAG_QUALIFIED_SUPERCLASS_NAME);
-%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/_imports.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/_imports.template
deleted file mode 100644
index fde7b4b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/_imports.template
+++ /dev/null
@@ -1,9 +0,0 @@
-<%
- Collection<String> imports = model.getImports();
- for (String anImport : imports) {
-%>
-import <%= anImport %>;
-<%
- }
-%>
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/_methods.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/_methods.template
deleted file mode 100644
index 5fe3d10..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/_methods.template
+++ /dev/null
@@ -1,23 +0,0 @@
-<%
- if (model.shouldImplementAbstractMethods()) {
- for (Method method : model.getUnimplementedMethods()) {
-%>
-
- /**
- * @see <%= method.getContainingJavaClass() %>#<%= method.getName() %>(<%= method.getParamsForJavadoc() %>)
- */
- public <%= method.getReturnType() %> <%= method.getName() %>(<%= method.getParamsForDeclaration() %>) {
- // TODO Auto-generated method stub
-<%
- String defaultReturnValue = method.getDefaultReturnValue();
- if (defaultReturnValue != null) {
-%>
- return <%= defaultReturnValue %>;
-<%
- }
-%>
- }
-<%
- }
- }
-%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/_package.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/_package.template
deleted file mode 100644
index f279df7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/_package.template
+++ /dev/null
@@ -1,8 +0,0 @@
-<%
- if (model.getJavaPackageName() != null && model.getJavaPackageName().length() > 0) {
-%>
-package <%= model.getJavaPackageName() %>;
-<%
- }
-%>
-
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/localBusinessInterface.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/localBusinessInterface.javajet
deleted file mode 100644
index 825efcb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/localBusinessInterface.javajet
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb"
- imports="org.eclipse.jst.j2ee.ejb.internal.operations.* "
- class="LocalBusinessInterfaceTemplate"
-%>
-<% CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; %>
-<%
- if (model.getBusinessInterfaceJavaPackageName() != null && model.getBusinessInterfaceJavaPackageName().length() > 0) {
-%>
-package <%=model.getBusinessInterfaceJavaPackageName()%>;
-<%
- }
-%>
-import javax.ejb.Local;
-
-@Local
-public interface <%=model.getBusinessInterfaceClassName()%> {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/localComponentInterface.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/localComponentInterface.javajet
deleted file mode 100644
index d8289f4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/localComponentInterface.javajet
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb"
- imports="org.eclipse.jst.j2ee.ejb.internal.operations.* "
- class="LocalComponentInterfaceTemplate"
-%>
-<% CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; %>
-<%@ include file="_package.template" %>
-import javax.ejb.EJBLocalObject;
-
-public interface <%= model.getLocalComponentClassSimpleName() %> extends EJBLocalObject {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/localHomeInterface.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/localHomeInterface.javajet
deleted file mode 100644
index 5ead0e4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/localHomeInterface.javajet
+++ /dev/null
@@ -1,25 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb"
- imports="org.eclipse.jst.j2ee.ejb.internal.operations.* "
- class="LocalHomeInterfaceTemplate"
-%>
-<% CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; %>
-<%
- if (model.getLocalHomePackage() != null && model.getLocalHomePackage().length() > 0) {
-%>
-package <%=model.getLocalHomePackage()%>;
-<%
- }
-%>
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-<% if(!model.getLocalComponentPackage().equals(model.getLocalHomePackage())){%>
-import <%= model.getLocalComponentPackage()%>.<%= model.getLocalComponentClassSimpleName()%>;
-<%}%>
-
-public interface <%=model.getLocalHomeClassSimpleName()%> extends EJBLocalHome {
-
- public <%= model.getLocalComponentClassSimpleName() %> create() throws CreateException;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/messageDrivenBean.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/messageDrivenBean.javajet
deleted file mode 100644
index 462009f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/messageDrivenBean.javajet
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb"
- imports="java.util.* org.eclipse.jst.j2ee.internal.common.operations.* org.eclipse.jst.j2ee.ejb.internal.operations.*"
- class="MessageDrivenBeanTemplate"
-%>
-<% CreateMessageDrivenBeanTemplateModel model = (CreateMessageDrivenBeanTemplateModel) argument; %>
-<%@ include file="_flags.template" %>
-<%@ include file="_package.template" %>
-<%@ include file="_imports.template" %>
-<%@ include file="messageDrivenBean_classHeader.template" %>
-<%@ include file="_class.template" %>
-<%@ include file="_constructors.template" %>
-<%@ include file="_methods.template" %>
-<%
- if (model.shouldImplementAbstractMethods()) {
- Collection<Method> unimplementedMethods = model.getUnimplementedMethods();
- if (model.isJMS()) {
-%>
-
- /**
- * @see MessageListener#onMessage(Message)
- */
- public void onMessage(Message message) {
- // TODO Auto-generated method stub
-
- }
-<%
- }
- }
-%>
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/messageDrivenBean_classHeader.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/messageDrivenBean_classHeader.template
deleted file mode 100644
index dc5aef8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/messageDrivenBean_classHeader.template
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Message-Driven Bean implementation class for: <%=model.getClassName()%>
- *
- */
-@MessageDriven
-<%
- Map<String, String> params = model.getClassAnnotationParams();
- if (!params.isEmpty()) {
-%>(
-<%
- Set<String> keys = params.keySet();
- boolean needNewLine = keys.contains(CreateMessageDrivenBeanTemplateModel.ATT_ACTIVATION_CONFIG);
- boolean needComma = false;
- for (String key : keys) {
- if (needComma) {
-%>,
-<%
- if (needNewLine) {
-%>
-
-<%
- }
- }
-
- String value = params.get(key);
- if (key.equals(CreateMessageDrivenBeanTemplateModel.ATT_ACTIVATION_CONFIG)) {
-%>
- activationConfig = { @ActivationConfigProperty(
- propertyName = "destinationType", propertyValue = "<%= value %>"
- ) }
-<%
- } else {
-%><%= key %> = <%= value %>
-<%
- }
- needComma = true;
- }
-%>)
-<%
- }
-
- if (!model.isContainerType()) {
-%>
-@TransactionManagement(TransactionManagementType.BEAN)
-<%
- }
-%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteBusinessInterface.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteBusinessInterface.javajet
deleted file mode 100644
index 0e2528b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteBusinessInterface.javajet
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb"
- imports="org.eclipse.jst.j2ee.ejb.internal.operations.* "
- class="RemoteBusinessInterfaceTemplate"
-%>
-<% CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; %>
-<%
- if (model.getBusinessInterfaceJavaPackageName() != null && model.getBusinessInterfaceJavaPackageName().length() > 0) {
-%>
-package <%=model.getBusinessInterfaceJavaPackageName()%>;
-<%
- }
-%>
-import javax.ejb.Remote;
-
-@Remote
-public interface <%=model.getBusinessInterfaceClassName()%> {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteComponentInterface.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteComponentInterface.javajet
deleted file mode 100644
index fa6aebd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteComponentInterface.javajet
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb"
- imports="org.eclipse.jst.j2ee.ejb.internal.operations.* "
- class="RemoteComponentInterfaceTemplate"
-%>
-<% CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; %>
-<%@ include file="_package.template" %>
-import javax.ejb.EJBObject;
-
-public interface <%= model.getRemoteComponentClassSimpleName() %> extends EJBObject {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteHomeInterface.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteHomeInterface.javajet
deleted file mode 100644
index 50e4e98..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteHomeInterface.javajet
+++ /dev/null
@@ -1,26 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb"
- imports="org.eclipse.jst.j2ee.ejb.internal.operations.* "
- class="RemoteHomeInterfaceTemplate"
-%>
-<% CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; %>
-<%
- if (model.getRemoteHomePackage() != null && model.getRemoteHomePackage().length() > 0) {
-%>
-package <%=model.getRemoteHomePackage()%>;
-<%
- }
-%>
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-<% if(!model.getRemoteComponentPackage().equals(model.getRemoteHomePackage())){%>
-import <%= model.getRemoteComponentPackage() %>.<%= model.getRemoteComponentClassSimpleName() %>;
-<%}%>
-
-public interface <%=model.getRemoteHomeClassSimpleName()%> extends EJBHome {
-
- public <%= model.getRemoteComponentClassSimpleName() %> create() throws CreateException, RemoteException;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/sessionBean.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/sessionBean.javajet
deleted file mode 100644
index 312fda3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/sessionBean.javajet
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb"
- imports="java.util.* org.eclipse.jst.j2ee.internal.common.operations.* org.eclipse.jst.j2ee.ejb.internal.operations.*"
- class="SessionBeanTemplate"
-%>
-<% CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; %>
-<%@ include file="_flags.template" %>
-<%@ include file="_package.template" %>
-<%@ include file="_imports.template" %>
-<%@ include file="sessionBean_classHeader.template" %>
-<%@ include file="_class.template" %>
-<%@ include file="_constructors.template" %>
-<%@ include file="_methods.template" %>
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/sessionBean_classHeader.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/sessionBean_classHeader.template
deleted file mode 100644
index 3c4d445..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/sessionBean_classHeader.template
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Session Bean implementation class <%= model.getClassName() %>
- */
-<%= model.getClassAnnotation() %>
-<%
- Map<String, String> params = model.getClassAnnotationParams();
- if (!params.isEmpty()) {
-%>(
-<%
- Set<String> keys = params.keySet();
- boolean needComma = false;
- for (String key : keys) {
- if (needComma) {
-%>,
-<%
- }
-
- String value = params.get(key);
-%><%= key %> = "<%= value %>"
-<%
- needComma = true;
- }
-%>)
-<%
- }
-
- if (!model.isContainerType()) {
-%>
-@TransactionManagement(TransactionManagementType.BEAN)
-<%
- }
-
- List<BusinessInterface> localInterfaces = model.getExistingLocalBusinessInterfaces();
- if (!localInterfaces.isEmpty()) {
-%>
-@Local( {
-<%
- boolean needComma = false;
- for (BusinessInterface iface : localInterfaces) {
- if (needComma) {
-%>,
-<%
- }
-%><%= iface.getSimpleName() %>.class
-<%
- needComma = true;
- }
-%> })
-<%
- }
-
- List<BusinessInterface> remoteInterfaces = model.getExistingRemoteBusinessInterfaces();
- if (!remoteInterfaces.isEmpty()) {
-%>
-@Remote( {
-<%
- boolean needComma = false;
- for (BusinessInterface iface : remoteInterfaces) {
- if (needComma) {
-%>,
-<%
- }
-%><%= iface.getSimpleName() %>.class
-<%
- needComma = true;
- }
-%> })
-<%
- }
-
- if (model.isLocalHomeChecked()) {
-%>
-@LocalHome(<%=model.getLocalHomeClassSimpleName()%>.class)
-<%
- }
-
- if (model.isRemoteHomeChecked()) {
-%>
-@RemoteHome(<%=model.getRemoteHomeClassSimpleName()%>.class)
-<%
- }
-%>
\ No newline at end of file
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 Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.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/plugins/org.eclipse.jst.jee.ejb/.classpath b/plugins/org.eclipse.jst.jee.ejb/.classpath
deleted file mode 100644
index d4c5c7d..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="ejb"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.jee.ejb/.cvsignore b/plugins/org.eclipse.jst.jee.ejb/.cvsignore
deleted file mode 100644
index 7722bc8..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.jee.ejb/.project b/plugins/org.eclipse.jst.jee.ejb/.project
deleted file mode 100644
index ed47413..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jee.ejb</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.jee.ejb/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.jee.ejb/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 88b9b3e..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Thu May 10 18:36:33 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.jst.jee.ejb/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.ejb/META-INF/MANIFEST.MF
deleted file mode 100644
index 923db38..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jee.ejb;singleton:=true
-Bundle-Version: 1.0.200.qualifier
-Bundle-Activator: org.eclipse.jst.jee.ejb.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emf,
- org.eclipse.wst.common.emfworkbench.integration
-Eclipse-LazyStart: true
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.jst.jee.ejb,
- org.eclipse.jst.jee.model.internal,
- org.eclipse.jst.jee.model.internal.mergers
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.jee.ejb/about.html b/plugins/org.eclipse.jst.jee.ejb/about.html
deleted file mode 100644
index 0799bdb..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/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.jee.ejb/build.properties b/plugins/org.eclipse.jst.jee.ejb/build.properties
deleted file mode 100644
index 3cfb4c5..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = ejb/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- META-INF/,\
- plugin.properties,\
- about.html
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/Activator.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/Activator.java
deleted file mode 100644
index 7c18fcc..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/Activator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ejb;
-
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends WTPPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.jee.ejb"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EJB3MergedModelProvider.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EJB3MergedModelProvider.java
deleted file mode 100644
index b563950..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EJB3MergedModelProvider.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-import org.eclipse.jst.j2ee.model.IModelProviderListener;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-import org.eclipse.jst.jee.model.internal.common.AbstractMergedModelProvider;
-import org.eclipse.jst.jee.model.internal.mergers.EjbJarMerger;
-import org.eclipse.jst.jee.model.internal.mergers.ModelElementMerger;
-import org.eclipse.jst.jee.model.internal.mergers.ModelException;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * This model provider gives a "merged" view of the model loaded from the
- * deployment descriptor and from annotated java classes.
- *
- * <p>
- * A "merged" view contains all the elements that are described in the xml but
- * not with annotation.
- *
- * A "merged" view contains all the elements that are described with annotations
- * but not in the xml.
- *
- * In case of conflicts a "merged" view contains the value of the xml.
- * </p>
- *
- *
- * Listeners registered with {@link #addListener(IModelProviderListener)} will
- * receive notification for changes in the deployment descriptor and in the
- * annotations model. Notifications may come in different thread from the one
- * changing the resource.
- *
- * <p>
- * After a notification for changes in the model it is mandatory to call
- * {@link #getModelObject()} to get a new reference to the model object. A new
- * model object might have been created after processing the notification and
- * merging the views.
- * </p>
- *
- * In case there is an ejb-client-jar element in the deployment descriptor
- * EJB3MergedModelProvider will provide this information to the
- * {@link EJBAnnotationReader}.
- *
- *
- *
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class EJB3MergedModelProvider extends AbstractMergedModelProvider<EJBJar> {
-
- private IProject clientProject;
-
- public EJB3MergedModelProvider(IProject project) {
- super(project);
- }
-
- /**
- * (non-Javadoc) Synchronizing the loading of the model
- *
- * @see org.eclipse.jst.jee.model.internal.common.AbstractMergedModelProvider#loadModel()
- */
- protected final synchronized EJBJar loadModel() throws CoreException {
- return super.loadModel();
- }
-
- @Override
- protected IModelProvider loadAnnotationModel(EJBJar ddModel) throws CoreException {
- if (ddModel.getEjbClientJar() != null)
- clientProject = ResourcesPlugin.getWorkspace().getRoot().getProject(
- getClientNameFromJarName(ddModel.getEjbClientJar()));
- return new EJBAnnotationReader(ProjectFacetsManager.create(project), clientProject);
- }
-
- @Override
- protected IModelProvider loadDeploymentDescriptorModel() throws CoreException {
- return new Ejb3ModelProvider(project);
- }
-
- protected EJBJar getAnnotationEjbJar() {
- return (EJBJar) annotationModelProvider.getModelObject();
- }
-
- protected EJBJar getXmlEjbJar() {
- return (EJBJar) ddProvider.getModelObject();
- }
-
- public Object getModelObject(IPath modelPath) {
- return null;
- }
-
- public void modify(Runnable runnable, IPath modelPath) {
- /*
- * Someone has called modify before loading the model. Try to load the
- * model.
- */
- if (mergedModel == null)
- getMergedModel();
-
- EJBJar backup = mergedModel;
- mergedModel = (EJBJar) ddProvider.getModelObject();
- ddProvider.modify(runnable, modelPath);
- if (isDisposed()) {
- return;
- }
- mergedModel = backup;
- clearModel(mergedModel);
-
- /*
- * Reload the model.
- */
- // getMergedModel();
- merge(getXmlEjbJar(), getAnnotationEjbJar());
- }
-
- protected void annotationModelChanged(IModelProviderEvent event) {
- internalModelChanged(event);
- }
-
- protected void xmlModelChanged(IModelProviderEvent event) {
- internalModelChanged(event);
- }
-
- /*
- * Notifications from xml and annotation may come in different threads. This
- * depends on the implementation of the model providers, but to make sure
- * that no race conditions occurs I am synchronizing this method.
- */
- private synchronized void internalModelChanged(IModelProviderEvent event) {
- if (isDisposed())
- return;
- if (shouldDispose(event)) {
- dispose();
- notifyListeners(event);
- return;
- }
- /*
- * The client project was changed. Reload the annotation model.
- */
- if (clientProject == null && getXmlEjbJar().getEjbClientJar() != null) {
- reloadAnnotationModel();
- } else if (clientProject != null
- && !clientProject.getName().equals(getClientNameFromJarName(getXmlEjbJar().getEjbClientJar()))) {
- reloadAnnotationModel();
- }
- merge(getXmlEjbJar(), getAnnotationEjbJar());
- notifyListeners(event);
- }
-
- private void reloadAnnotationModel() {
- try {
- disableInternalNotifications();
- ((EJBAnnotationReader) annotationModelProvider).dispose();
- annotationModelProvider = loadAnnotationModel(getXmlEjbJar());
- enableInternalNotifications();
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- private String getClientNameFromJarName(String jarName) {
- if (jarName == null)
- return null;
- if (jarName.endsWith(".jar")) //$NON-NLS-1$
- return jarName.substring(0, jarName.lastIndexOf(".jar")); //$NON-NLS-1$
- return jarName;
- }
-
- @Override
- protected EJBJar merge(EJBJar ddModel, EJBJar annotationsModel) {
- if (mergedModel == null) {
- mergedModel = (EJBJar) EjbFactory.eINSTANCE.createEJBJar();
- initMergedModelResource((EObject) ddModel);
- } else {
- clearModel(mergedModel);
- }
-
- mergedModel.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- try {
- EjbJarMerger merger = new EjbJarMerger(mergedModel, ddModel, ModelElementMerger.ADD);
- merger.process();
- merger = new EjbJarMerger(mergedModel, annotationsModel, ModelElementMerger.ADD);
- merger.process();
- } catch (ModelException e) {
- e.printStackTrace();
- }
- return mergedModel;
- }
-
- private void clearModel(EJBJar jar) {
- jar.setAssemblyDescriptor(null);
- jar.setEnterpriseBeans(null);
- jar.getDescriptions().clear();
- jar.getDisplayNames().clear();
- jar.setRelationships(null);
- jar.setEjbClientJar(null);
- jar.setInterceptors(null);
- jar.getIcons().clear();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EJBAnnotationReader.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EJBAnnotationReader.java
deleted file mode 100644
index b37c358..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EJBAnnotationReader.java
+++ /dev/null
@@ -1,741 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-import org.eclipse.jst.j2ee.model.IModelProviderListener;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.core.SecurityRole;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.model.internal.common.AbstractAnnotationModelProvider;
-import org.eclipse.jst.jee.model.internal.common.ManyToOneRelation;
-import org.eclipse.jst.jee.model.internal.common.Result;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-
-/**
- * This class provides a javaee ejb EMF model builded from the *.java files
- * located in the project, over which the instance is working on.
- *
- * The project is passed in the constructor
- * {@link #EJBAnnotationReader(IFacetedProject, IProject))}.
- *
- * The loaded model is returned from {@link #getEJBJar()}.
- *
- * Model changes can occur if a java file in the project is changed. When
- * resources are changed, EJBAnnotationReader will rebuild is model. The current
- * implementation is doing a best try to minimize the number of resource change
- * events from the platform that cause the model to be rebuild.
- *
- * A listener is notified for changes in the model. The notification of the
- * listener may occur in the same or in another thread from the one changing the
- * resource.
- *
- * Listeners can be registered to #EJBAnnotationReader with
- * {@link #addListener(IModelProviderListener)}.
- *
- * <p>
- * The current implementation of EJBAnnotationReader is listening for
- * {@link IResourceChangeEvent#POST_BUILD}. This is so since if the java files
- * can not be compiled and build, I make not assumption a valid model can be
- * created from them.
- *
- * More importantly the Java editor is a resource change listener and it is
- * updating the java model when a resource change event is received. If we are
- * listening for {@link IResourceChangeEvent#POST_CHANGE} instead of
- * {@link IResourceChangeEvent#POST_BUILD} EJBAnnotationReader will not work if
- * it receive a resource change event before the Java Editor. The same incorrect
- * behavior may occur if listening for {@link IResourceChangeEvent#POST_CHANGE}
- * and the user copy/pastes over a file from which a model object is created.
- * </p>
- *
- * <p>
- * The class is maintaining a reference between the bean and the interfaces it
- * depends on. A bean depends on the resources of it business interfaces, of the
- * interfaces of the resource and ejb annotation and probably other. This is an
- * implementation detail. What the EJBAnnotationReader guarantees is that when a
- * file is changed and there is a model object depending on this file the ejbJar
- * will be successfully rebuilded.
- *
- * For example two bean can implements the same interface
- * <p>
- * <code>class Bean1 implements Interface {}</code>
- * <code>class Bean2 implements Interface {}</code>
- * <code>@Local interface Interface {}</code>
- *
- * If in this moment Interface is changed to :
- * <code>@Remote interface Interface {}</code>
- *
- * then Bean1 and Bean2 will be rebuilded and will contain Interface1 in their
- * business remotes list. Not it their business locals list
- * </p>
- * </p>
- *
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class EJBAnnotationReader extends AbstractAnnotationModelProvider<EJBJar> {
-
- private static final String JAVA_EXTENSION = "java"; //$NON-NLS-1$
-
- /**
- * An abstraction of a reference between a model object and an interface.
- * This class can be used in collections as a key for differing a reference
- * from a bean to an interface.
- *
- * <p>
- * One bean can refer to many interfaces. One interface can be referred by
- * many beans. This leads to a situation of many to many relation which is
- * model using {@link ManyToOneRelation} with this BeanInterfaceRef class.
- * Many unique BeanInterfaceRefs can refer to one interface.
- * </p>
- *
- * One BeanInterfaceRef is considered equal to another BeanInterfaceRef if
- * they refer to the same "modelObject" with the same "interface" value.
- *
- * @see EJBAnnotationReader#beanRefToResolvedInterface
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
- private static class BeanInterfaceRef {
-
- private String interfacee;
- private JavaEEObject modelObject;
-
- public BeanInterfaceRef(String interfacee, JavaEEObject modelObject) {
- super();
- this.interfacee = interfacee;
- this.modelObject = modelObject;
- }
-
- public String getInterfacee() {
- return interfacee;
- }
-
- public JavaEEObject getModelObject() {
- return modelObject;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((interfacee == null) ? 0 : interfacee.hashCode());
- result = prime * result + ((modelObject == null) ? 0 : modelObject.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- BeanInterfaceRef other = (BeanInterfaceRef) obj;
- if (interfacee == null) {
- if (other.interfacee != null)
- return false;
- } else if (!interfacee.equals(other.interfacee))
- return false;
- if (modelObject == null) {
- if (other.modelObject != null)
- return false;
- } else if (!modelObject.equals(other.modelObject))
- return false;
- return true;
- }
-
- }
-
- private static int instances = 0;
-
- private IProject clientProject;
-
- private Map<IFile, JavaEEObject> resourceToModel;
-
- /**
- * An instance of {@link ManyToOneRelation}. This instance is used to
- * maintain the references between a file which stores an interface and the
- * beans that depend on this interface.
- *
- * Since one bean can refer to many interfaces and one interface can refer
- * to many beans a many-to-many relation must be modeled. This is done using
- * {@link BeanInterfaceRef} and {@link ManyToOneRelation}
- *
- * @see BeanInterfaceRef
- */
- private ManyToOneRelation<BeanInterfaceRef, IFile> beanRefToResolvedInterface;
-
- private EjbAnnotationFactory annotationFactory;
-
- /**
- * Constructs a new EJBAnnotation reader for this faceted project. An
- * illegal argument if a project with value <code>null</code> is passed.
- * No loading is done in this constructor. Loading the model is made on
- * demand when calling {@link #getEJBJar()}.
- *
- * It is possible to specify the additional clientProject for this
- * ejbProject. A client project can contain part of the java files that make
- * up the model. In this case EJBAnnotationReader will also listen for
- * resources changes in the client project.
- *
- * @param project
- * the ejb project. Can not be <code>null</code>
- * @param clientProject
- * the client ejb project or <code>null</code> if there is no
- * client project.
- */
- public EJBAnnotationReader(IFacetedProject project, IProject clientProject) {
- super(project);
- this.clientProject = clientProject;
- instances++;
- }
-
- /**
- * Loads the model from the related java files.
- *
- * @throws CoreException
- */
- protected void loadModel() throws CoreException {
- IJavaProject javaProject = JavaCore.create(facetedProject.getProject());
- final Collection<IFile> javaFiles = new HashSet<IFile>();
- for (final IPackageFragmentRoot root : javaProject.getAllPackageFragmentRoots()) {
- visitJavaFiles(javaFiles, root);
- }
-
- if (clientProject != null) {
- IJavaProject clientProjectJavaView = JavaCore.create(facetedProject.getProject());
- for (final IPackageFragmentRoot root : clientProjectJavaView.getAllPackageFragmentRoots()) {
- visitJavaFiles(javaFiles, root);
- }
- }
- resourceToModel = new HashMap<IFile, JavaEEObject>();
- beanRefToResolvedInterface = new ManyToOneRelation<BeanInterfaceRef, IFile>();
- for (IFile file : javaFiles) {
- Result result = analyzeFileForBean(file);
- if (result == null)
- continue;
- processResult(file, result);
- }
- }
-
- protected void preLoad() {
- modelObject = EjbFactory.eINSTANCE.createEJBJar();
- modelObject.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- annotationFactory = EjbAnnotationFactory.createFactory();
- }
-
- private void visitJavaFiles(final Collection<IFile> javaFiles, final IPackageFragmentRoot root)
- throws CoreException {
- if (root.getKind() != IPackageFragmentRoot.K_SOURCE)
- return;
- root.getCorrespondingResource().accept(new IResourceProxyVisitor() {
- public boolean visit(IResourceProxy proxy) throws CoreException {
- if (proxy.getType() == IResource.FILE) {
- if (proxy.getName().endsWith("." + JAVA_EXTENSION)) { //$NON-NLS-1$
- IFile file = (IFile) proxy.requestResource();
- if (root.getJavaProject().isOnClasspath(file))
- javaFiles.add(file);
- }
- return false;
- }
- return true;
- }
- }, IContainer.NONE);
-
- }
-
- /**
- * Process the result from parsing the file. Depending on the result this
- * might include adding a session bean, message driven bean, securityRole
- * etc.
- *
- * @see #sessionBeanFound(IFile, SessionBean, Collection)
- * @see #messageBeanFound(IFile, MessageDrivenBean, Collection)
- * @see #securityRoleFound(IFile, SecurityRole)
- * @param file
- * @param result
- * @throws JavaModelException
- */
- private void processResult(IFile file, Result result) throws JavaModelException {
- JavaEEObject modelObject = result.getMainObject();
- if (SessionBean.class.isInstance(modelObject)) {
- sessionBeanFound(file, (SessionBean) modelObject, result.getDependedTypes());
- } else if (MessageDrivenBean.class.isInstance(modelObject)) {
- messageBeanFound(file, (MessageDrivenBean) modelObject, result.getDependedTypes());
- }
- for (JavaEEObject additional : result.getAdditional()) {
- if (SecurityRole.class.isInstance(additional)) {
- securityRoleFound((SessionBean) resourceToModel.get(file), (SecurityRole) additional);
- }
- }
- }
-
- /**
- * Analyze this file for a bean. If the file is not a valid java compilation
- * unit or it does not contain a class the method returns <code>null</code>
- *
- * Only the primary type of the compilation unit is processed.
- *
- * @see EjbAnnotationFactory
- * @param file
- * the file to be processed.
- * @return result from processing the file
- * @throws JavaModelException
- */
- private Result analyzeFileForBean(IFile file) throws JavaModelException {
- org.eclipse.core.runtime.Assert.isTrue(JAVA_EXTENSION.equals(file.getFileExtension()),
- "A file with extension different from \"java\" is analyzed for beans"); //$NON-NLS-1$
- ICompilationUnit compilationUnit = JavaCore.createCompilationUnitFrom(file);
- if (compilationUnit == null)
- return null;
- IType rootType = compilationUnit.findPrimaryType();
- /*
- * If the compilation unit is not valid and can not be compiled the
- * rootType may be null. This can happen if a class is define as follows
- * <code> @Stateless public SomeClass implements SomeInterface{}</code>.
- * Here the "class" word is missed and the type is not valid.
- */
- if (rootType == null || !rootType.isClass())
- return null;
- return annotationFactory.createJavaeeObject(rootType);
- }
-
- /**
- * A message driven bean was found in the given file. Add this messageDriven
- * bean to the list of mdbs in the
- * {@link EnterpriseBeans#getMessageDrivenBeans()}
- *
- * @param file
- * @param messageBean
- * @param dependedTypes
- * the types on which this mdb depends. This list specifies
- * changes on which types should lead to rebuilding the mdb.
- * @throws JavaModelException
- */
- private void messageBeanFound(IFile file, MessageDrivenBean messageBean, Collection<IType> dependedTypes)
- throws JavaModelException {
- if (modelObject.getEnterpriseBeans() == null)
- modelObject.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- modelObject.getEnterpriseBeans().getMessageDrivenBeans().add(messageBean);
- connectBeanWithTypes(file, messageBean, dependedTypes);
- }
-
- /**
- * A session bean was found in the give file. The session bean is also
- * depended on the types in dependedTypes. Here "depended" means that if any
- * of the types in dependedTypes is change the bean will also be rebuilded.
- * For example a session bean is depended on the types of it local and
- * remote interfaces.
- *
- * <p>
- * Since that a bean can depended on more then on files this method also
- * establish an appropriate connection between the bean and all the files it
- * depends on. This are the "file" and the files of "dependedTypes".
- * </p>
- *
- * @see #getFilesFromTypes(Collection)
- *
- * @param file
- * @param sessionBean
- * @param dependedTypes
- * @throws JavaModelException
- */
- private void sessionBeanFound(IFile file, SessionBean sessionBean, Collection<IType> dependedTypes)
- throws JavaModelException {
- if (modelObject.getEnterpriseBeans() == null)
- modelObject.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- modelObject.getEnterpriseBeans().getSessionBeans().add(sessionBean);
- connectBeanWithTypes(file, sessionBean, dependedTypes);
- }
-
- /**
- *
- * @param file
- * @param bean
- * @param dependedTypes
- * @throws JavaModelException
- */
- private void connectBeanWithTypes(IFile file, JavaEEObject bean, Collection<IType> dependedTypes)
- throws JavaModelException {
- resourceToModel.put(file, bean);
- Collection<IFile> files = new HashSet<IFile>(dependedTypes.size());
- for (IType type : dependedTypes) {
- if (type.isBinary() || type.isInterface() == false)
- continue;
- IResource resource = type.getCompilationUnit().getCorrespondingResource();
- if (resource != null && resource.exists())
- beanRefToResolvedInterface.connect(new BeanInterfaceRef(type.getFullyQualifiedName(), bean),
- (IFile) resource);
- }
- }
-
- /**
- * Dispose the current instance. The actual dispose may occur in another
- * thread. Use {@link #addListener(IModelProviderListener)} to register a
- * listener that will be notified when the instance is disposed. After all
- * the listeners are notified the list of listeners is cleared.
- *
- */
- public void dispose() {
-// Job disposeJob = new Job(Messages.getString("EJBAnnotationReader.DisposeEjbAnnotationReader")) { //$NON-NLS-1$
-// @Override
-// protected IStatus run(IProgressMonitor monitor) {
- IModelProviderEvent modelEvent = createModelProviderEvent();
- modelEvent.addResource(facetedProject.getProject());
- modelEvent.setEventCode(modelEvent.getEventCode() | IModelProviderEvent.PRE_DISPOSE);
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(EJBAnnotationReader.this);
- resourceToModel = null;
- beanRefToResolvedInterface = null;
- modelObject = null;
- notifyListeners(modelEvent);
- clearListeners();
-// return Status.OK_STATUS;
-// }
-// };
-// disposeJob.schedule();
- }
-
- /**
- * @param project
- * @return true if the given project contains resources that are relative to
- * the model. This method returns <code>true</code> for the
- * ejbProject on which this instance is working a <code>true</code>
- * for its client project.
- */
- protected boolean isProjectRelative(IProject project) {
- if (super.isProjectRelative(project) == true)
- return true;
- else if (clientProject != null && project.equals(clientProject.getProject()))
- return true;
- return false;
- }
-
- /**
- * {non-Javadoc}
- *
- * <p>
- * Changing the model may occur in different threads.
- * {@link #processAddedFile(IModelProviderEvent, IFile)} is synchronized so
- * that no other thread can add a file to the model in the same moment.
- * </p>
- *
- * @see org.eclipse.jst.jee.model.internal.common.AbstractAnnotationModelProvider#processAddedFile(org.eclipse.jst.j2ee.model.IModelProviderEvent,
- * org.eclipse.core.resources.IFile)
- */
- protected synchronized void processAddedFile(IModelProviderEvent modelEvent, IFile file) throws CoreException {
- ICompilationUnit unit = JavaCore.createCompilationUnitFrom(file);
- if (unit == null)
- return;
- Collection<IFile> filesToRebuild = new HashSet<IFile>();
- IType rootType = unit.getTypes()[0];
- if (rootType.isClass()) {
- Result result = analyzeFileForBean(file);
- if (result == null)
- return;
- processResult(file, result);
- modelEvent.addResource(file);
- } else if (rootType.isInterface()) {
- String rootTypeSimpleName = rootType.getElementName();
- for (Iterator beanIter = getConcreteModel().getEnterpriseBeans().getSessionBeans().iterator(); beanIter
- .hasNext();) {
- SessionBean bean = (SessionBean) beanIter.next();
- for (Iterator interfaceIter = bean.getBusinessLocals().iterator(); interfaceIter.hasNext();) {
- String inter = (String) interfaceIter.next();
- if (rootTypeSimpleName.equals(inter))
- filesToRebuild.add(getResourceFromModel(bean));
- }
- if (rootTypeSimpleName.equals(bean.getLocalHome()) || rootTypeSimpleName.equals(bean.getHome()))
- filesToRebuild.add(getResourceFromModel(bean));
- findDependedFiles(bean, rootTypeSimpleName, bean.getEjbLocalRefs(), bean.getResourceRefs(),
- filesToRebuild);
- }
- for (Iterator beanIter = getConcreteModel().getEnterpriseBeans().getMessageDrivenBeans().iterator(); beanIter
- .hasNext();) {
- MessageDrivenBean bean = (MessageDrivenBean) beanIter.next();
- findDependedFiles(bean, rootTypeSimpleName, bean.getEjbLocalRefs(), bean.getResourceRefs(),
- filesToRebuild);
- }
- }
- if (filesToRebuild.isEmpty())
- return;
- for (IFile changedFile : filesToRebuild) {
- processRemovedFile(modelEvent, changedFile);
- processAddedFile(modelEvent, changedFile);
- }
- filesToRebuild.clear();
- }
-
- private IFile getResourceFromModel(JavaEEObject bean) {
- for (Map.Entry<IFile, JavaEEObject> entry : resourceToModel.entrySet()) {
- if (entry.getValue().equals(bean))
- return entry.getKey();
- }
- return null;
- }
-
- private void findDependedFiles(JavaEEObject bean, String rootTypeSimpleName, Collection<EjbLocalRef> ejbRefs,
- Collection<ResourceRef> resourceRefs, Collection<IFile> filesToRebuild) {
- for (Iterator refsIter = ejbRefs.iterator(); refsIter.hasNext();) {
- String localRefInterface = ((EjbLocalRef) refsIter.next()).getLocal();
- if (rootTypeSimpleName.equals(localRefInterface))
- filesToRebuild.add(getResourceFromModel(bean));
- }
- for (Iterator refsIter = resourceRefs.iterator(); refsIter.hasNext();) {
- String resourceRef = ((ResourceRef) refsIter.next()).getResType();
- if (rootTypeSimpleName.equals(resourceRef)) {
- filesToRebuild.add(getResourceFromModel(bean));
- }
- }
- }
-
- /**
- * (non-Javadoc)
- *
- * <p>
- * Changing the model may occur in different threads.
- * {@link #processRemovedFile(IModelProviderEvent, IFile)} is synchronized
- * so that now other thread can remove a file from the model in the same
- * moment.
- * </p>
- *
- *
- * @see #processRemoveBean(IModelProviderEvent, IFile)
- * @see #processRemoveInterface(IModelProviderEvent, IFile)
- * @see org.eclipse.jst.jee.model.internal.common.AbstractAnnotationModelProvider#processRemovedFile(org.eclipse.jst.j2ee.model.IModelProviderEvent,
- * org.eclipse.core.resources.IFile)
- * @param modelEvent
- * @param file
- * the file to be removed.
- * @throws JavaModelException
- * if there was an error during parsing the file
- */
- protected synchronized void processRemovedFile(IModelProviderEvent modelEvent, IFile file) throws CoreException {
- if (resourceToModel.containsKey(file))
- processRemoveBean(modelEvent, file);
- else if (beanRefToResolvedInterface.containsTarget(file))
- processRemoveInterface(modelEvent, file);
-
- }
-
- /**
- * Process a file as a removed interface. It is the responsibility of the
- * caller to make sure the file really contains an interface and that this
- * interface is really removed.
- *
- * Removing an interface will also remove the connections between the
- * interface and the beans that depend on it -
- * {@link #beanRefToResolvedInterface}.
- *
- * Removing an interface will result in rebuilding all the modelObjects that
- * depend on this interface.
- *
- * <p>
- * The method is not synchronous. It is again a responsibility of the caller
- * to assure no thread will work on the same model. This is easily assured
- * by calling this method from a synchronized one such as
- * {@link #processRemovedFile(IModelProviderEvent, IFile)}
- * </p>
- *
- * @see #beanRefToResolvedInterface
- * @see #processRemovedFile(IModelProviderEvent, IFile)
- * @see #processRemoveBean(IModelProviderEvent, IFile)
- * @param modelEvent
- * @param file
- * @throws JavaModelException
- */
- private void processRemoveInterface(IModelProviderEvent modelEvent, IFile file) throws CoreException {
- Collection<BeanInterfaceRef> refs = beanRefToResolvedInterface.getSources(file);
- Collection<IFile> filesToRebuild = new HashSet<IFile>();
- for (BeanInterfaceRef ref : refs) {
- filesToRebuild.add(getResourceFromModel(ref.getModelObject()));
- }
- if (filesToRebuild.isEmpty())
- return;
- for (IFile changedFile : filesToRebuild) {
- processRemovedFile(modelEvent, changedFile);
- processAddedFile(modelEvent, changedFile);
- }
- filesToRebuild.clear();
- beanRefToResolvedInterface.disconnect(file);
- }
-
- /**
- * Process a file as a removed bean. It is the responsibility of the caller
- * to make sure the file really contains a bean and that this bean is really
- * removed.
- *
- * <p>
- * The method is not synchronous. It is again a responsibility of the caller
- * to assure no thread will work on the same model. This is easily assured
- * by calling this method from a synchronized one such as
- * {@link #processRemovedFile(IModelProviderEvent, IFile)}
- * </p>
- *
- * @see #processRemovedFile(IModelProviderEvent, IFile)
- * @see #processRemoveInterface(IModelProviderEvent, IFile)
- * @see #beanRefToResolvedInterface
- * @param modelEvent
- * @param file
- * the file containing the removed bean
- * @throws JavaModelException
- */
- private void processRemoveBean(IModelProviderEvent modelEvent, IFile file) throws JavaModelException {
- EObject modelObject = (EObject) resourceToModel.get(file);
- EcoreUtil.remove(modelObject);
-
- resourceToModel.remove(getResourceFromModel((JavaEEObject) modelObject));
- modelEvent.setEventCode(modelEvent.getEventCode() | IModelProviderEvent.REMOVED_RESOURCE);
- modelEvent.addResource(file);
- disconnectFromRoles((JavaEEObject) modelObject);
- }
-
- /**
- * Process a file as "changed". If no model object depends on this file the
- * file will be process as added (since it may not have been a bean till
- * now, but an annotation was added). It is the responsibility of the caller
- * to make sure the file really contains a bean/interface and that this bean
- * is really changed and can be accessed.
- *
- * <p>
- * Changing the model may occur in different threads.
- * {@link #processChangedFile(IModelProviderEvent, IFile)} is synchronized
- * so that now other thread can change a file from the model in the same
- * moment.
- * </p>
- *
- * @see #processChangedBean(IModelProviderEvent, IFile)
- * @see #processChangedInterface(IModelProviderEvent, IFile)
- * @param modelEvent
- * @param file
- * @throws JavaModelException
- */
- protected synchronized void processChangedFile(IModelProviderEvent modelEvent, IFile file) throws CoreException {
- if (resourceToModel.containsKey(file))
- processChangedBean(modelEvent, file);
- else if (beanRefToResolvedInterface.containsTarget(file))
- processChangedInterface(modelEvent, file);
- else
- processAddedFile(modelEvent, file);
- }
-
- /**
- * Process a file as a changed bean. It is the responsibility of the caller
- * to make sure the file really contains a bean and that this bean is really
- * changed.
- *
- * <p>
- * The method is not synchronous. It is again a responsibility of the caller
- * to assure no thread will work on the same model. This is easily assured
- * by calling this method from a synchronized one such as
- * {@link #processChangedFile(IModelProviderEvent, IFile)}
- * </p>
- *
- * Changing a bean may mean removing it from the model (if it was a bean
- * till now, but the annotation was deleted)
- *
- * @see #processChangedFile(IModelProviderEvent, IFile)
- * @see {@link #processChangedInterface(IModelProviderEvent, IFile)}
- * @param modelEvent
- * @param file
- * @throws JavaModelException
- */
- private void processChangedBean(IModelProviderEvent modelEvent, IFile file) throws CoreException {
- EObject oldBean = (EObject) resourceToModel.get(file);
- IFile beanFile = getResourceFromModel((JavaEEObject) oldBean);
- processRemovedFile(modelEvent, beanFile);
- processAddedFile(modelEvent, beanFile);
- }
-
- /**
- * Process a file as a changed interface. It is the responsibility of the
- * caller to make sure the file really contains an interface and that this
- * interface is really changed.
- *
- * <p>
- * The method is not synchronous. It is again a responsibility of the caller
- * to assure no thread will work on the same model. This is easily assured
- * by calling this method from a synchronized one such as
- * {@link #processChangedFile(IModelProviderEvent, IFile)}
- * </p>
- *
- * Changing an interface may mean rebuilding all the beans that depend on
- * this interface (if it was annotated with "@Local", but this annotation
- * was changed to "@Remote" )
- *
- * @param modelEvent
- * @param file
- * @throws JavaModelException
- */
- private void processChangedInterface(IModelProviderEvent modelEvent, IFile file) throws CoreException {
- Collection<BeanInterfaceRef> references = beanRefToResolvedInterface.getSources(file);
- for (BeanInterfaceRef ref : references) {
- IFile next = getResourceFromModel(ref.getModelObject());
- processRemovedFile(modelEvent, next);
- processAddedFile(modelEvent, next);
- }
- }
-
- public void modify(Runnable runnable, IPath modelPath) {
- }
-
- public IStatus validateEdit(IPath modelPath, Object context) {
- return null;
- }
-
- @Override
- protected Collection<SecurityRoleRef> getSecurityRoleRefs(JavaEEObject target) {
- if (SessionBean.class.isInstance(target))
- return ((SessionBean) target).getSecurityRoleRefs();
- return null;
- }
-
- @Override
- protected Collection<SecurityRole> getSecurityRoles() {
- if (modelObject.getAssemblyDescriptor() == null)
- modelObject.setAssemblyDescriptor(EjbFactory.eINSTANCE.createAssemblyDescriptor());
- return modelObject.getAssemblyDescriptor().getSecurityRoles();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3MergedModelProviderFactory.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3MergedModelProviderFactory.java
deleted file mode 100644
index fe5fbc4..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3MergedModelProviderFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class Ejb3MergedModelProviderFactory implements IModelProviderFactory {
-
- private HashMap<IProject, IModelProvider> xmlResources = new HashMap<IProject, IModelProvider>();
-
- public IModelProvider create(IProject project) {
- IModelProvider result = getResource(project);
- if(result == null || ((EJB3MergedModelProvider)result).isDisposed()){
- result = new EJB3MergedModelProvider(project);
- addResource(project, result);
- }
- return result;
- }
-
- public IModelProvider create(IVirtualComponent component) {
- return create(component.getProject());
- }
-
- private void addResource(IProject project, IModelProvider modelProvider){
- xmlResources.put(project, modelProvider);
- }
-
- private IModelProvider getResource(IProject project){
- return xmlResources.get(project);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java
deleted file mode 100644
index 5de7044..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-import org.eclipse.jst.javaee.ejb.IEJBResource;
-
-public class Ejb3ModelProvider extends JEE5ModelProvider {
-
- private static final String EJB3_CONTENT_TYPE = "org.eclipse.jst.jee.ee5ejbDD"; //$NON-NLS-1$
- public Ejb3ModelProvider(IProject proj) {
- super();
- this.proj = proj;
- setDefaultResourcePath(new Path(J2EEConstants.EJBJAR_DD_URI));
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.model.IModelProvider#getModelObject(org.eclipse.core.runtime.IPath)
- */
- public Object getModelObject(IPath modelPath) {
- IEJBResource ejbRes = (IEJBResource)getModelResource(modelPath);
- if (ejbRes != null && ejbRes.getRootObject() != null)
- return ejbRes.getEjbJar();
- return null;
- }
- protected String getContentTypeDescriber() {
- return EJB3_CONTENT_TYPE;
- }
-
-
- public void populateRoot(XMLResourceImpl res, String name) {
- EJBJarDeploymentDescriptor dd = EjbFactory.eINSTANCE.createEJBJarDeploymentDescriptor();
- dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE_NS_URL); //$NON-NLS-1$
- dd.getXMLNSPrefixMap().put("xsi", J2EEConstants.XSI_NS_URL); //$NON-NLS-1$
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.EJB_JAR_SCHEMA_LOC_3_0);
- EJBJar jar = EjbFactory.eINSTANCE.createEJBJar();
- DisplayName dn = JavaeeFactory.eINSTANCE.createDisplayName();
- dn.setValue(name);
- jar.getDisplayNames().add(dn);
- dd.setEjbJar(jar);
- jar.setVersion(J2EEVersionConstants.VERSION_3_0_TEXT);
- res.getContents().add((EObject) dd);
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProviderFactory.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProviderFactory.java
deleted file mode 100644
index 71afbd4..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProviderFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class Ejb3ModelProviderFactory implements IModelProviderFactory {
-
- public IModelProvider create(IProject project) {
- return new Ejb3ModelProvider(project);
- }
-
- public IModelProvider create(IVirtualComponent component) {
- return new Ejb3ModelProvider(component.getProject());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EjbAnnotationFactory.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EjbAnnotationFactory.java
deleted file mode 100644
index 6b7d849..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EjbAnnotationFactory.java
+++ /dev/null
@@ -1,642 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.LifecycleCallback;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.core.RunAs;
-import org.eclipse.jst.javaee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-import org.eclipse.jst.javaee.ejb.InitMethodType;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.MethodParams;
-import org.eclipse.jst.javaee.ejb.NamedMethodType;
-import org.eclipse.jst.javaee.ejb.RemoveMethodType;
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.javaee.ejb.SessionType;
-import org.eclipse.jst.javaee.ejb.TransactionType;
-import org.eclipse.jst.jee.model.internal.common.AbstractAnnotationFactory;
-import org.eclipse.jst.jee.model.internal.common.Result;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class EjbAnnotationFactory extends AbstractAnnotationFactory {
-
-
- private static final String INIT = "Init"; //$NON-NLS-1$
- private static final String RUN_AS = "RunAs"; //$NON-NLS-1$
- private static final String RESOURCES = "Resources"; //$NON-NLS-1$
- private static final String CONTAINER = "CONTAINER"; //$NON-NLS-1$
- private static final String TRANSACTION_MANAGEMENT_TYPE_CONTAINER = "TransactionManagementType.CONTAINER"; //$NON-NLS-1$
- private static final String VALUE = "value"; //$NON-NLS-1$
- private static final String TRANSACTION_MANAGEMENT = "TransactionManagement"; //$NON-NLS-1$
- private static final String EJBS = "EJBs"; //$NON-NLS-1$
- private static final String DECLARE_ROLES = "DeclareRoles"; //$NON-NLS-1$
- private static final String LOCAL_HOME = "LocalHome"; //$NON-NLS-1$
- private static final String REMOTE_HOME = "RemoteHome"; //$NON-NLS-1$
- private static final String JAVAX_EJB_TIMER = "javax.ejb.Timer"; //$NON-NLS-1$
- private static final String TIMER = "Timer"; //$NON-NLS-1$
- private static final String RETAIN_IF_EXCEPTION = "retainIfException"; //$NON-NLS-1$
- private static final String REMOVE = "Remove"; //$NON-NLS-1$
- private static final String PRE_PASSIVATE = "PrePassivate"; //$NON-NLS-1$
- private static final String POST_ACTIVATE = "PostActivate"; //$NON-NLS-1$
- private static final String TIMEOUT = "Timeout"; //$NON-NLS-1$
- private static final String PRE_DESTROY = "PreDestroy"; //$NON-NLS-1$
- private static final String POST_CONSTRUCT = "PostConstruct"; //$NON-NLS-1$
- private static final String LOCAL = "Local"; //$NON-NLS-1$
- private static final String REMOTE = "Remote"; //$NON-NLS-1$
- private static final String RESOURCE = "Resource"; //$NON-NLS-1$
- private static final String EJB = "EJB"; //$NON-NLS-1$
- private static final String DESCRIPTION = "description"; //$NON-NLS-1$
- private static final String MAPPED_NAME = "mappedName"; //$NON-NLS-1$
- private static final String NAME = "name"; //$NON-NLS-1$
- private static final String VOID_RETURN_TYPE = "V"; //$NON-NLS-1$
- private static final String JAVAX_EJB_STATEFUL = "javax.ejb.Stateful"; //$NON-NLS-1$
- private static final String STATEFUL = "Stateful"; //$NON-NLS-1$
- private static final String JAVAX_EJB_MESSAGE_DRIVEN = "javax.ejb.MessageDriven"; //$NON-NLS-1$
- private static final String MESSAGE_DRIVEN = "MessageDriven"; //$NON-NLS-1$
- private static final String JAVAX_EJB_STATELESS = "javax.ejb.Stateless"; //$NON-NLS-1$
- private static final String STATELESS = "Stateless"; //$NON-NLS-1$
-
- private static final String CREATE_METHOD = "create"; //$NON-NLS-1$
-
- public static EjbAnnotationFactory createFactory() {
- return new EjbAnnotationFactory();
- }
-
- private EjbAnnotationFactory() {
- }
-
- /**
- * Creates a java ee object (SessionBean, MessageDrivenBean) depending of
- * the type and its annotations.
- *
- * Always returns a non null result. The result is of type ({@link Result}
- * and the java ee object created by this method is retrieved with
- * {@link Result#getMainObject()}
- *
- * @param type
- * @return the result from creating a javaee object from this type
- * @throws JavaModelException
- */
- public Result createJavaeeObject(IType type) throws JavaModelException {
- Result result = new Result();
- for (IAnnotation annotation : type.getAnnotations()) {
- String annotationName = annotation.getElementName();
- if (STATELESS.equals(annotationName) || JAVAX_EJB_STATELESS.equals(annotationName)) {
- processStatelessBean(result, annotation, type);
- break;
- } else if (MESSAGE_DRIVEN.equals(annotationName) || JAVAX_EJB_MESSAGE_DRIVEN.equals(annotationName)) {
- processMessageDrivenBean(result, annotation, type);
- break;
- } else if (STATEFUL.equals(annotationName) || JAVAX_EJB_STATEFUL.equals(annotationName)) {
- processStatefulBean(result, annotation, type);
- break;
- }
- }
- return result;
- }
-
- private void processMessageDrivenBean(Result result, IAnnotation annotation, IType type) throws JavaModelException {
- MessageDrivenBean mdb = createMDB(result, annotation, type);
- result.setMainObject(mdb);
- }
-
- private void processStatelessBean(Result result, IAnnotation annotation, IType type) throws JavaModelException {
- SessionBean sessionBean = createSession(result, SessionType.STATELESS_LITERAL, annotation, type);
- result.setMainObject(sessionBean);
- }
-
- private void processStatefulBean(Result result, IAnnotation annotation, IType type) throws JavaModelException {
- SessionBean sessionBean = createSession(result, SessionType.STATEFUL_LITERAL, annotation, type);
- processStatefulMethods(sessionBean, type);
- result.setMainObject(sessionBean);
- }
-
- private void addInterfaces(List list, IType type, IMemberValuePair pair, Collection<IType> dependedTypes)
- throws JavaModelException {
- if (!isArrayOfObject(pair.getValue())) {
- return;
- }
- Object[] value = (Object[]) pair.getValue();
- IType interfaceType = null;
- for (int i = 0; i < value.length; i++) {
- interfaceType = resolveType(type, (String) value[i]);
- if (interfaceType != null) {
- list.add(interfaceType.getFullyQualifiedName());
- dependedTypes.add(interfaceType);
- } else
- list.add(value[i]);
- }
- }
-
- private static void addLifecycleMethod(List callbacks, IMethod method, IAnnotation annotation) {
- LifecycleCallback callback = JavaeeFactory.eINSTANCE.createLifecycleCallback();
- callback.setLifecycleCallbackClass(method.getDeclaringType().getFullyQualifiedName());
- callback.setLifecycleCallbackMethod(method.getElementName());
- callbacks.add(callback);
- }
-
- private MessageDrivenBean createMDB(Result result, IAnnotation annotation, IType type) throws JavaModelException {
- result.getDependedTypes().add(type);
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbClass(type.getFullyQualifiedName());
- processMessageDrivenAnnotation(mdbBean, annotation, type);
- processTypeAnnotations(result, mdbBean, type);
- processFieldAnnotations(mdbBean, type, result.getDependedTypes());
- processMethodAnnotations(mdbBean, type, result.getDependedTypes());
- return mdbBean;
- }
-
- private SessionBean createSession(Result result, SessionType sessionType, IAnnotation annotation, IType type)
- throws JavaModelException {
- result.getDependedTypes().add(type);
- SessionBean sessionBean = EjbFactory.eINSTANCE.createSessionBean();
- sessionBean.setSessionType(sessionType);
- processAnnotation(sessionBean, annotation, type);
- processTypeAnnotations(result, sessionBean, type);
- processFieldAnnotations(sessionBean, type, result.getDependedTypes());
- processMethodAnnotations(sessionBean, type, result.getDependedTypes());
- processImplementedInterfaces(sessionBean, type, result.getDependedTypes(), null);
- return sessionBean;
- }
-
- private EjbLocalRef findRefByName(SessionBean bean, String name) {
- if (name == null)
- return null;
- for (Iterator iter = bean.getEjbLocalRefs().iterator(); iter.hasNext();) {
- EjbLocalRef ref = (EjbLocalRef) iter.next();
- if (name.equals(ref.getEjbRefName()))
- return ref;
- }
- return null;
- }
-
- /**
- * Checks if this method can be classified as a "lifecycle" method. One on
- * which a lifecycle annotation like "@PostConstruct", "@PreDestory", etc
- * will be valid.
- *
- * Such method must have only one param, return type <code>void</code> and
- * no exceptions thrown. It must not be static or final.
- *
- * @param method
- * @return true if this can be classified as lifecycle method
- * @throws JavaModelException
- */
- private static boolean isLifecycleMethod(IMethod method) throws JavaModelException {
- if (!VOID_RETURN_TYPE.equals(method.getReturnType()))
- return false;
- if ((method.getFlags() & Flags.AccStatic) != 0 || (method.getFlags() & Flags.AccFinal) != 0)
- return false;
- if (method.getNumberOfParameters() != 0)
- return false;
- if (method.getExceptionTypes().length != 0)
- return false;
- return true;
- }
-
- private void procesRemoteHomeAnnotation(IAnnotation annotation, SessionBean sessionBean, IType type,
- Collection<IType> dependedTypes) throws JavaModelException {
- IMemberValuePair[] pair = annotation.getMemberValuePairs();
- if (pair.length == 1) {
- String value = (String) pair[0].getValue();
- IType interfaceType = resolveType(type, value);
- if (interfaceType != null) {
- sessionBean.setHome(interfaceType.getFullyQualifiedName());
- dependedTypes.add(interfaceType);
- try {
- IMethod method = interfaceType.getMethod(CREATE_METHOD, null);
- if (method != null && !Signature.SIG_VOID.equals(method.getReturnType()) ){
- String componentType = Signature.toString(method.getReturnType());
- String[][] resolveType = interfaceType.resolveType(componentType);
- if (resolveType[0].length == 2){
- componentType = resolveType[0][0]+"." + resolveType[0][1]; //$NON-NLS-1$
- }
-
-
- sessionBean.setRemote(componentType);
- }
- } catch (CoreException e) {
- // nothing to do create method is missing and component interface cannot be extracted
- }
- } else
- sessionBean.setHome(value);
- }
- }
-
- private void processActivationConfig(IAnnotation activationAnnotation, MessageDrivenBean mdbBean, IType type)
- throws JavaModelException {
- IMemberValuePair[] pairs = activationAnnotation.getMemberValuePairs();
- if (pairs.length != 2)
- return;
- String name = (String) getAnnotatedValue("propertyName", pairs); //$NON-NLS-1$
- String value = (String) getAnnotatedValue("propertyValue", pairs); //$NON-NLS-1$
- ActivationConfigProperty property = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property.setActivationConfigPropertyName(name);
- property.setActivationConfigPropertyValue(value);
- if (mdbBean.getActivationConfig() == null)
- mdbBean.setActivationConfig(EjbFactory.eINSTANCE.createActivationConfig());
- mdbBean.getActivationConfig().getActivationConfigProperties().add(property);
- }
-
- private SessionBean processAnnotation(SessionBean sessionBean, IAnnotation annotation, IType type)
- throws JavaModelException {
- String fullyQualifiedName = type.getFullyQualifiedName();
- sessionBean.setEjbClass(fullyQualifiedName);
- sessionBean.setEjbName(type.getElementName());
- IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
- String name = (String) getAnnotatedValue(NAME, memberValuePairs);
- String mappedName = (String) getAnnotatedValue(MAPPED_NAME, memberValuePairs);
- String descr = (String) getAnnotatedValue(DESCRIPTION, memberValuePairs);
- if (name != null) {
- sessionBean.setEjbName(name);
- }
- if (mappedName != null) {
- sessionBean.setMappedName(mappedName);
- }
- if (descr != null) {
- Description description = JavaeeFactory.eINSTANCE.createDescription();
- description.setValue(descr);
- if (sessionBean.getDescriptions().isEmpty())
- sessionBean.getDescriptions().add(description);
- else
- sessionBean.getDescriptions().set(0, description);
- }
- return sessionBean;
- }
-
- private void processFieldAnnotations(JavaEEObject bean, IType type, Collection<IType> dependedTypes)
- throws JavaModelException {
- SessionBean sessionBean = null;
- MessageDrivenBean messageBean = null;
- if (SessionBean.class.isInstance(bean)) {
- sessionBean = (SessionBean) bean;
- } else if (MessageDrivenBean.class.isInstance(bean)) {
- messageBean = (MessageDrivenBean) bean;
- }
- List<EjbLocalRef> ejbRefs = sessionBean != null ? sessionBean.getEjbLocalRefs() : messageBean.getEjbLocalRefs();
- List<ResourceRef> resourceRefs = sessionBean != null ? sessionBean.getResourceRefs() : messageBean
- .getResourceRefs();
- for (IField field : type.getFields()) {
- for (IAnnotation annotation : field.getAnnotations()) {
- String annotationName = annotation.getElementName();
- if (EJB.equals(annotationName)) {
- processEjbAnnotation(annotation, ejbRefs, field, dependedTypes);
- } else if (RESOURCE.equals(annotationName)) {
- processResourceRefAnnotation(annotation, resourceRefs, field, dependedTypes);
- }
- }
- }
- }
-
- private void processImplementedInterfaces(SessionBean sessionBean, IType type, Collection<IType> dependedTypes,
- IProgressMonitor monitor) throws JavaModelException {
- List<String> superInterfaces = new ArrayList<String>(Arrays.asList(type.getSuperInterfaceNames()));
-
- for (String interfaceName : type.getSuperInterfaceNames()) {
- String[][] fullTypeName = type.resolveType(interfaceName);
- if (fullTypeName == null) {
- /*
- * Can not be resolved. Maybe it does not exists. Continue.
- */
- continue;
- }
- IType inter = type.getJavaProject().findType(fullTypeName[0][0], fullTypeName[0][1]);
- if (isDefinedInBeanClass(inter, sessionBean.getBusinessLocals())
- || isDefinedInBeanClass(inter, sessionBean.getBusinessRemotes())) {
- superInterfaces.remove(interfaceName);
- continue;
- }
- String fullyQualifiedName = inter.getFullyQualifiedName();
- for (IAnnotation annotation : inter.getAnnotations()) {
- String annotationName = annotation.getElementName();
- if (REMOTE.equals(annotationName)) {
- sessionBean.getBusinessRemotes().add(fullyQualifiedName);
- if (dependedTypes != null)
- dependedTypes.add(inter);
- superInterfaces.remove(interfaceName);
- } else if (LOCAL.equals(annotationName)) {
- sessionBean.getBusinessLocals().add(fullyQualifiedName);
- if (dependedTypes != null)
- dependedTypes.add(inter);
- superInterfaces.remove(interfaceName);
- }
- }
- if (!sessionBean.getBusinessRemotes().contains(fullyQualifiedName)
- && !sessionBean.getBusinessLocals().contains(fullyQualifiedName)) {
- sessionBean.getBusinessLocals().add(fullyQualifiedName);
- if (dependedTypes != null)
- dependedTypes.add(inter);
- superInterfaces.remove(interfaceName);
- }
-
- }
- for (String string : superInterfaces) {
- if (!sessionBean.getBusinessRemotes().contains(string) && !sessionBean.getBusinessLocals().contains(string)) {
- sessionBean.getBusinessLocals().add(string);
- }
- }
- // sessionBean.getBusinessLocals().addAll(superInterfaces);
-
- }
-
- private static boolean isDefinedInBeanClass(IType type, List list) {
- if (list == null) {
- return false;
- }
-
- for (Object object : list) {
- if (type.getFullyQualifiedName().equals(object.toString())) {
- return true;
- }
- }
- return false;
- }
-
- private void processLocalHomeAnnotation(IAnnotation annotation, SessionBean sessionBean, IType type,
- Collection<IType> dependedTypes) throws JavaModelException {
- IMemberValuePair[] pair = annotation.getMemberValuePairs();
- if (pair.length == 1) {
- String value = (String) pair[0].getValue();
- IType interfaceType = resolveType(type, value);
- if (interfaceType != null) {
- sessionBean.setLocalHome(interfaceType.getFullyQualifiedName());
- dependedTypes.add(interfaceType);
- try {
- IMethod method = interfaceType.getMethod(CREATE_METHOD, null);
- if (method != null && !Signature.SIG_VOID.equals(method.getReturnType()) ){
- String componentType = Signature.toString(method.getReturnType());
- String[][] resolveType = interfaceType.resolveType(componentType);
- if (resolveType[0].length == 2){
- componentType = resolveType[0][0]+"." + resolveType[0][1]; //$NON-NLS-1$
- }
- sessionBean.setLocal(componentType);
- }
- } catch (CoreException e) {
- // nothing to do create method is missing and component interface cannot be extracted
- }
- } else
- sessionBean.setLocalHome(value);
- }
- }
-
- private void processMessageDrivenAnnotation(MessageDrivenBean mdbBean, IAnnotation annotation, IType type)
- throws JavaModelException {
- IMemberValuePair[] pairs = annotation.getMemberValuePairs();
- String beanName = type.getElementName();
- String beanName2 = (String) getAnnotatedValue(NAME, pairs);
- mdbBean.setEjbName(beanName2 == null ? beanName : beanName2);
- String mappedName = (String) getAnnotatedValue(MAPPED_NAME, pairs);
- String descr = (String) getAnnotatedValue(DESCRIPTION, pairs);
-
- if (mappedName != null) {
- mdbBean.setMappedName(mappedName);
- }
- if (descr != null) {
- Description description = JavaeeFactory.eINSTANCE.createDescription();
- description.setValue(descr);
- if (mdbBean.getDescriptions().isEmpty())
- mdbBean.getDescriptions().add(description);
- else
- mdbBean.getDescriptions().set(0, description);
- }
-
- Object values = getAnnotatedValue("activationConfig", pairs); //$NON-NLS-1$
- if (!isArrayOfObject(values))
- return;
- for (Object activationAnnotation : (Object[]) values) {
- processActivationConfig((IAnnotation) activationAnnotation, mdbBean, type);
- }
- }
-
- @SuppressWarnings("unchecked")
- private void processMethodAnnotations(JavaEEObject bean, IType type, Collection<IType> dependedTypes)
- throws JavaModelException {
- SessionBean sessionBean = null;
- MessageDrivenBean messageBean = null;
- if (SessionBean.class.isInstance(bean)) {
- sessionBean = (SessionBean) bean;
- } else if (MessageDrivenBean.class.isInstance(bean)) {
- messageBean = (MessageDrivenBean) bean;
- }
- boolean isSession = sessionBean != null;
- List<EjbLocalRef> ejbRefs = isSession ? sessionBean.getEjbLocalRefs() : messageBean.getEjbLocalRefs();
- List<ResourceRef> resourceRefs = isSession ? sessionBean.getResourceRefs() : messageBean.getResourceRefs();
- List<LifecycleCallback> postConstructs = isSession ? sessionBean.getPostConstructs() : messageBean
- .getPostConstructs();
- List<LifecycleCallback> preDestroys = isSession ? sessionBean.getPreDestroys() : messageBean.getPreDestroys();
- for (IMethod method : type.getMethods()) {
- boolean isLifecycle = isLifecycleMethod(method);
- for (IAnnotation annotation : method.getAnnotations()) {
- String annotationName = annotation.getElementName();
- if (isLifecycle) {
- if (POST_CONSTRUCT.equals(annotationName)) {
- addLifecycleMethod(postConstructs, method, annotation);
- continue;
- } else if (PRE_DESTROY.equals(annotationName)) {
- addLifecycleMethod(preDestroys, method, annotation);
- continue;
- }
- }
- if (EJB.equals(annotationName)) {
- processEjbAnnotation(annotation, ejbRefs, method, dependedTypes);
- } else if (RESOURCE.equals(annotationName)) {
- processResourceRefAnnotation(annotation, resourceRefs, method, dependedTypes);
- } else if (isSession && sessionBean.getSessionType().getValue() == SessionType.STATELESS
- && TIMEOUT.equals(annotationName)) {
- // time out annotations are set only ot stateless beans
- processTimeoutAnnotation(sessionBean, method, annotation);
- }
- }
- }
- }
-
- /**
- * Process the methods of a stateful bean and looks for annotation that make
- * sence only in the context of the stateful bean.
- *
- * No checks for whether the bean is really a stateful are made.
- *
- * @param bean
- * @param type
- * @throws JavaModelException
- */
- private void processStatefulMethods(SessionBean bean, IType type) throws JavaModelException {
- IMethod[] methods = type.getMethods();
- boolean searchForInit = bean.getLocalHome() != null || bean.getHome() != null;
- for (IMethod method : methods) {
- /*
- * Since the type maybe in a working copy the preferred way (and
- * only one working) is to iterate through the annotations and check
- * for the annotation name. In a working copy the call to
- * annotation.exists() always return true so it is NOT possible to
- * use the IAnnotation annotation =
- * method.getAnnotation("AnnotationName") and then check for
- * annotation.exists() - this will always return true in a working
- * copy.
- */
- for (IAnnotation annotation : method.getAnnotations()) {
- if (searchForInit) {
- if (annotation.getElementName().equals(INIT)) {
- if (!VOID_RETURN_TYPE.equals(method.getReturnType()))
- continue;
- InitMethodType initMethod = EjbFactory.eINSTANCE.createInitMethodType();
- NamedMethodType methodType = EjbFactory.eINSTANCE.createNamedMethodType();
- methodType.setMethodName(method.getElementName());
- MethodParams params = EjbFactory.eINSTANCE.createMethodParams();
- for (String param : method.getParameterTypes()) {
- params.getMethodParams().add(Signature.toString(param));
- }
- methodType.setMethodParams(params);
- initMethod.setBeanMethod(methodType);
- bean.getInitMethods().add(initMethod);
- }
- }
- if (isLifecycleMethod(method) == false)
- continue;
- if (annotation.getElementName().equals(POST_ACTIVATE)) {
- addLifecycleMethod(bean.getPostActivates(), method, annotation);
- } else if (annotation.getElementName().equals(PRE_PASSIVATE)) {
- addLifecycleMethod(bean.getPrePassivates(), method, annotation);
- } else if (annotation.getElementName().equals(REMOVE)) {
- RemoveMethodType removeMethod = EjbFactory.eINSTANCE.createRemoveMethodType();
- Boolean retainIfException = (Boolean) getAnnotatedValue(RETAIN_IF_EXCEPTION, annotation
- .getMemberValuePairs());
- removeMethod.setRetainIfException(retainIfException != null ? retainIfException : false);
- NamedMethodType methodType = EjbFactory.eINSTANCE.createNamedMethodType();
- methodType.setMethodName(method.getElementName());
- removeMethod.setBeanMethod(methodType);
- bean.getRemoveMethods().add(removeMethod);
- }
- }
- }
- }
-
- private void processTimeoutAnnotation(SessionBean sessionBean, IMethod method, IAnnotation annotation)
- throws JavaModelException {
- if (method.getNumberOfParameters() != 1)
- return;
- String paramName = Signature.toString(method.getParameterTypes()[0]);
- if (!TIMER.equals(paramName) && !JAVAX_EJB_TIMER.equals(paramName))
- return;
- if (method.getExceptionTypes().length != 0)
- return;
- NamedMethodType methodType = EjbFactory.eINSTANCE.createNamedMethodType();
- methodType.setMethodName(method.getElementName());
- MethodParams params = EjbFactory.eINSTANCE.createMethodParams();
- params.getMethodParams().add(paramName);
- methodType.setMethodParams(params);
- sessionBean.setTimeoutMethod(methodType);
- }
-
- private void processTypeAnnotations(Result result, JavaEEObject bean, IType type) throws JavaModelException {
- SessionBean sessionBean = null;
- MessageDrivenBean messageBean = null;
- if (SessionBean.class.isInstance(bean)) {
- sessionBean = (SessionBean) bean;
- } else if (MessageDrivenBean.class.isInstance(bean)) {
- messageBean = (MessageDrivenBean) bean;
- }
- boolean isSessionBean = sessionBean != null;
- List<EjbLocalRef> ejbRefs = isSessionBean ? sessionBean.getEjbLocalRefs() : messageBean.getEjbLocalRefs();
- List<ResourceRef> resourceRefs = isSessionBean ? sessionBean.getResourceRefs() : messageBean.getResourceRefs();
-
- for (IAnnotation annotation : type.getAnnotations()) {
- IMemberValuePair[] pairs = annotation.getMemberValuePairs();
- String annotationName = annotation.getElementName();
- if (isSessionBean) {
- if (LOCAL.equals(annotationName)) {
- if (pairs.length == 1) {
- addInterfaces(sessionBean.getBusinessLocals(), type, pairs[0], result.getDependedTypes());
- }
- } else if (REMOTE.equals(annotationName)) {
- if (pairs.length == 1) {
- addInterfaces(sessionBean.getBusinessRemotes(), type, pairs[0], result.getDependedTypes());
- }
- } else if (REMOTE_HOME.equals(annotationName)) {
- procesRemoteHomeAnnotation(annotation, sessionBean, type, result.getDependedTypes());
- } else if (LOCAL_HOME.equals(annotationName)) {
- processLocalHomeAnnotation(annotation, sessionBean, type, result.getDependedTypes());
- } else if (DECLARE_ROLES.equals(annotationName)) {
- processDeclareRoles(result, sessionBean.getSecurityRoleRefs(), annotation, type);
- }
- }
- if (EJB.equals(annotationName)) {
- processEjbAnnotation(annotation, ejbRefs, type, result.getDependedTypes());
- } else if (EJBS.equals(annotationName)) {
- if (!isArrayOfObject(pairs[0].getValue()))
- return;
- Object[] values = (Object[]) pairs[0].getValue();
- for (Object ejbAnnotation : values) {
- processEjbAnnotation((IAnnotation) ejbAnnotation, ejbRefs, type, result.getDependedTypes());
- }
- } else if (TRANSACTION_MANAGEMENT.equals(annotationName)) {
- String value = (String) getAnnotatedValue(VALUE, pairs);
- TransactionType transaction = null;
- /*
- * the default value is TransactionType.BEAN which is handled by
- * the EMF. no need to check for this value
- */
- if (TRANSACTION_MANAGEMENT_TYPE_CONTAINER.equals(value)) {
- transaction = TransactionType.CONTAINER_LITERAL;
- } else if (CONTAINER.equals(value)
- && containsImport(type.getCompilationUnit(), TRANSACTION_MANAGEMENT_TYPE_CONTAINER)) {
- transaction = TransactionType.CONTAINER_LITERAL;
- }
- if (transaction != null) {
- if (isSessionBean)
- sessionBean.setTransactionType(transaction);
- else
- messageBean.setTransactionType(transaction);
- }
- } else if (RESOURCE.equals(annotationName)) {
- processResourceRefAnnotation(annotation, resourceRefs, type, result.getDependedTypes());
- } else if (RESOURCES.equals(annotationName)) {
- processResourcesAnnotation(annotation, resourceRefs, type, result.getDependedTypes());
- } else if (RUN_AS.equals(annotationName)) {
- SecurityIdentityType identity = EjbFactory.eINSTANCE.createSecurityIdentityType();
- RunAs runAs = JavaeeFactory.eINSTANCE.createRunAs();
- processRunAs(annotation, runAs);
- identity.setRunAs(runAs);
- if (identity.getRunAs().getRoleName() != null)
- if (isSessionBean)
- sessionBean.setSecurityIdentities(identity);
- else
- messageBean.setSecurityIdentity(identity);
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Messages.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Messages.java
deleted file mode 100644
index 36bac76..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Messages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
- private static final String BUNDLE_NAME = "org.eclipse.jst.jee.model.internal.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/AccessibleBeanMerger.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/AccessibleBeanMerger.java
deleted file mode 100644
index 7dd5952..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/AccessibleBeanMerger.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.ejb.SessionBean;
-/**
- * Accessible Bean Merger is used to merge beans that are accessible via interfaces.
- * For the time being it is used to merge only Session Beans.
- *
- * @author Dimitar Giormov
- */
-public class AccessibleBeanMerger extends EnterpriseBeanMerger {
-
- /**
- * @param baseBean element is the main element that values will be taken with highest priority.
- * @param toMergeBean element will give all of his extra values to base.
- * @param _kind
- */
- public AccessibleBeanMerger(SessionBean baseBean,
- SessionBean toMergeBean, int _kind) {
- super(baseBean, toMergeBean, _kind);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.EnterpriseBeanMerger#process()
- */
- public List process() throws ModelException {
- List warnings = new ArrayList();
- warnings.addAll(super.process());
- mergeInterfaces(warnings);
- return warnings;
- }
-
- private void mergeInterfaces(List warnings) throws ModelException {
- boolean isInBase = getBaseBean() instanceof SessionBean;
- boolean isInToMerge = getToMergeBean() instanceof SessionBean;
-
- if (isInBase && isInToMerge) {
- SessionBean baseBean = (SessionBean) getBaseBean();
- SessionBean toMergeBean = (SessionBean) getToMergeBean();
-
- List toMergeBusinessLocal = toMergeBean.getBusinessLocals();
- for(Object toMergeIntfs:toMergeBusinessLocal){
- if (containsInterface(baseBean.getBusinessRemotes(), (String) toMergeIntfs)) {
- continue;
- }
- if (!containsInterface(baseBean.getBusinessLocals(), (String) toMergeIntfs)) {
- baseBean.getBusinessLocals().add(toMergeIntfs);
- }
- }
-
- List toMergeIntfs = toMergeBean.getBusinessRemotes();
- for(Object toMergeRemoteIntf:toMergeIntfs){
- if (containsInterface(baseBean.getBusinessLocals(), (String) toMergeRemoteIntf)) {
- continue;
- }
- if (!containsInterface(baseBean.getBusinessRemotes(), (String) toMergeRemoteIntf)) {
- baseBean.getBusinessRemotes().add(toMergeRemoteIntf);
- }
- }
-
-
- if (baseBean.getLocal() == null){
- String toMergeLocal = toMergeBean.getLocal();
- baseBean.setLocal(toMergeLocal);
- }
-
- if (baseBean.getLocalHome() == null){
- String toMergeLocalHome = toMergeBean.getLocalHome();
- baseBean.setLocalHome(toMergeLocalHome);
- }
-
- if (baseBean.getRemote() == null){
- String toMergeRemote = toMergeBean.getRemote();
- baseBean.setRemote(toMergeRemote);
- }
-
- if (baseBean.getHome() == null){
- String toMergeRemoteHome = toMergeBean.getHome();
- baseBean.setHome(toMergeRemoteHome);
- }
-
- }
- }
-
- private boolean containsInterface(List business, String intfs) {
- for (Object object : business) {
- if (object.toString().equals(intfs)){
- return true;
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/AssemblyDescriptorMerger.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/AssemblyDescriptorMerger.java
deleted file mode 100644
index e4aa443..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/AssemblyDescriptorMerger.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.SecurityRole;
-import org.eclipse.jst.javaee.ejb.AssemblyDescriptor;
-
-/**
- * Assembly Descriptor Merger is used to merge the artifacts under assembly descriptor tag.
- *
- * @author Dimitar Giormov
- */
-public class AssemblyDescriptorMerger extends ModelElementMerger {
-
- /**
- * @param _base - is the base element, into which the values will be merged.
- * @param merge - is the conflicting element, which will be merged into base.
- * @param _kind
- */
- public AssemblyDescriptorMerger(JavaEEObject _base, JavaEEObject merge,
- int _kind) {
- super(_base, merge, _kind);
- }
-
- /**
- * Returns the base element, into which the values will be merged.
- *
- * @return base and result element.
- */
- AssemblyDescriptor getBaseAssemblyDescriptor(){
- return (AssemblyDescriptor) getBase();
- }
-
- /**
- * Returns the conflicting element, which will be merged into base.
- * @return to merge element.
- */
- AssemblyDescriptor getToMergeAssemblyDescriptor(){
- return (AssemblyDescriptor) getToMerge();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.ModelElementMerger#process()
- */
- @Override
- public List process() throws ModelException {
- List warnings = new ArrayList();
- mergeSecurityRoles(warnings);
- mergeTransactionAttribute(warnings);
- return warnings;
- }
- //TODO
- private void mergeTransactionAttribute(List warnings) {
-// List containerTransactionsBase = getBaseAssemblyDescriptor().getContainerTransactions();
-// List containerTransactionsToMerge = getToMergeAssemblyDescriptor().getContainerTransactions();
-// if (containerTransactionsToMerge == null){
-// return;
-// }
- }
-
- private void mergeSecurityRoles(List warnings) {
- List securityRolesBase = getBaseAssemblyDescriptor().getSecurityRoles();
- List securityRolesToMerge = getToMergeAssemblyDescriptor().getSecurityRoles();
- if (securityRolesToMerge == null){
- return;
- }
- for (Object sRoles : securityRolesToMerge) {
- if(!containsSecRole((SecurityRole) sRoles, securityRolesBase)){
- securityRolesBase.add(EcoreUtil.copy((EObject) sRoles));
- }
- }
- }
-
- private boolean containsSecRole(SecurityRole secRole, List secRoles){
- for (Object sRoles : secRoles) {
- if(((SecurityRole)sRoles).getRoleName() == null || secRole.getRoleName() == null){
- return ((SecurityRole)sRoles).getRoleName() == secRole.getRoleName();
- }
- if (((SecurityRole)sRoles).getRoleName().equals(secRole.getRoleName())){
- return true;
- }
- }
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java
deleted file mode 100644
index 714dcba..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.InterceptorsType;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.Relationships;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-
-/**
- * Ejb Jar merger merges the Ejb jar artifact it will call
- * the assembly descriptor merger or corresponding bean merger
- * if conflict is detected.
- *
- * @author Dimitar Giormov
- */
-public class EjbJarMerger extends ModelElementMerger {
-
- /**
- * Constructor which gets the base and to merge ejb jar element.
- *
- * @param _base - is the base element, into which the values will be merged.
- * @param merge - is the conflicting element, which will be merged into base.
- * @param kind
- */
- public EjbJarMerger(JavaEEObject _base, JavaEEObject merge, int kind) {
- super(_base, merge, kind);
- }
-
- /**
- * Returns the base element, into which the values will be merged.
- *
- * @return base element, into which the values will be merged.
- */
- EJBJar getBaseEjbJar(){
- return (EJBJar) getBase();
- }
-
- /**
- * Returns the conflicting element, which will be merged into base.
- *
- * @return the conflicting element, which will be merged into base.
- */
- EJBJar getToMergeEjbJar(){
- return (EJBJar) getToMerge();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.ModelElementMerger#process()
- */
- @Override
- public List process() throws ModelException {
- List warnings = new ArrayList();
- try {
- copyGeneralData(warnings);
- mergeSessionBeans(warnings);
- mergeMdbs(warnings);
- mergeEntities(warnings);
- mergeAssemblyDescriptor(warnings);
- } catch (Exception e) {
- throw new ModelException(e);
- }
- return warnings;
- }
-
-
- private void mergeAssemblyDescriptor(List warnings) throws ModelException {
- if(getToMergeEjbJar().getAssemblyDescriptor() == null){
- return;
- }
- if(getBaseEjbJar().getAssemblyDescriptor() == null){
- getBaseEjbJar().setAssemblyDescriptor(EjbFactory.eINSTANCE.createAssemblyDescriptor());
- }
- AssemblyDescriptorMerger adMerger = new AssemblyDescriptorMerger(getBaseEjbJar().getAssemblyDescriptor(),
- getToMergeEjbJar().getAssemblyDescriptor(), ModelElementMerger.ADD);
- warnings.addAll(adMerger.process());
-
- }
-
- private void mergeEntities(List warnings) {
-
- if(!isEnterpriseBeansTagPresent()){
- return;
- }
-
- List entityBeansToMerge = getToMergeEjbJar().getEnterpriseBeans().getEntityBeans();
- List entityBeansBase = getBaseEjbJar().getEnterpriseBeans().getEntityBeans();
- if(!entityBeansToMerge.isEmpty()) {
- for (Object entity : entityBeansToMerge) {
- EntityBean entityType = (EntityBean) entity;
- EntityBean entityBean = getEntityBean(entityType.getEjbName(), entityBeansBase);
- if (entityBean == null){
- entityBeansBase.add(EcoreUtil.copy((EObject) entity));
- }
- }
- }
-
- }
-
- private boolean isEnterpriseBeansTagPresent() {
- if(getToMergeEjbJar().getEnterpriseBeans() == null){
- return false;
- }
- if(getBaseEjbJar().getEnterpriseBeans() == null){
- getBaseEjbJar().setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- }
- if((getToMergeEjbJar().getEnterpriseBeans().getEntityBeans() == null ||
- getToMergeEjbJar().getEnterpriseBeans().getEntityBeans().isEmpty()) &&
- (getToMergeEjbJar().getEnterpriseBeans().getSessionBeans() == null ||
- getToMergeEjbJar().getEnterpriseBeans().getSessionBeans().isEmpty()) &&
- (getToMergeEjbJar().getEnterpriseBeans().getMessageDrivenBeans() == null ||
- getToMergeEjbJar().getEnterpriseBeans().getMessageDrivenBeans().isEmpty())
- ){
- return false;
- }
-
- return true;
- }
-
- private void mergeSessionBeans(List warnings) throws Exception {
- if(!isEnterpriseBeansTagPresent()){
- return;
- }
-
- List sessionBeansToMerge = getToMergeEjbJar().getEnterpriseBeans().getSessionBeans();
- List sessionBeansBase = getBaseEjbJar().getEnterpriseBeans().getSessionBeans();
- for (Object session : sessionBeansToMerge) {
- SessionBean sessionType = (SessionBean) session;
-
- SessionBean baseBean = getSessionBean(sessionType.getEjbName(), sessionBeansBase);
- if (baseBean != null){
- IMerger m = getSessionMerger((SessionBean)baseBean, sessionType, getKind());
- if(m != null){
- warnings.addAll(m.process());
- break;
- }
- } else {
- sessionBeansBase.add(EcoreUtil.copy((EObject) session));
- }
- }
- }
-
- private IMerger getSessionMerger(SessionBean baseBean, SessionBean toMergeType, int kind) {
- return new EnterpriseBeanMerger(baseBean, toMergeType, kind);
- }
-
- private void mergeMdbs(List warnings) throws Exception {
- if(!isEnterpriseBeansTagPresent()){
- return;
- }
-
- List mdBeansToMerge = getToMergeEjbJar().getEnterpriseBeans().getMessageDrivenBeans();
- List mdBeansBase = getBaseEjbJar().getEnterpriseBeans().getMessageDrivenBeans();
- for (Object mdb : mdBeansToMerge) {
- MessageDrivenBean sessionType = (MessageDrivenBean) mdb;
- MessageDrivenBean baseBean = getMdbBean(sessionType.getEjbName(), mdBeansBase);
- if (baseBean != null){
- IMerger m = getMdbMerger(baseBean, sessionType, getKind());
- if(m != null){
- warnings.addAll(m.process());
- }
- } else {
- mdBeansBase.add(EcoreUtil.copy((EObject) mdb));
- }
- }
- }
-
- private IMerger getMdbMerger(MessageDrivenBean baseBean, MessageDrivenBean toMergeType, int kind) {
- return new MessageDrivenBeanMerger(baseBean, toMergeType, kind);
- }
-
- private MessageDrivenBean getMdbBean(String name, List enterpriseBeans){
- for (Object bean : enterpriseBeans) {
- MessageDrivenBean sBean = (MessageDrivenBean) bean;
- if (sBean.getEjbName().equals(name)){
- return sBean;
- }
-
- }
- return null;
- }
-
- private SessionBean getSessionBean(String name, List enterpriseBeans){
- for (Object bean : enterpriseBeans) {
- SessionBean sBean = (SessionBean) bean;
- if (sBean.getEjbName().equals(name)){
- return sBean;
- }
-
- }
- return null;
- }
-
- private EntityBean getEntityBean(String name, List enterpriseBeans){
- for (Object bean : enterpriseBeans) {
- EntityBean sBean = (EntityBean) bean;
- if (sBean.getEjbName().equals(name)){
- return sBean;
- }
-
- }
- return null;
- }
-
- private void copyGeneralData(List warnings){
-
- copyJavaEEGroup();
- if (getToMergeEjbJar().getRelationships() != null && getToMergeEjbJar().getRelationships().getEjbRelations() != null
- && getToMergeEjbJar().getRelationships().getEjbRelations().size() > 0){
- getBaseEjbJar().setRelationships((Relationships) EcoreUtil.copy((EObject) getToMergeEjbJar().getRelationships()));
- }
- if (getToMergeEjbJar().getEjbClientJar() != null){
- getBaseEjbJar().setEjbClientJar(getToMergeEjbJar().getEjbClientJar());
- }
-
- if (getToMergeEjbJar().getInterceptors() != null && getToMergeEjbJar().getInterceptors().getInterceptors() != null
- && getToMergeEjbJar().getInterceptors().getInterceptors().size() > 0){
- getBaseEjbJar().setInterceptors((InterceptorsType) (EcoreUtil.copy((EObject) getToMergeEjbJar().getInterceptors())));
- }
-
-// if (!getToMergeEjbJar().isSetVersion()){
-// getBaseEjbJar().setVersion(getToMergeEjbJar().getVersion());
-// }
- }
-
- private void copyAllContentInBase(List listSource, List target) {
- for (Object object : listSource) {
- target.add(EcoreUtil.copy((EObject) object));
- }
-
- }
-
- private void copyJavaEEGroup(){
- if (getToMergeEjbJar().getDescriptions() != null){
- copyAllContentInBase(getToMergeEjbJar().getDescriptions(), getBaseEjbJar().getDescriptions());
- }
-
- if (getToMergeEjbJar().getDisplayNames() != null){
- copyAllContentInBase(getToMergeEjbJar().getDisplayNames(), getBaseEjbJar().getDisplayNames());
- }
-
- if (getToMergeEjbJar().getIcons() != null){
- copyAllContentInBase(getToMergeEjbJar().getIcons(), getBaseEjbJar().getIcons());
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EnterpriseBeanMerger.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EnterpriseBeanMerger.java
deleted file mode 100644
index bf276c5..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EnterpriseBeanMerger.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.ejb.NamedMethodType;
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.javaee.ejb.TransactionType;
-
-/**
- * Enterprise Bean Merger is used to merge all the common bean properties.
- * For the time being it is used only on Session Beans, until a proper structure in Emf model is introduced.
- *
- * @author Dimitar Giormov
- */
-public class EnterpriseBeanMerger extends ModelElementMerger {
-
-
- /**
- * Constructor of the class.
- *
- * @param _base Session bean artifact element is the main element that values will be taken with highest priority.
- * @param _toMerge Session bean artifact element will give all of his extra values to base.
- * @param _kind
- */
- public EnterpriseBeanMerger(SessionBean base, SessionBean toMerge, int _kind) {
- super(base, toMerge, _kind);
- }
-
- /**
- * Returns the Session bean base element, which is also the merged result.
- *
- * @return Session bean base element.
- */
- SessionBean getBaseBean() {
- return (SessionBean) getBase();
- }
-
- /**
- *
- * @return toMergeBean element, which will be merged in base.
- */
- SessionBean getToMergeBean() {
- return (SessionBean) getToMerge();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.ModelElementMerger#process()
- */
- public List process() throws ModelException {
- List warnings = new ArrayList();
- if(getToMerge() == null){
- return warnings;
- }
- String beanClass = getBaseBean().getEjbClass();
- if (beanClass == null) {
- beanClass = getToMergeBean().getEjbClass();
- }
- getBaseBean().setEjbClass(beanClass);
- mergeJNDIRefs(warnings);
- mergeTransactionType();
- mergeSecurityIdentity(warnings);
- mergeTimeoutMethods(warnings);
- return warnings;
- }
-
-
- private void mergeTransactionType() {
- TransactionType toMergeTransaction = getToMergeBean().getTransactionType();
- if (!getBaseBean().isSetTransactionType()){
- getBaseBean().setTransactionType(toMergeTransaction);
- }
- }
-
-
- private void mergeTimeoutMethods(List warnings) throws ModelException {
- NamedMethodType timeoutMethod = getBaseBean().getTimeoutMethod();
- if(timeoutMethod == null && getToMergeBean().getTimeoutMethod() != null){
- getBaseBean().setTimeoutMethod((NamedMethodType) EcoreUtil.copy((EObject) getToMergeBean().getTimeoutMethod()));
- }
- }
-
- private void mergeSecurityIdentity(List warnings) throws ModelException {
- SecurityIdentityType baseSecId = getBaseBean().getSecurityIdentities();
- SecurityIdentityType toMergeSecId = getToMergeBean().getSecurityIdentities();
- if(baseSecId == null && toMergeSecId != null){
- getBaseBean().setSecurityIdentities((SecurityIdentityType) EcoreUtil.copy((EObject)toMergeSecId));
- }
- }
-
- private void mergeJNDIRefs(List warnings) throws ModelException {
- JNDIRefsMerger jndiRefsMerger = new JNDIRefsMerger(getBaseBean(), getToMergeBean(), getKind());
- warnings.addAll(jndiRefsMerger.process());
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EntityBeanMerger.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EntityBeanMerger.java
deleted file mode 100644
index da3ebaf..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EntityBeanMerger.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.internal.operations.BusinessInterface;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-
-/**
- * @author Dimitar Giormov
- *
- */
-public class EntityBeanMerger extends ModelElementMerger {
-
- /**
- * @param _base
- * @param _toMergeBean
- * @param _kind
- */
- public EntityBeanMerger(EntityBean _base, EntityBean _toMergeBean, int _kind) {
- super(_base, _toMergeBean, _kind);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.ModelElementMerger#process()
- */
- public List process() throws ModelException {
- List warnings = new ArrayList();
- if(getToMerge() == null){
- return warnings;
- }
- String beanClass = getBaseBean().getEjbClass();
- if (beanClass == null) {
- beanClass = getToMergeBean().getEjbClass();
- }
- getBaseBean().setEjbClass(beanClass);
-
-
- mergeInterfaces(warnings);
- mergeSecurityRoleRefs(warnings);
- mergeJNDIRefs(warnings);
- return warnings;
- }
-
- EntityBean getBaseBean() {
- return (EntityBean) getBase();
- }
-
- EntityBean getToMergeBean() {
- return (EntityBean) getToMerge();
- }
-
-
-
- private void mergeSecurityRoleRefs(List warnings) throws ModelException {
- List toMergeList = getToMergeBean().getSecurityRoleRefs();
- addAllRoleRefs(toMergeList, warnings);
- }
-
- private void addAllRoleRefs(List roleRefs, List warnings) {
- for (Object roleRef:roleRefs) {
- if(!existingSecRoleRef(getBaseBean().getSecurityRoleRefs(), (SecurityRoleRef) roleRef)){
- getBaseBean().getSecurityRoleRefs().add(roleRef);
- }
-
- }
- }
-
- private boolean existingSecRoleRef(List roles, SecurityRoleRef secRole){
- for (Object object : roles) {
- SecurityRoleRef cRole = (SecurityRoleRef) object;
- if (cRole.getRoleName().equals(secRole.getRoleName())){
-
- }
- }
- return false;
- }
-
-
-
- private void mergeInterfaces(List warnings) throws ModelException {
- boolean isInBase = getBaseBean() instanceof EntityBean;
- boolean isInToMerge = getToMergeBean() instanceof EntityBean;
-
- if (isInBase && isInToMerge) {
- EntityBean baseBean = (EntityBean) getBaseBean();
- EntityBean toMergeBean = (EntityBean) getToMergeBean();
-
- if (baseBean.getLocal() == null){
- String toMergeLocal = toMergeBean.getLocal();
- baseBean.setLocal(toMergeLocal);
- }
-
- if (baseBean.getLocalHome() == null){
- String toMergeLocalHome = toMergeBean.getLocalHome();
- baseBean.setLocalHome(toMergeLocalHome);
- }
-
- if (baseBean.getRemote() == null){
- String toMergeRemote = toMergeBean.getRemote();
- baseBean.setRemote(toMergeRemote);
- }
-
- if (baseBean.getRemote() == null){
- String toMergeRemoteHome = toMergeBean.getRemote();
- baseBean.setRemote(toMergeRemoteHome);
- }
-
- }
- }
-
- private boolean containsInterface(List business, BusinessInterface intfs) {
- for (Object object : business) {
- BusinessInterface bIntfs = (BusinessInterface) object;
- if (bIntfs.getFullyQualifiedName().equals(intfs.getFullyQualifiedName())){
- return true;
- }
- }
- return false;
- }
-
-
-
- private void mergeJNDIRefs(List warnings) throws ModelException {
-
- JNDIRefsMerger jndiRefsMerger = new JNDIRefsMerger(getBaseBean(), getToMergeBean(), getKind());
- warnings.addAll(jndiRefsMerger.process());
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/MessageDrivenBeanMerger.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/MessageDrivenBeanMerger.java
deleted file mode 100644
index d8a370a..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/MessageDrivenBeanMerger.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.ejb.ActivationConfig;
-import org.eclipse.jst.javaee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.NamedMethodType;
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-import org.eclipse.jst.javaee.ejb.TransactionType;
-
-/**
- * Merger for Message Driven Beans.
- * This class will merge all the values of the two beans into the Base bean.
- *
- * @author Dimitar Giormov
- */
-public class MessageDrivenBeanMerger extends ModelElementMerger {
-
- /**
- * Constructor for the Merger class.
- *
- * @param baseBean element is the main element that values will be taken with highest priority.
- * @param toMergeBean element will give all of his extra values to base.
- * @param _kind
- */
- public MessageDrivenBeanMerger(MessageDrivenBean _baseBean, MessageDrivenBean _toMergeBean, int _kind) {
- super(_baseBean, _toMergeBean, _kind);
- }
-
- private void mergeMessagingType(List<String> warnings) {
- if (getBaseBean().getMessagingType() == null){
- getBaseBean().setMessagingType(getToMergeBean().getMessagingType());
- }
- }
-
- private void mergeActivationConfigurationProps(List<String> warnings) {
- ActivationConfig baseActConf = getBaseBean().getActivationConfig();
- if(baseActConf == null){
- getBaseBean().setActivationConfig(getToMergeBean().getActivationConfig());
- } else{
- List baseActConfProps = baseActConf.getActivationConfigProperties();
- if(getToMergeBean().getActivationConfig() == null){
- return;
- }
- List annotationProps = getToMergeBean().getActivationConfig().getActivationConfigProperties();
- for (Object object : annotationProps) {
- ActivationConfigProperty element = (ActivationConfigProperty) object;
- if(!containsActivationConfigProperty(baseActConfProps, element)){
- baseActConfProps.add(EcoreUtil.copy((EObject) element));
- }
- }
- }
-
- }
-
- private boolean containsActivationConfigProperty(List properties, ActivationConfigProperty acp){
- for (Object object : properties) {
- ActivationConfigProperty actConfProp = (ActivationConfigProperty) object;
- if(actConfProp.getActivationConfigPropertyName().equals(acp.getActivationConfigPropertyName())){
- return true;
- }
- }
- return false;
- }
-
-
- /**
- * @return base element is the main element that values will be taken with highest priority.
- */
- MessageDrivenBean getBaseBean() {
- return (MessageDrivenBean) getBase();
- }
-
- /**
- * @return toMergeBean element will give all of his extra values to base.
- */
- MessageDrivenBean getToMergeBean() {
- return (MessageDrivenBean) getToMerge();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.ModelElementMerger#process()
- */
- public List process() throws ModelException {
- List warnings = new ArrayList();
- if(getToMerge() == null){
- return warnings;
- }
- String beanClass = getBaseBean().getEjbClass();
- if (beanClass == null) {
- beanClass = getToMergeBean().getEjbClass();
- }
- getBaseBean().setEjbClass(beanClass);
- mergeJNDIRefs(warnings);
- // mergeInterceptors(warnings);
- mergeTransactionType();
- mergeContainerTransactions(warnings);
- mergeSecurityIdentity(warnings);
- mergeTimeoutMethods(warnings);
-
- mergeMessagingType(warnings);
- mergeActivationConfigurationProps(warnings);
- return warnings;
- }
-
-
- private void mergeTransactionType() {
- TransactionType toMergeTransaction = getToMergeBean().getTransactionType();
- TransactionType baseTransaction = getBaseBean().getTransactionType();
- if (baseTransaction != null){
- // getBaseBean().setTransactionType(toMergeTransaction);
- } else {
- if (toMergeTransaction != null){
- getBaseBean().setTransactionType(toMergeTransaction);
- }
- }
- }
-
- private void mergeJNDIRefs(List warnings) throws ModelException {
- JNDIRefsMerger jndiRefsMerger = new JNDIRefsMerger(getBaseBean(), getToMergeBean(), getKind());
- warnings.addAll(jndiRefsMerger.process());
- }
-
- private void mergeSecurityIdentity(List warnings) throws ModelException {
- SecurityIdentityType baseSecId = getBaseBean().getSecurityIdentity();
- SecurityIdentityType toMergeSecId = getToMergeBean().getSecurityIdentity();
- if(baseSecId == null && toMergeSecId != null){
- getBaseBean().setSecurityIdentity((SecurityIdentityType) EcoreUtil.copy((EObject)toMergeSecId));
- }
- }
-
- private void mergeContainerTransactions(List warnings) throws ModelException {
- }
-
- private void mergeTimeoutMethods(List warnings) throws ModelException {
- NamedMethodType timeoutMethod = getBaseBean().getTimeoutMethod();
- if(timeoutMethod == null && getToMergeBean().getTimeoutMethod() != null){
- getBaseBean().setTimeoutMethod((NamedMethodType) EcoreUtil.copy((EObject) getToMergeBean().getTimeoutMethod()));
- }
-
-
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/SessionBeanMerger.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/SessionBeanMerger.java
deleted file mode 100644
index e945e38..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/SessionBeanMerger.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-import org.eclipse.jst.javaee.ejb.InitMethodType;
-import org.eclipse.jst.javaee.ejb.MethodParams;
-import org.eclipse.jst.javaee.ejb.RemoveMethodType;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-
-/**
- *
- * Merger for Session Beans.
- * This class will merge all the values of the two beans into the Base bean.
- *
- * @author Dimitar Giormov
- *
- */
-public class SessionBeanMerger extends AccessibleBeanMerger {
-
- /**
- * @param _baseBean element is the main element that values will be taken with highest priority.
- * @param _toMergeBean element will give all of his extra values to base.
- * @param _kind
- */
- public SessionBeanMerger(SessionBean _baseBean, SessionBean _toMergeBean, int _kind) {
- super(_baseBean, _toMergeBean, _kind);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.AccessibleBeanMerger#process()
- */
- public List process() throws ModelException {
-
- List warnings = new ArrayList();
- warnings.addAll(super.process());
- mergeInitMethods(warnings);
- mergeRemoveMethods(warnings);
- mergeSecurityRoleRefs(warnings);
- return warnings;
- }
-
- private void mergeInitMethods(List warnings) throws ModelException {
- List initXMLMappings = getBaseBean().getInitMethods();
- List initAnnotationMappings = getToMergeBean().getInitMethods();
- for (Object object : initAnnotationMappings) {
- if (!containsInitMethod(initXMLMappings, (InitMethodType) object)){
- initXMLMappings.add(EcoreUtil.copy((EObject) object));
- }
- }
- }
-
- private boolean containsInitMethod(List initXMLMappings, InitMethodType initMethod) {
- for (Object object : initXMLMappings) {
- InitMethodType searched = (InitMethodType) object;
- if(initMethod.getBeanMethod().getMethodName().equals(searched.getBeanMethod().getMethodName()) &&
- sameParams(initMethod.getBeanMethod().getMethodParams(), searched.getBeanMethod().getMethodParams())){
-
- //CHECK for create method
- return true;
- }
- }
- return false;
- }
-
-
- private void mergeRemoveMethods(List warnings) throws ModelException {
-
- List removeBaseMethods = getBaseBean().getRemoveMethods();
- List removeToMergeMethods = getToMergeBean().getRemoveMethods();
- if(removeToMergeMethods == null || removeToMergeMethods.isEmpty()){
- return;
- }
- for (Object object : removeToMergeMethods) {
- RemoveMethodType base = getRemoveMethodType(removeBaseMethods, (RemoveMethodType) object);
- if(base != null){
- if (((RemoveMethodType)object).isRetainIfException() != base.isRetainIfException()){
- base.setRetainIfException(((RemoveMethodType)object).isRetainIfException());
- }
- } else {
- getBaseBean().getRemoveMethods().add(EcoreUtil.copy((EObject) object));
- }
- }
- }
- private RemoveMethodType getRemoveMethodType(List removeBaseMethods, RemoveMethodType object) {
- for (Object base: removeBaseMethods) {
- RemoveMethodType tmpBase = (RemoveMethodType)base;
- if ( tmpBase.getBeanMethod().getMethodName().equals(object.getBeanMethod().getMethodName())
- && sameParams(tmpBase.getBeanMethod().getMethodParams(), object.getBeanMethod().getMethodParams())) {
- return (RemoveMethodType) base;
- }
- }
- return null;
- }
-
-
- private boolean sameParams(MethodParams methodParams,
- MethodParams methodParams2) {
- if(methodParams == null && methodParams2 == null){
- return true;
- }
- if(methodParams == null | methodParams2 == null){
- return false;
- }
-
- if (methodParams.getMethodParams().size() != methodParams2.getMethodParams().size()){
- return false;
- }
-
- for (int i = 0; i < methodParams.getMethodParams().size(); i++) {
- if(!methodParams.getMethodParams().get(i).equals(methodParams2.getMethodParams().get(i))){
- return false;
- }
- }
- return true;
- }
-
- private void mergeSecurityRoleRefs(List warnings) throws ModelException {
- List toMergeList = getToMergeBean().getSecurityRoleRefs();
- for (Object roleRef:toMergeList) {
- if(!existingSecRoleRef(getBaseBean().getSecurityRoleRefs(), (SecurityRoleRef) roleRef)){
- getBaseBean().getSecurityRoleRefs().add(EcoreUtil.copy((EObject) roleRef));
- }
-
- }
- }
-
- private boolean existingSecRoleRef(List roles, SecurityRoleRef secRole){
- for (Object object : roles) {
- SecurityRoleRef cRole = (SecurityRoleRef) object;
- if (cRole.getRoleName().equals(secRole.getRoleName())){
- return true;
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/messages.properties b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/messages.properties
deleted file mode 100644
index 8468b62..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-EJBAnnotationReader.DisposeEjbAnnotationReader=Dispose ejb annotation reader
diff --git a/plugins/org.eclipse.jst.jee.ejb/plugin.properties b/plugins/org.eclipse.jst.jee.ejb/plugin.properties
deleted file mode 100644
index cfcd596..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.jee.ejb
-Bundle-Name.0 = JEE Ejb Plug-in
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee.ejb/plugin.xml b/plugins/org.eclipse.jst.jee.ejb/plugin.xml
deleted file mode 100644
index 9a9dd65..0000000
--- a/plugins/org.eclipse.jst.jee.ejb/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-
- <!--EJB3 -->
-
- <extension
- point="org.eclipse.jst.j2ee.J2EEModelProvider">
- <provider>
- <modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Ejb3MergedModelProviderFactory"/>
-<!-- <modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Ejb3ModelProviderFactory"/>-->
-
- <facet id="jst.ejb" versions="3.0"/>
- </provider>
- </extension>
-</plugin>
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 Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/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
